[PATCH 6/6] I915_CONTEXT_CREATE_FLAGS_ULLS

[Chris Wilson]

Quoting Tvrtko Ursulin (2021-01-12 17:22:20)
> From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> ---
>  drivers/gpu/drm/i915/gem/i915_gem_context.c       | 11 ++++++++---
>  drivers/gpu/drm/i915/gem/i915_gem_context.h       | 15 +++++++++++++++
>  drivers/gpu/drm/i915/gem/i915_gem_context_types.h |  1 +
>  include/uapi/drm/i915_drm.h                       |  3 ++-
>  4 files changed, 26 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> index ec415172bb00..0c6936235bd3 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> @@ -861,9 +861,14 @@ i915_gem_create_context(struct drm_i915_private *i915, unsigned int flags)
>                 intel_timeline_put(timeline);
>         }
>  
> -       /* Default expiry for user fences. */
> -       ctx->watchdog.timeout_us = CONFIG_DRM_I915_REQUEST_TIMEOUT *
> -                                  NSEC_PER_MSEC / NSEC_PER_USEC;
> +       if (flags & I915_CONTEXT_CREATE_FLAGS_ULLS)
> +               i915_gem_context_set_ulls(ctx); /* TODO make it depend on something? */
> +
> +       if (!i915_gem_context_is_ulls(ctx)) {
> +               /* Default expiry for user fences. */
> +               ctx->watchdog.timeout_us = CONFIG_DRM_I915_REQUEST_TIMEOUT *
> +                                          NSEC_PER_MSEC / NSEC_PER_USEC;
> +       }

Nope. ull is the wrong parameter; CONTEXT_PARAM_WATCHDOG.
-Chris