Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> writes:
> Introduce a new ABI method for detecting a wedged driver by reporting
> -EIO from DRM_IOCTL_I915_GEM_CONTEXT_CREATE.
Need more on the 'why' department. What is lacking with
the method of submitting and noticing the wedged?
Also detecting banned from wedged is not trivial.
I am trying to figure out what is the userspace
need and flow wrt this.
If we will have object parameters, should we
convey this type of information with status query?
-Mika
>
> Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Cc: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_gem_context.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 7541c6f961b3..7337aa01c361 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -802,18 +802,23 @@ static bool client_is_banned(struct drm_i915_file_private *file_priv)
> int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
> struct drm_file *file)
> {
> - struct drm_i915_private *dev_priv = to_i915(dev);
> + struct drm_i915_private *i915 = to_i915(dev);
> struct drm_i915_gem_context_create *args = data;
> struct drm_i915_file_private *file_priv = file->driver_priv;
> struct i915_gem_context *ctx;
> int ret;
>
> - if (!DRIVER_CAPS(dev_priv)->has_logical_contexts)
> + if (!DRIVER_CAPS(i915)->has_logical_contexts)
> return -ENODEV;
>
> if (args->pad != 0)
> return -EINVAL;
>
> + if (i915_terminally_wedged(&i915->gpu_error)) {
> + DRM_DEBUG("driver is wedged; banning new ctx!\n");
> + return -EIO;
> + }
> +
> if (client_is_banned(file_priv)) {
> DRM_DEBUG("client %s[%d] banned from creating ctx\n",
> current->comm,
> @@ -826,7 +831,7 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
> if (ret)
> return ret;
>
> - ctx = i915_gem_create_context(dev_priv, file_priv);
> + ctx = i915_gem_create_context(i915, file_priv);
> mutex_unlock(&dev->struct_mutex);
> if (IS_ERR(ctx))
> return PTR_ERR(ctx);
> --
> 2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
