OSDN Git Service

drm/i915/guc: Disable bonding extension with GuC submission
authorMatthew Brost <matthew.brost@intel.com>
Tue, 27 Jul 2021 00:23:19 +0000 (17:23 -0700)
committerJohn Harrison <John.C.Harrison@Intel.com>
Wed, 28 Jul 2021 00:31:34 +0000 (17:31 -0700)
Update the bonding extension to return -ENODEV when using GuC submission
as this extension fundamentally will not work with the GuC submission
interface.

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210727002348.97202-5-matthew.brost@intel.com
drivers/gpu/drm/i915/gem/i915_gem_context.c

index bc52eee..e3df01a 100644 (file)
@@ -491,6 +491,11 @@ set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data)
                return -EINVAL;
        }
 
+       if (intel_engine_uses_guc(master)) {
+               DRM_DEBUG("bonding extension not supported with GuC submission");
+               return -ENODEV;
+       }
+
        if (get_user(num_bonds, &ext->num_bonds))
                return -EFAULT;