[PATCH 1/2] pretend-default

[Chris Wilson]

---
 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 27dbcb508055..69410f523a5a 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -2099,7 +2099,6 @@ gen8_dispatch_bsd_engine(struct drm_i915_private *dev_priv,
 }
 
 static const enum intel_engine_id user_ring_map[] = {
-	[I915_EXEC_DEFAULT]	= RCS0,
 	[I915_EXEC_RENDER]	= RCS0,
 	[I915_EXEC_BLT]		= BCS0,
 	[I915_EXEC_BSD]		= VCS0,
@@ -2256,6 +2255,9 @@ eb_select_legacy_ring(struct i915_execbuffer *eb,
 	struct drm_i915_private *i915 = eb->i915;
 	unsigned int user_ring_id = args->flags & I915_EXEC_RING_MASK;
 
+	if (user_ring_id == I915_EXEC_DEFAULT)
+		return __ffs(INTEL_INFO(i915)->engine_mask);
+
 	if (user_ring_id != I915_EXEC_BSD &&
 	    (args->flags & I915_EXEC_BSD_MASK)) {
 		DRM_DEBUG("execbuf with non bsd ring but with invalid "
-- 
2.23.0