diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2013-03-31 23:12:42 +0200 |
---|---|---|
committer | Johannes Berg <johannes@sipsolutions.net> | 2013-03-31 23:12:42 +0200 |
commit | cf2b28bd1642305515171f6d70b9f033c4e064e5 (patch) | |
tree | c8dd3ece975ea57d009ff08be3cb9d63bf46f6a5 /patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch | |
parent | 445920189178de0b338fc5fa6f3d52035f58c778 (diff) |
rename patch files to .patch
They can be named after the C files they apply to,
but they should still be named .patch.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Diffstat (limited to 'patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch')
-rw-r--r-- | patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch new file mode 100644 index 00000000..c4cc8a02 --- /dev/null +++ b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch @@ -0,0 +1,18 @@ +--- a/drivers/gpu/drm/i915/i915_gem.c ++++ b/drivers/gpu/drm/i915/i915_gem.c +@@ -3997,9 +3997,14 @@ + drm_i915_private_t *dev_priv = dev->dev_private; + int ret; + +- if (INTEL_INFO(dev)->gen < 6 && !intel_enable_gtt()) ++ if (INTEL_INFO(dev)->gen < 6) + return -EIO; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) ++ if (!intel_enable_gtt()) ++ return -EIO; ++#endif ++ + if (IS_HASWELL(dev) && (I915_READ(0x120010) == 1)) + I915_WRITE(0x9008, I915_READ(0x9008) | 0xf0000); + |