diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-02 13:06:42 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-02 13:06:42 -0400 |
| commit | 7b2f649ec2da6640878c15298f5d3f8451dd8125 (patch) | |
| tree | b26440ffa8853847fa0625f932673c7ff2554f2c /drm-intel-big-hammer.patch | |
| parent | 3daa57b3d93c5d0a795e3446850c83483df37f2e (diff) | |
| download | kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.tar.gz kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.tar.xz kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.zip | |
Linux 2.6.37-rc1
Diffstat (limited to 'drm-intel-big-hammer.patch')
| -rw-r--r-- | drm-intel-big-hammer.patch | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/drm-intel-big-hammer.patch b/drm-intel-big-hammer.patch index 63dc016b1..97bb2e8cd 100644 --- a/drm-intel-big-hammer.patch +++ b/drm-intel-big-hammer.patch @@ -1,16 +1,21 @@ +omgwtfbbqchainsaw? +--- + drivers/gpu/drm/i915/i915_gem.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index 37427e4..08af9db 100644 +index 8eb8453..36fa9d7 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); +@@ -3692,6 +3692,11 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, + if (ret) + goto pre_mutex_err; + /* We don't get the flushing right for these chipsets, use the -+ * big hamer for now to avoid random crashiness. */ ++ * big hammer for now to avoid random crashiness. */ + if (IS_I85X(dev) || IS_I865G(dev)) + wbinvd(); + - i915_verify_inactive(dev, __FILE__, __LINE__); - - if (dev_priv->mm.wedged) { + if (dev_priv->mm.suspended) { + mutex_unlock(&dev->struct_mutex); + ret = -EBUSY; |