[Intel-gfx] [PATCH 10/16] drm/i915: Mark the shadow gvt context as closed

[Tvrtko Ursulin]

On 07/12/2016 13:58, Chris Wilson wrote:
> As the shadow gvt is not user accessible and does not have an associated
> vm, we can mark it as closed during its construction. This saves leaking
> the internal knowledge of i915_gem_context into gvt/.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/gvt/scheduler.c    | 10 +---------
>  drivers/gpu/drm/i915/i915_gem_context.c |  1 +
>  2 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c
> index 4db242250235..fd2b026f7ecd 100644
> --- a/drivers/gpu/drm/i915/gvt/scheduler.c
> +++ b/drivers/gpu/drm/i915/gvt/scheduler.c
> @@ -549,18 +549,10 @@ int intel_gvt_init_workload_scheduler(struct intel_gvt *gvt)
>
>  void intel_vgpu_clean_gvt_context(struct intel_vgpu *vgpu)
>  {
> -	struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;
> -
>  	atomic_notifier_chain_unregister(&vgpu->shadow_ctx->status_notifier,
>  			&vgpu->shadow_ctx_notifier_block);
>
> -	mutex_lock(&dev_priv->drm.struct_mutex);
> -
> -	/* a little hacky to mark as ctx closed */
> -	vgpu->shadow_ctx->closed = true;
> -	i915_gem_context_put(vgpu->shadow_ctx);
> -
> -	mutex_unlock(&dev_priv->drm.struct_mutex);
> +	i915_gem_context_put_unlocked(vgpu->shadow_ctx);
>  }
>
>  int intel_vgpu_init_gvt_context(struct intel_vgpu *vgpu)
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 95812c26767c..042befd263fe 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -409,6 +409,7 @@ i915_gem_context_create_gvt(struct drm_device *dev)
>  	if (IS_ERR(ctx))
>  		goto out;
>
> +	ctx->closed = true; /* not user accessible */
>  	ctx->execlists_force_single_submission = true;
>  	ctx->ring_size = 512 * PAGE_SIZE; /* Max ring buffer size */
>  out:
>

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

Regards,

Tvrtko