rpms/xorg-x11-drv-ati/devel ati-prefer-radeon-then-r128.patch, NONE, 1.1 r128-fp-dpms.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.46, 1.47
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Oct 2 15:30:47 UTC 2006
Author: ajackson
Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5103
Modified Files:
xorg-x11-drv-ati.spec
Added Files:
ati-prefer-radeon-then-r128.patch r128-fp-dpms.patch
Log Message:
* Mon Oct 2 2006 Adam Jackson <ajackson at redhat.com> 6.6.2-4
- ati-prefer-radeon-then-r128.patch: When loading through the 'ati' wrapper,
prefer radeon to rage128 to mach{64,32,16,8,4,2,1}.
- r128-fp-dpms.patch: Hook up DPMS for Rage128 DFPs. (#197436)
- radeon-6.6.2-dac-fix.patch: Even though we turn DACs on for probing, don't
turn them off. Fixes black screen of death post-rhgb. (#208610)
- radeon-6.6.2-pmac-bios.patch: Be more suspicious of ROMs before interpreting
their content. (#208694)
- radeon-6.6.2-usefbdev-patch.patch: Use the framebuffer stride from fbdev,
instead of making up numbers. (#208694)
ati-prefer-radeon-then-r128.patch:
atiprobe.c | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
--- NEW FILE ati-prefer-radeon-then-r128.patch ---
--- xf86-video-ati-6.6.2/src/atiprobe.c.jx 2006-08-24 20:08:17.000000000 -0400
+++ xf86-video-ati-6.6.2/src/atiprobe.c 2006-09-22 14:30:18.000000000 -0400
@@ -1000,7 +1000,6 @@
ATIGDev *ATIGDevs = NULL, *pATIGDev;
ScrnInfoPtr pScreenInfo;
Bool ProbeSuccess = FALSE;
- Bool DoRage128 = FALSE, DoRadeon = FALSE;
int i, j, k;
int nGDev, nATIGDev = -1, nATIPtr = 0;
int Chipset;
@@ -1111,13 +1110,14 @@
ATIGDevs = NULL;
}
}
-
- if (xf86MatchDevice(R128_NAME, NULL) > 0)
- DoRage128 = TRUE;
- if (xf86MatchDevice(RADEON_NAME, NULL) > 0)
- DoRadeon = TRUE;
}
+ if (RADEONProbe(pDriver, flags))
+ return TRUE;
+
+ if (R128Probe(pDriver, flags))
+ return TRUE;
+
#ifndef AVOID_CPIO
/*
@@ -1737,14 +1737,7 @@
/* Check for Rage128's, Radeon's and later adapters */
Chip = ATIChipID(pVideo->chipType, pVideo->chipRev);
if (Chip > ATI_CHIP_Mach64)
- {
- if (Chip <= ATI_CHIP_Rage128)
- DoRage128 = TRUE;
- else if (Chip <= ATI_CHIP_Radeon)
- DoRadeon = TRUE;
-
continue;
- }
if (!nATIGDev)
continue;
@@ -2330,13 +2323,5 @@
xfree(ATIPtrs);
- /* Call Rage 128 driver probe */
- if (DoRage128 && R128Probe(pDriver, flags))
- ProbeSuccess = TRUE;
-
- /* Call Radeon driver probe */
- if (DoRadeon && RADEONProbe(pDriver, flags))
- ProbeSuccess = TRUE;
-
return ProbeSuccess;
}
r128-fp-dpms.patch:
r128_driver.c | 12 ++++++++++++
1 files changed, 12 insertions(+)
--- NEW FILE r128-fp-dpms.patch ---
diff --git a/src/r128_driver.c b/src/r128_driver.c
index adf6449..81c9015 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -4522,6 +4522,18 @@ static void R128DisplayPowerManagementSe
OUTREGP(R128_CRTC_EXT_CNTL, mask, ~mask);
break;
}
+ if(info->isDFP) {
+ switch (PowerManagementMode) {
+ case DPMSModeOn:
+ OUTREG(R128_FP_GEN_CNTL, INREG(R128_FP_GEN_CNTL) | (R128_FP_FPON | R128_FP_TDMS_EN));
+ break;
+ case DPMSModeStandby:
+ case DPMSModeSuspend:
+ case DPMSModeOff:
+ OUTREG(R128_FP_GEN_CNTL, INREG(R128_FP_GEN_CNTL) & ~(R128_FP_FPON | R128_FP_TDMS_EN));
+ break;
+ }
+ }
}
static int r128_set_backlight_enable(ScrnInfoPtr pScrn, int on);
Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xorg-x11-drv-ati.spec 1 Oct 2006 21:19:01 -0000 1.46
+++ xorg-x11-drv-ati.spec 2 Oct 2006 15:30:44 -0000 1.47
@@ -13,7 +13,7 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
Version: 6.6.2
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X Hardware Support
@@ -25,15 +25,21 @@
Source3: radeon.xinf
# Radeon patches (0-99)
-Patch0: radeon-6.6.1-dotclock-filter.patch
-Patch1: radeon-6.6.1-use-mtdriver.patch
-Patch2: radeon-6.6.2-dac-fix.patch
+Patch0: radeon-6.6.1-dotclock-filter.patch
+Patch1: radeon-6.6.1-use-mtdriver.patch
+Patch2: radeon-6.6.2-dac-fix.patch
+Patch3: radeon-6.6.2-pmac-bios.patch
+Patch4: radeon-6.6.2-usefbdev-patch.patch
# Rage 128 patches (100-199)
Patch100: r128-missing-xf86ForceHWCursor-symbol-bug168753.patch
+Patch101: r128-fp-dpms.patch
# mach64 patches (200-299)
+# ati wrapperloader patches (300-399)
+Patch300: ati-prefer-radeon-then-r128.patch
+
ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
BuildRequires: pkgconfig
@@ -54,7 +60,11 @@
%patch0 -p1 -b .dotclock-filter
%patch1 -p1 -b .mtdriver
%patch2 -p1 -b .dac
+%patch3 -p1 -b .pmac-bios
+%patch4 -p1 -b .fbdev-pitch
%patch100 -p0 -b .r128-missing-xf86ForceHWCursor-symbol-bug168753
+%patch101 -p1 -b .dpms
+%patch300 -p1 -b .prefer
%build
%configure --disable-static
@@ -98,6 +108,17 @@
%{_mandir}/man4/radeon.4*
%changelog
+* Mon Oct 2 2006 Adam Jackson <ajackson at redhat.com> 6.6.2-4
+- ati-prefer-radeon-then-r128.patch: When loading through the 'ati' wrapper,
+ prefer radeon to rage128 to mach{64,32,16,8,4,2,1}.
+- r128-fp-dpms.patch: Hook up DPMS for Rage128 DFPs. (#197436)
+- radeon-6.6.2-dac-fix.patch: Even though we turn DACs on for probing, don't
+ turn them off. Fixes black screen of death post-rhgb. (#208610)
+- radeon-6.6.2-pmac-bios.patch: Be more suspicious of ROMs before interpreting
+ their content. (#208694)
+- radeon-6.6.2-usefbdev-patch.patch: Use the framebuffer stride from fbdev,
+ instead of making up numbers. (#208694)
+
* Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 6.6.2-3
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
More information about the fedora-cvs-commits
mailing list