rpms/kernel/devel fixup-dri2-kms-merge.patch,1.1,1.2

[Kristian Høgsberg]

Author: krh

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7829

Modified Files:
	fixup-dri2-kms-merge.patch 
Log Message:
Fix more intel drm breakage.

fixup-dri2-kms-merge.patch:

Index: fixup-dri2-kms-merge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/fixup-dri2-kms-merge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fixup-dri2-kms-merge.patch	29 Aug 2008 19:42:14 -0000	1.1
+++ fixup-dri2-kms-merge.patch	29 Aug 2008 20:07:05 -0000	1.2
@@ -1,4 +1,4 @@
-From 0705a7958899a8787061740d5853ecce1febe4e3 Mon Sep 17 00:00:00 2001
+From 0c874555c1d205097adf4c4442a0d66276923247 Mon Sep 17 00:00:00 2001
 From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
 Date: Fri, 29 Aug 2008 15:25:51 -0400
 Subject: [PATCH] Fix up merge of DRI2 patches and KMS.
@@ -34,6 +34,27 @@
  		master->lock.file_priv = NULL;
  		wake_up_interruptible(&master->lock.lock_queue);
  	}
+diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
+index 24b43cd..bad0144 100644
+--- a/drivers/gpu/drm/i915/i915_dma.c
++++ b/drivers/gpu/drm/i915/i915_dma.c
+@@ -164,6 +164,16 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
+ 	drm_i915_private_t *dev_priv = dev->dev_private;
+ 	struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
+ 
++        master_priv->sarea = drm_getsarea(dev);
++        if (!master_priv->sarea) {
++                DRM_ERROR("can not find sarea!\n");
++                i915_dma_cleanup(dev);
++                return -EINVAL;
++        }
++
++        master_priv->sarea_priv = (drm_i915_sarea_t *)
++		((u8 *) master_priv->sarea->handle + init->sarea_priv_offset);
++
+ 	if (init->ring_size != 0) {
+ 		if (dev_priv->ring.ring_obj != NULL) {
+ 			i915_dma_cleanup(dev);
 diff --git a/drivers/gpu/drm/i915/i915_init.c b/drivers/gpu/drm/i915/i915_init.c
 index f2c9a3a..06f2ecb 100644
 --- a/drivers/gpu/drm/i915/i915_init.c