drm/radeon/atom: fix typo in SetPixelClock handling
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 12 Sep 2012 21:58:07 +0000 (17:58 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 20 Sep 2012 17:10:43 +0000 (13:10 -0400)
MiscInfo field should be programmed with the crtc id
rather than the pll id.  However, at this point the
two are the same for chips with this version of the table.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/atombios_crtc.c

index 2817101fb167eb1f70ac36d88e2f4f1c58dd2427..cc1b2444a5e54122014f581910441b028bcc4fe8 100644 (file)
@@ -837,7 +837,10 @@ static void atombios_crtc_program_pll(struct drm_crtc *crtc,
                        args.v3.ucFracFbDiv = frac_fb_div;
                        args.v3.ucPostDiv = post_div;
                        args.v3.ucPpll = pll_id;
-                       args.v3.ucMiscInfo = (pll_id << 2);
+                       if (crtc_id == ATOM_CRTC2)
+                               args.v3.ucMiscInfo = PIXEL_CLOCK_MISC_CRTC_SEL_CRTC2;
+                       else
+                               args.v3.ucMiscInfo = PIXEL_CLOCK_MISC_CRTC_SEL_CRTC1;
                        if (ss_enabled && (ss->type & ATOM_EXTERNAL_SS_MASK))
                                args.v3.ucMiscInfo |= PIXEL_CLOCK_MISC_REF_DIV_SRC;
                        args.v3.ucTransmitterId = encoder_id;