rpms/kernel/devel drm-fix-i915-sarea.patch,1.1,1.2

[Dave Airlie (airlied)]

Author: airlied

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

Modified Files:
	drm-fix-i915-sarea.patch 
Log Message:
* Fri Aug 15 2008 Dave Airlie <airlied at redhat.com>
- Add i915 sarea fixups - actually commit the patch


drm-fix-i915-sarea.patch:

Index: drm-fix-i915-sarea.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-fix-i915-sarea.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drm-fix-i915-sarea.patch	15 Aug 2008 04:36:28 -0000	1.1
+++ drm-fix-i915-sarea.patch	15 Aug 2008 05:14:51 -0000	1.2
@@ -1 +1,99 @@
-0001-i915-fixup-sarea-defines-properly.patch
+From 2756e528b8cba789948c66ef490315558e40168a Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Fri, 15 Aug 2008 14:28:43 +1000
+Subject: [PATCH] i915: fixup sarea defines properly
+
+This is a bit of a mess, but nothing we can do can stop us
+from breaking userspace compiling against this now. So just
+go with the recent namings.
+
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ drivers/gpu/drm/i915/i915_drv.h |    2 +-
+ drivers/gpu/drm/i915/i915_irq.c |    8 ++++----
+ include/drm/i915_drm.h          |   30 +++++++++++++++++++++---------
+ 3 files changed, 26 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
+index 2437132..e1a8a48 100644
+--- a/drivers/gpu/drm/i915/i915_drv.h
++++ b/drivers/gpu/drm/i915/i915_drv.h
+@@ -91,7 +91,7 @@ typedef struct _drm_i915_vbl_swap {
+ 
+ struct drm_i915_master_private {
+ 	drm_local_map_t *sarea;
+-	struct _drm_i915_sarea *sarea_priv;
++	struct drm_i915_sarea *sarea_priv;
+ };
+ 
+ typedef struct drm_i915_private {
+diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
+index 0756e7a..d7e3800 100644
+--- a/drivers/gpu/drm/i915/i915_irq.c
++++ b/drivers/gpu/drm/i915/i915_irq.c
+@@ -181,10 +181,10 @@ static void i915_vblank_tasklet(struct drm_device *dev)
+ 	sarea_priv->ctxOwner = DRM_KERNEL_CONTEXT;
+ 
+ 	upper[0] = upper[1] = 0;
+-	slice[0] = max(sarea_priv->pipeA_h / nhits, 1);
+-	slice[1] = max(sarea_priv->pipeB_h / nhits, 1);
+-	lower[0] = sarea_priv->pipeA_y + slice[0];
+-	lower[1] = sarea_priv->pipeB_y + slice[0];
++	slice[0] = max(sarea_priv->planeA_h / nhits, 1);
++	slice[1] = max(sarea_priv->planeB_h / nhits, 1);
++	lower[0] = sarea_priv->planeA_y + slice[0];
++	lower[1] = sarea_priv->planeB_y + slice[0];
+ 
+ 	spin_lock(&dev->drw_lock);
+ 
+diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
+index 6853875..3c1f545 100644
+--- a/include/drm/i915_drm.h
++++ b/include/drm/i915_drm.h
+@@ -63,7 +63,7 @@ typedef struct _drm_i915_init {
+ 	unsigned int chipset;
+ } drm_i915_init_t;
+ 
+-typedef struct _drm_i915_sarea {
++typedef struct drm_i915_sarea {
+ 	struct drm_tex_region texList[I915_NR_TEX_REGIONS + 1];
+ 	int last_upload;	/* last time texture was uploaded */
+ 	int last_enqueue;	/* last time a buffer was enqueued */
+@@ -105,14 +105,26 @@ typedef struct _drm_i915_sarea {
+ 	unsigned int rotated_tiled;
+ 	unsigned int rotated2_tiled;
+ 
+-	int pipeA_x;
+-	int pipeA_y;
+-	int pipeA_w;
+-	int pipeA_h;
+-	int pipeB_x;
+-	int pipeB_y;
+-	int pipeB_w;
+-	int pipeB_h;
++	int planeA_x;
++	int planeA_y;
++	int planeA_w;
++	int planeA_h;
++	int planeB_x;
++	int planeB_y;
++	int planeB_w;
++	int planeB_h;
++
++	/* triple buffering - not in kernel */
++	drm_handle_t third_handle;
++	int third_offset;
++	int third_size;
++	unsigned int third_tiled;
++
++	/* buffer object handles for static buffers */
++	unsigned int front_bo_handle;
++	unsigned int back_bo_handle;
++	unsigned int third_bo_handle;
++	unsigned int depth_bo_handle;
+ } drm_i915_sarea_t;
+ 
+ /* Flags for perf_boxes
+-- 
+1.5.4.1
+