[Intel-gfx] [PATCH 12/40] drm/i915: Re-expose SINGLE_TIMELINE flags for context creation

[Tvrtko Ursulin]

On 08/05/2019 09:06, Chris Wilson wrote:
> The SINGLE_TIMELINE flag can be used to create a context such that all
> engine instances within that context share a common timeline. This can
> be useful for mixing operations between real and virtual engines, or
> when using a composite context for a single client API context.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>   drivers/gpu/drm/i915/i915_gem_context.c | 4 ----
>   include/uapi/drm/i915_drm.h             | 3 ++-
>   2 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 5fdb44714a5c..9cd671298daf 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -96,8 +96,6 @@
>   #include "i915_trace.h"
>   #include "i915_user_extensions.h"
>   
> -#define I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE (1 << 1)
> -
>   #define ALL_L3_SLICES(dev) (1 << NUM_L3_SLICES(dev)) - 1
>   
>   static struct i915_global_gem_context {
> @@ -505,8 +503,6 @@ i915_gem_create_context(struct drm_i915_private *dev_priv, unsigned int flags)
>   
>   	lockdep_assert_held(&dev_priv->drm.struct_mutex);
>   
> -	BUILD_BUG_ON(I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE &
> -		     ~I915_CONTEXT_CREATE_FLAGS_UNKNOWN);
>   	if (flags & I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE &&
>   	    !HAS_EXECLISTS(dev_priv))
>   		return ERR_PTR(-EINVAL);
> diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
> index 82bd488ed0d1..957ba8e60e02 100644
> --- a/include/uapi/drm/i915_drm.h
> +++ b/include/uapi/drm/i915_drm.h
> @@ -1469,8 +1469,9 @@ struct drm_i915_gem_context_create_ext {
>   	__u32 ctx_id; /* output: id of new context*/
>   	__u32 flags;
>   #define I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS	(1u << 0)
> +#define I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE	(1u << 1)
>   #define I915_CONTEXT_CREATE_FLAGS_UNKNOWN \
> -	(-(I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS << 1))
> +	(-(I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE << 1))
>   	__u64 extensions;
>   };
>   
> 

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko