* [PATCH] drm/radeon/kms: fix up LVDS handling on macs
@ 2010-01-11 16:10 Alex Deucher
2010-01-12 8:49 ` Michel Dänzer
0 siblings, 1 reply; 3+ messages in thread
From: Alex Deucher @ 2010-01-11 16:10 UTC (permalink / raw)
To: Dave Airlie, DRI Development Mailing List
[-- Attachment #1: Type: text/plain, Size: 2943 bytes --]
>From 16de3600adde106fbb6eb828a3fa1b935d938425 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@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 <alexdeucher@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
@@ -46,6 +46,7 @@ static void radeon_legacy_lvds_dpms(struct
drm_encoder *encoder, int mode)
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
uint32_t lvds_gen_cntl, lvds_pll_cntl, pixclks_cntl, disp_pwr_man;
int panel_pwr_delay = 2000;
+ bool is_mac = false;
DRM_DEBUG("\n");
if (radeon_encoder->enc_priv) {
@@ -58,6 +59,15 @@ static void radeon_legacy_lvds_dpms(struct
drm_encoder *encoder, int mode)
}
}
+ /* macs (and possibly some x86 oem systems?) wire up LVDS strangely
+ * Taken from radeonfb.
+ */
+ if ((rdev->mode_info.connector_table == CT_IBOOK) ||
+ (rdev->mode_info.connector_table == CT_POWERBOOK_EXTERNAL) ||
+ (rdev->mode_info.connector_table == CT_POWERBOOK_INTERNAL) ||
+ (rdev->mode_info.connector_table == CT_POWERBOOK_VGA))
+ is_mac = true;
+
switch (mode) {
case DRM_MODE_DPMS_ON:
disp_pwr_man = RREG32(RADEON_DISP_PWR_MAN);
@@ -74,6 +84,8 @@ static void radeon_legacy_lvds_dpms(struct
drm_encoder *encoder, int mode)
lvds_gen_cntl = RREG32(RADEON_LVDS_GEN_CNTL);
lvds_gen_cntl |= (RADEON_LVDS_ON | RADEON_LVDS_EN |
RADEON_LVDS_DIGON | RADEON_LVDS_BLON);
+ if (is_mac)
+ lvds_gen_cntl |= RADEON_LVDS_BL_MOD_EN;
lvds_gen_cntl &= ~(RADEON_LVDS_DISPLAY_DIS);
udelay(panel_pwr_delay * 1000);
WREG32(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
@@ -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;
--
1.5.6.3
[-- Attachment #2: 0001-drm-radeon-kms-fix-up-LVDS-handling-on-macs.patch --]
[-- Type: application/mbox, Size: 2946 bytes --]
[-- Attachment #3: Type: text/plain, Size: 390 bytes --]
------------------------------------------------------------------------------
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
[-- Attachment #4: Type: text/plain, Size: 161 bytes --]
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/radeon/kms: fix up LVDS handling on macs
2010-01-11 16:10 [PATCH] drm/radeon/kms: fix up LVDS handling on macs Alex Deucher
@ 2010-01-12 8:49 ` Michel Dänzer
2010-01-12 16:20 ` Alex Deucher
0 siblings, 1 reply; 3+ messages in thread
From: Michel Dänzer @ 2010-01-12 8:49 UTC (permalink / raw)
To: Alex Deucher; +Cc: DRI Development Mailing List
On Mon, 2010-01-11 at 11:10 -0500, Alex Deucher wrote:
> >From 16de3600adde106fbb6eb828a3fa1b935d938425 Mon Sep 17 00:00:00 2001
> From: Alex Deucher <alexdeucher@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 <alexdeucher@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 <michel@daenzer.net>
Tested-by: Michel Dänzer <michel@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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/radeon/kms: fix up LVDS handling on macs
2010-01-12 8:49 ` Michel Dänzer
@ 2010-01-12 16:20 ` Alex Deucher
0 siblings, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2010-01-12 16:20 UTC (permalink / raw)
To: Michel Dänzer; +Cc: DRI Development Mailing List
[-- Attachment #1: Type: text/plain, Size: 2537 bytes --]
2010/1/12 Michel Dänzer <michel@daenzer.net>:
> On Mon, 2010-01-11 at 11:10 -0500, Alex Deucher wrote:
>> >From 16de3600adde106fbb6eb828a3fa1b935d938425 Mon Sep 17 00:00:00 2001
>> From: Alex Deucher <alexdeucher@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 <alexdeucher@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,
Fixed up in attached patch. thanks!
Alex
>
> Reviewed-by: Michel Dänzer <michel@daenzer.net>
> Tested-by: Michel Dänzer <michel@daenzer.net>
>
>
> --
> Earthling Michel Dänzer | http://www.vmware.com
> Libre software enthusiast | Debian, X and DRI developer
>
[-- Attachment #2: 0001-drm-radeon-kms-fix-up-LVDS-handling-on-macs-v2.patch --]
[-- Type: application/mbox, Size: 3100 bytes --]
[-- Attachment #3: Type: text/plain, Size: 390 bytes --]
------------------------------------------------------------------------------
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
[-- Attachment #4: Type: text/plain, Size: 161 bytes --]
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-01-12 16:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-11 16:10 [PATCH] drm/radeon/kms: fix up LVDS handling on macs Alex Deucher
2010-01-12 8:49 ` Michel Dänzer
2010-01-12 16:20 ` Alex Deucher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.