diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-03-15 14:56:28 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2011-03-15 14:56:28 -0400 |
| commit | 09c361fdb64e5bfc7ec81c9d63aabbc332f65857 (patch) | |
| tree | d7e893440a623e4c6e6629330f68f253900a2a5a | |
| parent | 22477214dd705ca3fbcdddc8fc143c4b9327cec2 (diff) | |
| download | kernel-09c361fdb64e5bfc7ec81c9d63aabbc332f65857.tar.gz kernel-09c361fdb64e5bfc7ec81c9d63aabbc332f65857.tar.xz kernel-09c361fdb64e5bfc7ec81c9d63aabbc332f65857.zip | |
Drop the intel gen2 hack
| -rw-r--r-- | drm-intel-big-hammer.patch | 21 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 3 insertions, 23 deletions
diff --git a/drm-intel-big-hammer.patch b/drm-intel-big-hammer.patch deleted file mode 100644 index bf152af3b..000000000 --- a/drm-intel-big-hammer.patch +++ /dev/null @@ -1,21 +0,0 @@ -omgwtfbbqchainsaw? ---- - drivers/gpu/drm/i915/i915_gem_execbuffer.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c -index e698343..21e601d1 100644 ---- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c -+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c -@@ -1090,6 +1090,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 hammer for now to avoid random crashiness. */ -+ if (IS_I85X(dev) || IS_I865G(dev)) -+ wbinvd(); -+ - if (dev_priv->mm.suspended) { - mutex_unlock(&dev->struct_mutex); - ret = -EBUSY; diff --git a/kernel.spec b/kernel.spec index 43e9a3a2d..a875f6005 100644 --- a/kernel.spec +++ b/kernel.spec @@ -670,7 +670,6 @@ Patch1555: fix_xen_guest_on_old_EC2.patch # nouveau + drm fixes Patch1810: drm-nouveau-updates.patch -Patch1819: drm-intel-big-hammer.patch # intel drm is all merged upstream Patch1824: drm-intel-next.patch # make sure the lvds comes back on lid open @@ -1303,7 +1302,6 @@ ApplyOptionalPatch drm-nouveau-updates.patch # Intel DRM ApplyOptionalPatch drm-intel-next.patch -ApplyPatch drm-intel-big-hammer.patch ApplyPatch drm-intel-make-lvds-work.patch ApplyPatch linux-2.6-intel-iommu-igfx.patch ApplyPatch drm-intel-edp-fixes.patch @@ -1972,6 +1970,9 @@ fi # and build. %changelog +* Tue Mar 15 2011 Adam Jackson <ajax@redhat.com> +- drm-intel-big-hammer.patch: Drop. + * Tue Mar 15 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-1 - Linux 2.6.38 |