rpms/kernel/F-11 drm-i915-gem-bad-bug-on.patch, NONE, 1.1.2.1 kernel.spec, 1.1679.2.5, 1.1679.2.6

[Kristian Høgsberg]

Author: krh

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25695

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	drm-i915-gem-bad-bug-on.patch 
Log Message:
* Thu Aug 13 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.29.6-217.2.6
- Backport 0e7ddf7e to fix bad BUG_ON() in i915 gem fence management
  code.  Adds drm-i915-gem-bad-bug-on.patch, fixes #514091.


drm-i915-gem-bad-bug-on.patch:
 i915_gem.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE drm-i915-gem-bad-bug-on.patch ---
commit 0e7ddf7eeeef5aea85412120539ab5369577faeb
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jun 4 11:18:14 2009 +0000

    drm/i915: Remove a bad BUG_ON in the fence management code.
    
    This could be triggered by a gtt mapping fault on 965 that decides to
    remove the fence from another object that happens to be active currently.
    Since the other object doesn't rely on the fence reg for its execution, we
    don't wait for it to finish.  We'll soon be not waiting on 915 most of the
    time as well, so just drop the BUG_ON.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 670d128..39f5c65 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2260,9 +2260,6 @@ try_again:
 			goto try_again;
 		}
 
-		BUG_ON(old_obj_priv->active ||
-		       (reg->obj->write_domain & I915_GEM_GPU_DOMAINS));
-
 		/*
 		 * Zap this virtual mapping so we can set up a fence again
 		 * for this object next time we need it.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.5
retrieving revision 1.1679.2.6
diff -u -p -r1.1679.2.5 -r1.1679.2.6
--- kernel.spec	12 Aug 2009 18:13:10 -0000	1.1679.2.5
+++ kernel.spec	13 Aug 2009 18:36:36 -0000	1.1679.2.6
@@ -739,6 +739,7 @@ Patch1846: drm-radeon-cs-oops-fix.patch
 Patch1847: drm-intel-a17-fix.patch
 Patch1848: drm-pnp-add-resource-range-checker.patch
 Patch1849: drm-i915-enable-mchbar.patch
+Patch1850: drm-i915-gem-bad-bug-on.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1476,6 +1477,7 @@ ApplyPatch drm-radeon-cs-oops-fix.patch
 ApplyPatch drm-intel-a17-fix.patch
 ApplyPatch drm-pnp-add-resource-range-checker.patch
 ApplyPatch drm-i915-enable-mchbar.patch
+ApplyPatch drm-i915-gem-bad-bug-on.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -2135,6 +2137,10 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 13 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.29.6-217.2.6
+- Backport 0e7ddf7e to fix bad BUG_ON() in i915 gem fence management
+  code.  Adds drm-i915-gem-bad-bug-on.patch, fixes #514091.
+
 * Wed Aug 12 2009 John W. Linville <linville at redhat.com> 2.6.29.6-217.2.5
 - iwlwifi: fix TX queue race