diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-12-02 00:59:37 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-03 19:24:11 -0500 |
| commit | 4c4f5413c3208da7621cd29baac1fbdca89181b2 (patch) | |
| tree | 985ba67a419c220441385e56869b7a0301ed61d5 /drivers | |
| parent | d684076627a4561ea698bf7652a1a1baabdcdbdc (diff) | |
drm/radeon/kms: don't use bios dividers for lvds on r4xx
R4xx cards don't have lvds pll dividers since they use atom.
should fix rh bug 541562
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c index c1e1706d06b4..6f3ff8b84faf 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c | |||
| @@ -796,18 +796,20 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode) | |||
| 796 | if (encoder->encoder_type != DRM_MODE_ENCODER_DAC) | 796 | if (encoder->encoder_type != DRM_MODE_ENCODER_DAC) |
| 797 | pll_flags |= RADEON_PLL_NO_ODD_POST_DIV; | 797 | pll_flags |= RADEON_PLL_NO_ODD_POST_DIV; |
| 798 | if (encoder->encoder_type == DRM_MODE_ENCODER_LVDS) { | 798 | if (encoder->encoder_type == DRM_MODE_ENCODER_LVDS) { |
| 799 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | 799 | if (!rdev->is_atom_bios) { |
| 800 | struct radeon_encoder_lvds *lvds = (struct radeon_encoder_lvds *)radeon_encoder->enc_priv; | 800 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
| 801 | if (lvds) { | 801 | struct radeon_encoder_lvds *lvds = (struct radeon_encoder_lvds *)radeon_encoder->enc_priv; |
| 802 | if (lvds->use_bios_dividers) { | 802 | if (lvds) { |
| 803 | pll_ref_div = lvds->panel_ref_divider; | 803 | if (lvds->use_bios_dividers) { |
| 804 | pll_fb_post_div = (lvds->panel_fb_divider | | 804 | pll_ref_div = lvds->panel_ref_divider; |
| 805 | (lvds->panel_post_divider << 16)); | 805 | pll_fb_post_div = (lvds->panel_fb_divider | |
| 806 | htotal_cntl = 0; | 806 | (lvds->panel_post_divider << 16)); |
| 807 | use_bios_divs = true; | 807 | htotal_cntl = 0; |
| 808 | use_bios_divs = true; | ||
| 809 | } | ||
| 808 | } | 810 | } |
| 811 | pll_flags |= RADEON_PLL_USE_REF_DIV; | ||
| 809 | } | 812 | } |
| 810 | pll_flags |= RADEON_PLL_USE_REF_DIV; | ||
| 811 | } | 813 | } |
| 812 | } | 814 | } |
| 813 | } | 815 | } |