Home Home > GIT Browse > SLE12-SP3-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2019-05-14 10:13:19 +0200
committerThomas Zimmermann <tzimmermann@suse.de>2019-05-14 10:36:15 +0200
commit6e38c827f56d32b8af3745ae1ddecf51ae6e1e63 (patch)
tree17f37f0f72b8c75cdef43763f1b9edaaa2652bf5
parent11de52a9f667c919d7c789e6ee6521344fd8c75c (diff)
drm/i915: Fix I915_EXEC_RING_MASK (bnc#1106929)
-rw-r--r--patches.fixes/0001-drm-i915-Fix-I915_EXEC_RING_MASK.patch36
-rw-r--r--series.conf1
2 files changed, 37 insertions, 0 deletions
diff --git a/patches.fixes/0001-drm-i915-Fix-I915_EXEC_RING_MASK.patch b/patches.fixes/0001-drm-i915-Fix-I915_EXEC_RING_MASK.patch
new file mode 100644
index 0000000000..e214b63e20
--- /dev/null
+++ b/patches.fixes/0001-drm-i915-Fix-I915_EXEC_RING_MASK.patch
@@ -0,0 +1,36 @@
+From d90c06d57027203f73021bb7ddb30b800d65c636 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri, 1 Mar 2019 14:03:47 +0000
+Subject: drm/i915: Fix I915_EXEC_RING_MASK
+Git-commit: d90c06d57027203f73021bb7ddb30b800d65c636
+Patch-mainline: v5.2-rc1
+References: bnc#1106929
+
+This was supposed to be a mask of all known rings, but it is being used
+by execbuffer to filter out invalid rings, and so is instead mapping high
+unused values onto valid rings. Instead of a mask of all known rings,
+we need it to be the mask of all possible rings.
+
+Fixes: 549f7365820a ("drm/i915: Enable SandyBridge blitter ring")
+Fixes: de1add360522 ("drm/i915: Decouple execbuf uAPI from internal implementation")
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Cc: <stable@vger.kernel.org> # v4.6+
+Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20190301140404.26690-21-chris@chris-wilson.co.uk
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ include/uapi/drm/i915_drm.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/uapi/drm/i915_drm.h
++++ b/include/uapi/drm/i915_drm.h
+@@ -714,7 +714,7 @@ struct drm_i915_gem_execbuffer2 {
+ __u32 num_cliprects;
+ /** This is a struct drm_clip_rect *cliprects */
+ __u64 cliprects_ptr;
+-#define I915_EXEC_RING_MASK (7<<0)
++#define I915_EXEC_RING_MASK (0x3f)
+ #define I915_EXEC_DEFAULT (0<<0)
+ #define I915_EXEC_RENDER (1<<0)
+ #define I915_EXEC_BSD (2<<0)
diff --git a/series.conf b/series.conf
index bbb7ab87cc..02001fed1d 100644
--- a/series.conf
+++ b/series.conf
@@ -25302,6 +25302,7 @@
patches.fixes/block-check_events-don-t-bother-with-events-if-unsup.patch
patches.drivers/Bluetooth-hidp-fix-buffer-overflow.patch
patches.fixes/0001-UAS-fix-alignment-of-scatter-gather-segments.patch
+ patches.fixes/0001-drm-i915-Fix-I915_EXEC_RING_MASK.patch
# davem/net-next
patches.drivers/ibmvnic-Report-actual-backing-device-speed-and-duple.patch