rpms/kernel/devel linux-2.6-drm-git-i915-remove-priv-access.patch, NONE, 1.1 kernel.spec, 1.466, 1.467

Dave Airlie (airlied) fedora-extras-commits at redhat.com
Mon Mar 3 06:34:16 UTC 2008


Author: airlied

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-drm-git-i915-remove-priv-access.patch 
Log Message:
* Mon Mar 03 2008 Dave Airlie <airlied at redhat.com>
- drm/i915: remove intel sarea priv refs for DRI2


linux-2.6-drm-git-i915-remove-priv-access.patch:

--- NEW FILE linux-2.6-drm-git-i915-remove-priv-access.patch ---
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index d2b7d3f..30ab367 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -51,7 +51,7 @@ int i915_wait_ring(struct drm_device *dev, int n, const char *caller)
 		if (ring->space >= n)
 			return 0;
 
-		dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
+		//dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
 
 		if (ring->head != last_head)
 			i = 0;
@@ -73,8 +73,8 @@ void i915_kernel_lost_context(struct drm_device *dev)
 	if (ring->space < 0)
 		ring->space += ring->Size;
 
-	if (ring->head == ring->tail)
-		dev_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY;
+//	if (ring->head == ring->tail)
+//		dev_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY;
 }
 
 static int i915_dma_cleanup(struct drm_device *dev)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -r1.466 -r1.467
--- kernel.spec	3 Mar 2008 03:34:19 -0000	1.466
+++ kernel.spec	3 Mar 2008 06:33:26 -0000	1.467
@@ -620,6 +620,7 @@
 Patch1802: linux-2.6-ppc32-ucmpdi2.patch
 Patch1803: nouveau-drm.patch
 Patch1804: linux-2.6-drm-git-mm-revert-nopfn.patch
+Patch1805: linux-2.6-drm-git-i915-remove-priv-access.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1135,6 +1136,7 @@
 ApplyPatch linux-2.6-ppc32-ucmpdi2.patch
 ApplyPatch nouveau-drm.patch
 ApplyPatch linux-2.6-drm-git-mm-revert-nopfn.patch
+ApplyPatch linux-2.6-drm-git-i915-remove-priv-access.patch
 
 # ext4dev stable patch queue, slated for 2.6.25
 #ApplyPatch linux-2.6-ext4-stable-queue.patch
@@ -1739,6 +1741,9 @@
 
 %changelog
 * Mon Mar 03 2008 Dave Airlie <airlied at redhat.com>
+- drm/i915: remove intel sarea priv refs for DRI2
+
+* Mon Mar 03 2008 Dave Airlie <airlied at redhat.com>
 - drm: revert nopfn->fault conversion to fix oops on intel
 
 * Sat Mar 01 2008 Jarod Wilson <jwilson at redhat.com>




More information about the fedora-extras-commits mailing list