queue-4.9/drm-i915-fix-i915_exec_ring_mask.patch

   1 From d90c06d57027203f73021bb7ddb30b800d65c636 Mon Sep 17 00:00:00 2001
   2 From: Chris Wilson <chris@chris-wilson.co.uk>
   3 Date: Fri, 1 Mar 2019 14:03:47 +0000
   4 Subject: drm/i915: Fix I915_EXEC_RING_MASK
   5
   6 From: Chris Wilson <chris@chris-wilson.co.uk>
   7
   8 commit d90c06d57027203f73021bb7ddb30b800d65c636 upstream.
   9
  10 This was supposed to be a mask of all known rings, but it is being used
  11 by execbuffer to filter out invalid rings, and so is instead mapping high
  12 unused values onto valid rings. Instead of a mask of all known rings,
  13 we need it to be the mask of all possible rings.
  14
  15 Fixes: 549f7365820a ("drm/i915: Enable SandyBridge blitter ring")
  16 Fixes: de1add360522 ("drm/i915: Decouple execbuf uAPI from internal implementation")
  17 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  18 Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
  19 Cc: <stable@vger.kernel.org> # v4.6+
  20 Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
  21 Link: https://patchwork.freedesktop.org/patch/msgid/20190301140404.26690-21-chris@chris-wilson.co.uk
  22 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  23
  24 ---
  25  include/uapi/drm/i915_drm.h |    2 +-
  26  1 file changed, 1 insertion(+), 1 deletion(-)
  27
  28 --- a/include/uapi/drm/i915_drm.h
  29 +++ b/include/uapi/drm/i915_drm.h
  30 @@ -756,7 +756,7 @@ struct drm_i915_gem_execbuffer2 {
  31         __u32 num_cliprects;
  32         /** This is a struct drm_clip_rect *cliprects */
  33         __u64 cliprects_ptr;
  34 -#define I915_EXEC_RING_MASK              (7<<0)
  35 +#define I915_EXEC_RING_MASK              (0x3f)
  36  #define I915_EXEC_DEFAULT                (0<<0)
  37  #define I915_EXEC_RENDER                 (1<<0)
  38  #define I915_EXEC_BSD                    (2<<0)