rpms/kernel/devel drm-modesetting-radeon.patch, 1.11, 1.12 kernel.spec, 1.885, 1.886

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30091

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Thu Aug 14 2008 Dave Airlie <airlied at redhat.com>
- Update intel headers so DDX can build


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- drm-modesetting-radeon.patch	14 Aug 2008 08:20:31 -0000	1.11
+++ drm-modesetting-radeon.patch	14 Aug 2008 09:58:46 -0000	1.12
@@ -46964,7 +46964,7 @@
  
  /** Maximum number of drawables in the SAREA */
 diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index 05c66cf..59d08fc 100644
+index 05c66cf..6853875 100644
 --- a/include/drm/i915_drm.h
 +++ b/include/drm/i915_drm.h
 @@ -143,6 +143,22 @@ typedef struct _drm_i915_sarea {
@@ -46990,10 +46990,12 @@
  
  #define DRM_IOCTL_I915_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
  #define DRM_IOCTL_I915_FLUSH		DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
-@@ -160,6 +176,20 @@ typedef struct _drm_i915_sarea {
+@@ -160,11 +176,27 @@ typedef struct _drm_i915_sarea {
  #define DRM_IOCTL_I915_SET_VBLANK_PIPE	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
  #define DRM_IOCTL_I915_GET_VBLANK_PIPE	DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
  #define DRM_IOCTL_I915_VBLANK_SWAP	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
++#define DRM_IOCTL_I915_GEM_INIT         DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_INIT, struct drm_i915_gem_init)
++#define DRM_IOCTL_I915_GEM_EXECBUFFER   DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER, struct drm_i915_gem_execbuffer)
 +#define DRM_IOCTL_I915_GEM_PIN		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)
 +#define DRM_IOCTL_I915_GEM_UNPIN	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)
 +#define DRM_IOCTL_I915_GEM_BUSY		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)
@@ -47011,7 +47013,13 @@
  
  /* Allow drivers to submit batchbuffers directly to hardware, relying
   * on the security mechanisms provided by hardware.
-@@ -200,6 +230,7 @@ typedef struct drm_i915_irq_wait {
+  */
+-typedef struct _drm_i915_batchbuffer {
++typedef struct drm_i915_batchbuffer {
+ 	int start;		/* agp offset */
+ 	int used;		/* nr bytes in use */
+ 	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
+@@ -200,6 +232,7 @@ typedef struct drm_i915_irq_wait {
  #define I915_PARAM_IRQ_ACTIVE            1
  #define I915_PARAM_ALLOW_BATCHBUFFER     2
  #define I915_PARAM_LAST_DISPATCH         3
@@ -47019,7 +47027,7 @@
  
  typedef struct drm_i915_getparam {
  	int param;
-@@ -267,4 +298,305 @@ typedef struct drm_i915_hws_addr {
+@@ -267,4 +300,305 @@ typedef struct drm_i915_hws_addr {
  	uint64_t addr;
  } drm_i915_hws_addr_t;
  


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.885
retrieving revision 1.886
diff -u -r1.885 -r1.886
--- kernel.spec	14 Aug 2008 09:49:33 -0000	1.885
+++ kernel.spec	14 Aug 2008 09:58:46 -0000	1.886
@@ -1743,6 +1743,9 @@
 
 %changelog
 * Thu Aug 14 2008 Dave Airlie <airlied at redhat.com>
+- Update intel headers so DDX can build
+
+* Thu Aug 14 2008 Dave Airlie <airlied at redhat.com>
 - Update radeon modesetting code - include text cli option
 - support r300 cards and up - could in theory support r100/r200
 - reserve some memory for text mode on radeons