rpms/kernel/devel drm-intel-big-hammer.patch, NONE, 1.1 kernel.spec, 1.1416, 1.1417

[Kristian Høgsberg]

Author: krh

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

Modified Files:
	kernel.spec 
Added Files:
	drm-intel-big-hammer.patch 
Log Message:
* Wed Mar 11 2009 Kristian Høgsberg <krh at redhat.com>
- Add patch to issue a wbinvd in the GEM execbuffer patch to work
  around insufficient flushing on i855 and i865 chipsets.


drm-intel-big-hammer.patch:

--- NEW FILE drm-intel-big-hammer.patch ---
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 37427e4..08af9db 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2553,6 +2553,11 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
 
 	mutex_lock(&dev->struct_mutex);
 
+	/* We don't get the flushing right for these chipsets, use the
+	 * big hamer for now to avoid random crashiness. */
+	if (IS_I855(dev) || IS_I865G(dev))
+		wbinvd();
+
 	i915_verify_inactive(dev, __FILE__, __LINE__);
 
 	if (dev_priv->mm.wedged) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1416
retrieving revision 1.1417
diff -u -r1.1416 -r1.1417
--- kernel.spec	11 Mar 2009 20:16:11 -0000	1.1416
+++ kernel.spec	11 Mar 2009 22:45:01 -0000	1.1417
@@ -658,6 +658,7 @@
 Patch1814: drm-nouveau.patch
 Patch1816: drm-no-gem-on-i8xx.patch
 Patch1818: drm-i915-resume-force-mode.patch
+Patch1819: drm-intel-big-hammer.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1215,6 +1216,7 @@
 #ApplyPatch drm-radeon-pm.patch
 ApplyPatch drm-no-gem-on-i8xx.patch
 ApplyPatch drm-i915-resume-force-mode.patch
+ApplyPatch drm-intel-big-hammer.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1822,6 +1824,10 @@
 # and build.
 
 %changelog
+* Wed Mar 11 2009 Kristian Høgsberg <krh at redhat.com>
+- Add patch to issue a wbinvd in the GEM execbuffer patch to work
+  around insufficient flushing on i855 and i865 chipsets.
+
 * Wed Mar 11 2009 Steve Dickson <steved at redhat.com> 2.6.29-0.236.rc7.git4
 - Removed both the lockd-svc-register.patch and 
   sunrpc-ipv6-rpcbind.patch patches in favor of simply turning