rpms/kernel/F-8 kernel.spec, 1.298, 1.299 linux-2.6-drm-radeon-update.patch, 1.1, 1.2

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23628

Modified Files:
	kernel.spec linux-2.6-drm-radeon-update.patch 
Log Message:
* Wed Dec 12 2007 Dave Airlie <airlied at redhat.com> 2.6.23.9-90
- fixup radeon r500 patch to apply to proper function



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- kernel.spec	12 Dec 2007 01:24:11 -0000	1.298
+++ kernel.spec	12 Dec 2007 01:48:52 -0000	1.299
@@ -2019,6 +2019,9 @@
 
 
 %changelog
+* Wed Dec 12 2007 Dave Airlie <airlied at redhat.com> 2.6.23.9-90
+- fixup radeon r500 patch to apply to proper function
+
 * Wed Dec 12 2007 Dave Airlie <airlied at redhat.com> 2.6.23.9-89
 - Add support for r500 DRM for making 2D accel go faster
 

linux-2.6-drm-radeon-update.patch:

Index: linux-2.6-drm-radeon-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-drm-radeon-update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-drm-radeon-update.patch	12 Dec 2007 01:24:11 -0000	1.1
+++ linux-2.6-drm-radeon-update.patch	12 Dec 2007 01:48:52 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up linux-2.6.23.noarch/drivers/char/drm/radeon_drm.h.da linux-2.6.23.noarch/drivers/char/drm/radeon_drm.h
 --- linux-2.6.23.noarch/drivers/char/drm/radeon_drm.h.da	2007-10-10 06:31:38.000000000 +1000
-+++ linux-2.6.23.noarch/drivers/char/drm/radeon_drm.h	2007-12-12 11:15:49.000000000 +1000
++++ linux-2.6.23.noarch/drivers/char/drm/radeon_drm.h	2007-12-12 11:43:08.000000000 +1000
 @@ -656,6 +656,7 @@ typedef struct drm_radeon_indirect {
  #define RADEON_PARAM_SCRATCH_OFFSET        11
  #define RADEON_PARAM_CARD_TYPE             12
@@ -10,21 +10,21 @@
  typedef struct drm_radeon_getparam {
  	int param;
 diff -up linux-2.6.23.noarch/drivers/char/drm/radeon_state.c.da linux-2.6.23.noarch/drivers/char/drm/radeon_state.c
---- linux-2.6.23.noarch/drivers/char/drm/radeon_state.c.da	2007-12-12 11:15:25.000000000 +1000
-+++ linux-2.6.23.noarch/drivers/char/drm/radeon_state.c	2007-12-12 11:15:49.000000000 +1000
-@@ -3086,6 +3086,9 @@ static int radeon_cp_setparam(struct drm
- 	case RADEON_SETPARAM_VBLANK_CRTC:
- 		return radeon_vblank_crtc_set(dev, sp->value);
+--- linux-2.6.23.noarch/drivers/char/drm/radeon_state.c.da	2007-12-12 11:42:44.000000000 +1000
++++ linux-2.6.23.noarch/drivers/char/drm/radeon_state.c	2007-12-12 11:43:21.000000000 +1000
+@@ -3033,6 +3033,9 @@ static int radeon_cp_getparam(struct drm
+ 	case RADEON_PARAM_VBLANK_CRTC:
+ 		value = radeon_vblank_crtc_get(dev);
  		break;
 +	case RADEON_PARAM_FB_LOCATION:
 +		value = radeon_read_fb_location(dev_priv);
 +		break;
  	default:
- 		DRM_DEBUG("Invalid parameter %d\n", sp->param);
+ 		DRM_DEBUG("Invalid parameter %d\n", param->param);
  		return -EINVAL;
 diff -up linux-2.6.23.noarch/drivers/char/drm/radeon_cp.c.da linux-2.6.23.noarch/drivers/char/drm/radeon_cp.c
---- linux-2.6.23.noarch/drivers/char/drm/radeon_cp.c.da	2007-12-12 11:15:25.000000000 +1000
-+++ linux-2.6.23.noarch/drivers/char/drm/radeon_cp.c	2007-12-12 11:16:34.000000000 +1000
+--- linux-2.6.23.noarch/drivers/char/drm/radeon_cp.c.da	2007-12-12 11:42:44.000000000 +1000
++++ linux-2.6.23.noarch/drivers/char/drm/radeon_cp.c	2007-12-12 11:43:08.000000000 +1000
 @@ -816,6 +816,21 @@ static const u32 R300_cp_microcode[][2] 
  	{0000000000, 0000000000},
  };
@@ -105,8 +105,8 @@
  
  	dev_priv->front_pitch_offset = (((dev_priv->front_pitch / 64) << 22) |
 diff -up linux-2.6.23.noarch/drivers/char/drm/radeon_drv.h.da linux-2.6.23.noarch/drivers/char/drm/radeon_drv.h
---- linux-2.6.23.noarch/drivers/char/drm/radeon_drv.h.da	2007-12-12 11:15:25.000000000 +1000
-+++ linux-2.6.23.noarch/drivers/char/drm/radeon_drv.h	2007-12-12 11:15:49.000000000 +1000
+--- linux-2.6.23.noarch/drivers/char/drm/radeon_drv.h.da	2007-12-12 11:42:44.000000000 +1000
++++ linux-2.6.23.noarch/drivers/char/drm/radeon_drv.h	2007-12-12 11:43:08.000000000 +1000
 @@ -336,6 +336,7 @@ extern int radeon_cp_resume(struct drm_d
  extern int radeon_engine_reset(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern int radeon_fullscreen(struct drm_device *dev, void *data, struct drm_file *file_priv);