diff options
| author | lesi <lesi@FreeBSD.org> | 2005-11-12 06:36:46 +0800 |
|---|---|---|
| committer | lesi <lesi@FreeBSD.org> | 2005-11-12 06:36:46 +0800 |
| commit | 7cf7d1df961b20ac5ebf0f58cf86848dd6ec5ac7 (patch) | |
| tree | d1cb65c184f9794beacdc3b30f26fed1a9f07d5d /x11-servers/xorg-server | |
| parent | a54a42e7cf4b486413cb2bdf29e332f34df27be8 (diff) | |
| download | freebsd-ports-gnome-7cf7d1df961b20ac5ebf0f58cf86848dd6ec5ac7.tar.gz freebsd-ports-gnome-7cf7d1df961b20ac5ebf0f58cf86848dd6ec5ac7.tar.zst freebsd-ports-gnome-7cf7d1df961b20ac5ebf0f58cf86848dd6ec5ac7.zip | |
Do not put Apple Cinema Display to sleep right after DDC probe.
No revision bump as this probably affects relatively small amount of users.
PR: ports/88623
Reported, fix found by: John O'Brien
Obtained from: X.Org CVS
Diffstat (limited to 'x11-servers/xorg-server')
| -rw-r--r-- | x11-servers/xorg-server/files/patch-radeon_driver.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/x11-servers/xorg-server/files/patch-radeon_driver.c b/x11-servers/xorg-server/files/patch-radeon_driver.c index 2adf232990f8..862b3c9283d1 100644 --- a/x11-servers/xorg-server/files/patch-radeon_driver.c +++ b/x11-servers/xorg-server/files/patch-radeon_driver.c @@ -1,6 +1,16 @@ ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig Thu Feb 17 13:15:22 2005 -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c Thu Feb 17 13:21:09 2005 -@@ -2501,6 +2501,7 @@ +--- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig Tue Nov 8 01:15:59 2005 ++++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c Tue Nov 8 01:15:37 2005 +@@ -938,6 +938,9 @@ static RADEONMonitorType RADEONDisplayDD + MonType = MT_NONE; + } + ++ OUTREG(info->DDCReg, INREG(info->DDCReg) & ++ ~(RADEON_GPIO_EN_0 | RADEON_GPIO_EN_1)); ++ + if (*MonInfo) { + if ((*MonInfo)->rawData[0x14] & 0x80) { + /* Note some laptops have a DVI output that uses internal TMDS, +@@ -2284,6 +2287,7 @@ static Bool RADEONPreInitConfig(ScrnInfo case PCI_CHIP_RV370_5464: info->IsMobility = TRUE; case PCI_CHIP_RV370_5B60: @@ -8,7 +18,7 @@ case PCI_CHIP_RV370_5B64: case PCI_CHIP_RV370_5B65: info->ChipFamily = CHIP_FAMILY_RV380; -@@ -7159,7 +7159,6 @@ +@@ -7159,7 +7163,6 @@ void RADEONAdjustFrame(int scrnIndex, in RADEONDoAdjustFrame(pScrn, x, y, FALSE); } |