| Revision | 8ad6a539db436d682c423fc7188a759400b238b4 (tree) |
|---|---|
| Zeit | 2019-06-11 19:22:49 |
| Autor | Chris Wilson <chris@chri...> |
| Commiter | Greg Kroah-Hartman |
drm/i915: Fix I915_EXEC_RING_MASK
commit d90c06d57027203f73021bb7ddb30b800d65c636 upstream.
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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/uapi/drm/i915_drm.h (diff)| @@ -756,7 +756,7 @@ struct drm_i915_gem_execbuffer2 { | ||
| 756 | 756 | __u32 num_cliprects; |
| 757 | 757 | /** This is a struct drm_clip_rect *cliprects */ |
| 758 | 758 | __u64 cliprects_ptr; |
| 759 | -#define I915_EXEC_RING_MASK (7<<0) | |
| 759 | +#define I915_EXEC_RING_MASK (0x3f) | |
| 760 | 760 | #define I915_EXEC_DEFAULT (0<<0) |
| 761 | 761 | #define I915_EXEC_RENDER (1<<0) |
| 762 | 762 | #define I915_EXEC_BSD (2<<0) |
Android-x86
Fork