On Mon, 2010-01-11 at 11:10 -0500, Alex Deucher wrote:
> >From 16de3600adde106fbb6eb828a3fa1b935d938425 Mon Sep 17 00:00:00 2001
> From: Alex Deucher <alexdeuc...@gmail.com>
> Date: Mon, 11 Jan 2010 10:50:18 -0500
> Subject: [PATCH] drm/radeon/kms: fix up LVDS handling on macs
>
> Based on radeonfb code and recent ddx fix.
>
> Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
> ---
> drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 24 +++++++++++++++++++++-
> 1 files changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
> b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
> index 981508f..f746560 100644
> --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
> +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
> @@ -85,8 +97,16 @@ static void radeon_legacy_lvds_dpms(struct
> drm_encoder *encoder, int mode)
> WREG32_PLL_P(RADEON_PIXCLKS_CNTL, 0,
> ~RADEON_PIXCLK_LVDS_ALWAYS_ONb);
> lvds_gen_cntl = RREG32(RADEON_LVDS_GEN_CNTL);
> lvds_gen_cntl |= RADEON_LVDS_DISPLAY_DIS;
> - lvds_gen_cntl &= ~(RADEON_LVDS_ON | RADEON_LVDS_BLON |
> RADEON_LVDS_EN | RADEON_LVDS_DIGON);
> - udelay(panel_pwr_delay * 1000);
> + if (is_mac) {
> + lvds_gen_cntl &= ~RADEON_LVDS_BL_MOD_EN;
> + WREG32(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
> + udelay(panel_pwr_delay * 1000);
> + lvds_gen_cntl &= ~(RADEON_LVDS_ON | RADEON_LVDS_EN);
> + } else {
> + WREG32(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
> + lvds_gen_cntl &= ~(RADEON_LVDS_ON | RADEON_LVDS_BLON |
> RADEON_LVDS_EN | RADEON_LVDS_DIGON);
> + udelay(panel_pwr_delay * 1000);
> + }
> WREG32(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
> WREG32_PLL(RADEON_PIXCLKS_CNTL, pixclks_cntl);
> break;
Minor niggle here: You could leave a single udelay() after the if
(is_mac) blocks.
Other than that,
Reviewed-by: Michel Dänzer <mic...@daenzer.net>
Tested-by: Michel Dänzer <mic...@daenzer.net>
--
Earthling Michel Dänzer | http://www.vmware.com
Libre software enthusiast | Debian, X and DRI developer
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
