rpms/xorg-x11-drv-ati/F-8 radeon-fix-randr-gamma.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.67, 1.68

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30293

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-fix-randr-gamma.patch 
Log Message:
* Thu Nov 29 2007 Dave Airlie <airlied at redhat.com> 6.7.196-2
- radeon-fix-randr-gamma.patch - fix access to rrcrtc if not initialised


radeon-fix-randr-gamma.patch:

--- NEW FILE radeon-fix-randr-gamma.patch ---
diff -up xf86-video-ati-6.7.196/src/radeon_driver.c.randr-gamma xf86-video-ati-6.7.196/src/radeon_driver.c
--- xf86-video-ati-6.7.196/src/radeon_driver.c.randr-gamma	2007-11-12 11:29:55.000000000 +1000
+++ xf86-video-ati-6.7.196/src/radeon_driver.c	2007-11-29 17:30:03.000000000 +1000
@@ -2932,10 +2932,13 @@ static void RADEONLoadPalette(ScrnInfoPt
 
 	      /* Make the change through RandR */
 #ifdef RANDR_12_INTERFACE
-      RRCrtcGammaSet(crtc->randr_crtc, lut_r, lut_g, lut_b);
-#else
-      crtc->funcs->gamma_set(crtc, lut_r, lut_g, lut_b, 256);
+      if (crtc->randr_crtc)
+          RRCrtcGammaSet(crtc->randr_crtc, lut_r, lut_g, lut_b);
+      else
 #endif
+      {
+          crtc->funcs->gamma_set(crtc, lut_r, lut_g, lut_b, 256);
+      }
       }
     }
 


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-8/xorg-x11-drv-ati.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- xorg-x11-drv-ati.spec	19 Nov 2007 00:13:28 -0000	1.67
+++ xorg-x11-drv-ati.spec	29 Nov 2007 09:19:22 -0000	1.68
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.7.196
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -19,7 +19,7 @@
 # Radeon patches (0-99)
 Patch2:     radeon-6.6.3-renderaccel-buglet.patch
 Patch3:     radeon-git-upstream-fixes.patch
-
+Patch4:     radeon-fix-randr-gamma.patch
 # Rage 128 patches (100-199)
 
 # mach64 patches (200-299)
@@ -43,6 +43,7 @@
 
 %patch2 -p1 -b .renderaccel
 %patch3 -p1 -b .fixes
+%patch4 -p1 -b .randr-gamma
 
 %build
 %configure --disable-static
@@ -83,6 +84,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Nov 29 2007 Dave Airlie <airlied at redhat.com> 6.7.196-2
+- radeon-fix-randr-gamma.patch - fix access to rrcrtc if not initialised
+
 * Mon Nov 19 2007 Dave Airlie <airlied at redhat.com> 6.7.196-1
 - rebase to 6.7.196 upstream + fixes from git