aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/atombios_crtc.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2012-09-12 17:58:07 -0400
committerAlex Deucher <alexander.deucher@amd.com>2012-09-20 13:10:43 -0400
commite729586e33593cd11112ff22fa8f0e801af05b4e (patch)
treef93cb41a5783f366fa7d4ef8336544befeb68a29 /drivers/gpu/drm/radeon/atombios_crtc.c
parent6e76a2df91c516714bf1f039b9614696aaaeaeb2 (diff)
drm/radeon/atom: fix typo in SetPixelClock handling
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>
Diffstat (limited to 'drivers/gpu/drm/radeon/atombios_crtc.c')
-rw-r--r--drivers/gpu/drm/radeon/atombios_crtc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 2817101fb167..cc1b2444a5e5 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -837,7 +837,10 @@ static void atombios_crtc_program_pll(struct drm_crtc *crtc,
837 args.v3.ucFracFbDiv = frac_fb_div; 837 args.v3.ucFracFbDiv = frac_fb_div;
838 args.v3.ucPostDiv = post_div; 838 args.v3.ucPostDiv = post_div;
839 args.v3.ucPpll = pll_id; 839 args.v3.ucPpll = pll_id;
840 args.v3.ucMiscInfo = (pll_id << 2); 840 if (crtc_id == ATOM_CRTC2)
841 args.v3.ucMiscInfo = PIXEL_CLOCK_MISC_CRTC_SEL_CRTC2;
842 else
843 args.v3.ucMiscInfo = PIXEL_CLOCK_MISC_CRTC_SEL_CRTC1;
841 if (ss_enabled && (ss->type & ATOM_EXTERNAL_SS_MASK)) 844 if (ss_enabled && (ss->type & ATOM_EXTERNAL_SS_MASK))
842 args.v3.ucMiscInfo |= PIXEL_CLOCK_MISC_REF_DIV_SRC; 845 args.v3.ucMiscInfo |= PIXEL_CLOCK_MISC_REF_DIV_SRC;
843 args.v3.ucTransmitterId = encoder_id; 846 args.v3.ucTransmitterId = encoder_id;