summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-06-04 07:14:37 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-06-04 07:27:05 -0400
commitea54a55052b8d31c74393665c6eb1abbadea8c41 (patch)
tree1bd71aa81f73c29c9ee5ff823e71d1c0666f97ff
parent3d17f6ae2180efe1d5c08fd385971356d006c960 (diff)
downloadkernel-ea54a55052b8d31c74393665c6eb1abbadea8c41.tar.gz
kernel-ea54a55052b8d31c74393665c6eb1abbadea8c41.tar.xz
kernel-ea54a55052b8d31c74393665c6eb1abbadea8c41.zip
Add patch to turn of WC mmaps on i915 from airlied (rhbz 1226743)
-rw-r--r--drm-i915-turn-off-wc-mmaps.patch21
-rw-r--r--kernel.spec9
2 files changed, 30 insertions, 0 deletions
diff --git a/drm-i915-turn-off-wc-mmaps.patch b/drm-i915-turn-off-wc-mmaps.patch
new file mode 100644
index 000000000..af314cdd1
--- /dev/null
+++ b/drm-i915-turn-off-wc-mmaps.patch
@@ -0,0 +1,21 @@
+From: Dave Airlie <airlied@redhat.com>
+Date: Thu, 4 Jun 2015 07:12:20 -0400
+Subject: [PATCH] drm: i915: turn off wc mmaps
+
+---
+ drivers/gpu/drm/i915/i915_dma.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
+index 68e0c85a17cf..21118db9aee2 100644
+--- a/drivers/gpu/drm/i915/i915_dma.c
++++ b/drivers/gpu/drm/i915/i915_dma.c
+@@ -151,7 +151,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
+ value = 1;
+ break;
+ case I915_PARAM_MMAP_VERSION:
+- value = 1;
++ value = 0;
+ break;
+ case I915_PARAM_SUBSLICE_TOTAL:
+ value = INTEL_INFO(dev)->subslice_total;
diff --git a/kernel.spec b/kernel.spec
index 1cedc8d74..3a4ee659e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -615,6 +615,9 @@ Patch26218: n_tty-Fix-auditing-support-for-cannonical-mode.patch
#rhbz 1133378
Patch26219: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
+#rhbz 1226743
+Patch26221: drm-i915-turn-off-wc-mmaps.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1348,6 +1351,9 @@ ApplyPatch n_tty-Fix-auditing-support-for-cannonical-mode.patch
#rhbz 1133378
ApplyPatch firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
+#rhbz 1226743
+ApplyPatch drm-i915-turn-off-wc-mmaps.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2212,6 +2218,9 @@ fi
#
#
%changelog
+* Thu Jun 04 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Add patch to turn of WC mmaps on i915 from airlied (rhbz 1226743)
+
* Wed Jun 03 2015 Laura Abbott <labbott@fedoraproject.org>
- Drop that blasted firwmare warning until we get a real fix (rhbz 1133378)