r1958 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches

[Andres Salomon]

Author: dilinger-guest
Date: 2004-12-01 08:27:31 -0700 (Wed, 01 Dec 2004)
New Revision: 1958

Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drm-locking-fixes.dpatch
Log:
fix patch application.  drm/i915_* doesn't exist in 2.6.8.


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drm-locking-fixes.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drm-locking-fixes.dpatch	2004-12-01 14:32:49 UTC (rev 1957)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drm-locking-fixes.dpatch	2004-12-01 15:27:31 UTC (rev 1958)
@@ -211,70 +211,4 @@
  
  	if ( !dev_priv ) {
  		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-diff -urNad linux-source-2.6.9-2.6.9/drivers/char/drm/i915_dma.c /tmp/dpep.C9szyr/linux-source-2.6.9-2.6.9/drivers/char/drm/i915_dma.c
---- linux-source-2.6.9-2.6.9/drivers/char/drm/i915_dma.c	2004-10-18 23:53:51.000000000 +0200
-+++ /tmp/dpep.C9szyr/linux-source-2.6.9-2.6.9/drivers/char/drm/i915_dma.c	2004-12-01 11:08:36.881637808 +0100
-@@ -545,10 +545,7 @@
- {
- 	DRM_DEVICE;
- 
--	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i915_flush_ioctl called without lock held\n");
--		return DRM_ERR(EINVAL);
--	}
-+	LOCK_TEST_WITH_RETURN( dev, filp );
- 
- 	return i915_quiescent(dev);
- }
-@@ -574,10 +571,7 @@
- 	DRM_DEBUG("i915 batchbuffer, start %x used %d cliprects %d\n",
- 		  batch.start, batch.used, batch.num_cliprects);
- 
--	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i915_batchbuffer called without lock held\n");
--		return DRM_ERR(EINVAL);
--	}
-+	LOCK_TEST_WITH_RETURN( dev, filp );
- 
- 	if (batch.num_cliprects && DRM_VERIFYAREA_READ(batch.cliprects,
- 						       batch.num_cliprects *
-@@ -606,10 +600,7 @@
- 	DRM_DEBUG("i915 cmdbuffer, buf %p sz %d cliprects %d\n",
- 		  cmdbuf.buf, cmdbuf.sz, cmdbuf.num_cliprects);
- 
--	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i915_cmdbuffer called without lock held\n");
--		return DRM_ERR(EINVAL);
--	}
-+	LOCK_TEST_WITH_RETURN( dev, filp );
- 
- 	if (cmdbuf.num_cliprects &&
- 	    DRM_VERIFYAREA_READ(cmdbuf.cliprects,
-@@ -645,10 +636,8 @@
- 	DRM_DEVICE;
- 
- 	DRM_DEBUG("%s\n", __FUNCTION__);
--	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i915_flip_buf called without lock held\n");
--		return DRM_ERR(EINVAL);
--	}
-+	
-+	LOCK_TEST_WITH_RETURN( dev, filp );
- 
- 	return i915_dispatch_flip(dev);
- }
-diff -urNad linux-source-2.6.9-2.6.9/drivers/char/drm/i915_irq.c /tmp/dpep.C9szyr/linux-source-2.6.9-2.6.9/drivers/char/drm/i915_irq.c
---- linux-source-2.6.9-2.6.9/drivers/char/drm/i915_irq.c	2004-10-18 23:53:51.000000000 +0200
-+++ /tmp/dpep.C9szyr/linux-source-2.6.9-2.6.9/drivers/char/drm/i915_irq.c	2004-12-01 11:03:45.342958424 +0100
-@@ -92,10 +92,7 @@
- 	drm_i915_irq_emit_t emit;
- 	int result;
- 
--	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i915_irq_emit called without lock held\n");
--		return DRM_ERR(EINVAL);
--	}
-+	LOCK_TEST_WITH_RETURN( dev, filp );
- 
- 	if (!dev_priv) {
- 		DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
+