rpms/xorg-x11-drv-ati/F-11 radeon-6.12.2-kms-gamma.patch, 1.1, 1.2 xorg-x11-drv-ati.spec, 1.184, 1.185

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29014

Modified Files:
	radeon-6.12.2-kms-gamma.patch xorg-x11-drv-ati.spec 
Log Message:
* Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 6.12.2-9
- fix gamma code to work properly
- bump kernel requires for gamma interface not oopsing


radeon-6.12.2-kms-gamma.patch:

Index: radeon-6.12.2-kms-gamma.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/radeon-6.12.2-kms-gamma.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- radeon-6.12.2-kms-gamma.patch	16 Apr 2009 21:02:55 -0000	1.1
+++ radeon-6.12.2-kms-gamma.patch	28 Apr 2009 10:05:56 -0000	1.2
@@ -1,6 +1,16 @@
-diff -up xf86-video-ati-6.12.2/src/drmmode_display.c.jx xf86-video-ati-6.12.2/src/drmmode_display.c
---- xf86-video-ati-6.12.2/src/drmmode_display.c.jx	2009-04-16 14:51:57.000000000 -0400
-+++ xf86-video-ati-6.12.2/src/drmmode_display.c	2009-04-16 14:54:22.000000000 -0400
+From 1f5861ff6c60862d2beda08f33ee64ae24c1238f Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Tue, 28 Apr 2009 20:01:36 +1000
+Subject: [PATCH] radeon: fix palette setup
+
+---
+ src/drmmode_display.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index b368115..8e33a76 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
 @@ -458,7 +458,11 @@ static void
  drmmode_crtc_gamma_set(xf86CrtcPtr crtc, uint16_t *red, uint16_t *green,
                        uint16_t *blue, int size)
@@ -14,3 +24,33 @@ diff -up xf86-video-ati-6.12.2/src/drmmo
  }
  
  static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
+@@ -954,8 +958,6 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
+     int index, j, i;
+     int c;
+ 
+-
+-
+     for (c = 0; c < xf86_config->num_crtc; c++) {
+         xf86CrtcPtr crtc = xf86_config->crtc[c];
+ 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+@@ -966,8 +968,7 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
+             lut_b[i] = drmmode_crtc->lut_b[i] << 6;
+         }
+ 
+-#if 0 //TODO
+-        switch (info->CurrentLayout.depth) {
++        switch(pScrn->depth) {
+         case 15:
+             for (i = 0; i < numColors; i++) {
+                 index = indices[i];
+@@ -1003,7 +1004,6 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
+               }
+               break;
+           }
+-#endif
+ 
+     /* Make the change through RandR */
+ #ifdef RANDR_12_INTERFACE
+-- 
+1.6.2.2
+


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- xorg-x11-drv-ati.spec	28 Apr 2009 03:29:56 -0000	1.184
+++ xorg-x11-drv-ati.spec	28 Apr 2009 10:05:56 -0000	1.185
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -34,7 +34,7 @@ Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.4.99.1
 Requires:  libdrm >= 2.4.0-0.21
 # new CS method needs newer kernel
-Requires:  kernel >= 2.6.29.1-52.fc11
+Requires:  kernel >= 2.6.29.1-111.fc11
 
 %description 
 X.Org X11 ati video driver.
@@ -78,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 6.12.2-9
+- fix gamma code to work properly
+- bump kernel requires for gamma interface not oopsing
+
 * Tue Apr 28 2009 Dave Airlie <airlied at redhat.com> 6.12.2-8
 - restrict texture coords to 0.0->1.0 explicitly.
 - enable gamma now kernel is tagged