drm/i915: Finalize contexts in GEM_CONTEXT_CREATE on version 13+

All the proto-context stuff for context creation exists to allow older
userspace drivers to set VMs and engine sets via SET_CONTEXT_PARAM.
Drivers need to update to use CONTEXT_CREATE_EXT_* for this going
forward.  Force the issue by blocking the old mechanism on any future
hardware generations.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Cc: Jon Bloomfield <jon.bloomfield@intel.com>
Cc: Carl Zhang <carl.zhang@intel.com>
Cc: Michal Mrozek <michal.mrozek@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210708154835.528166-31-jason@jlekstrand.net

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index c67e305f5bc74f1bc7d7d7ef09fd0165c624b672..7d6f52d8a801231774f3eb67c0598554a920a6df 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -1996,9 +1996,28 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
                        goto err_pc;
        }
 
-       ret = proto_context_register(ext_data.fpriv, ext_data.pc, &id);
-       if (ret < 0)
-               goto err_pc;
+       if (GRAPHICS_VER(i915) > 12) {
+               struct i915_gem_context *ctx;
+
+               /* Get ourselves a context ID */
+               ret = xa_alloc(&ext_data.fpriv->context_xa, &id, NULL,
+                              xa_limit_32b, GFP_KERNEL);
+               if (ret)
+                       goto err_pc;
+
+               ctx = i915_gem_create_context(i915, ext_data.pc);
+               if (IS_ERR(ctx)) {
+                       ret = PTR_ERR(ctx);
+                       goto err_pc;
+               }
+
+               proto_context_close(ext_data.pc);
+               gem_context_register(ctx, ext_data.fpriv, id);
+       } else {
+               ret = proto_context_register(ext_data.fpriv, ext_data.pc, &id);
+               if (ret < 0)
+                       goto err_pc;
+       }
 
        args->ctx_id = id;
        drm_dbg(&i915->drm, "HW context %d created\n", args->ctx_id);
@@ -2181,15 +2200,17 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data,
        mutex_lock(&file_priv->proto_context_lock);
        ctx = __context_lookup(file_priv, args->ctx_id);
        if (!ctx) {
-               /* FIXME: We should consider disallowing SET_CONTEXT_PARAM
-                * for most things on future platforms.  Clients should be
-                * using CONTEXT_CREATE_EXT_PARAM instead.
-                */
                pc = xa_load(&file_priv->proto_context_xa, args->ctx_id);
-               if (pc)
+               if (pc) {
+                       /* Contexts should be finalized inside
+                        * GEM_CONTEXT_CREATE starting with graphics
+                        * version 13.
+                        */
+                       WARN_ON(GRAPHICS_VER(file_priv->dev_priv) > 12);
                        ret = set_proto_ctx_param(file_priv, pc, args);
-               else
+               } else {
                        ret = -ENOENT;
+               }
        }
        mutex_unlock(&file_priv->proto_context_lock);