[PATCH 1/2] drm/i915/gvt: rename is_inhibit_context to is_restore_inhibit_context

[Zhenyu Wang]

On 2019.06.03 00:56:17 -0400, Yan Zhao wrote:
> There are two inhibit contexts: restore inhibit and save inhibit
> we need to distinguish between the two.
> 
> Cc: Weinan Li <weinan.z.li at intel.com>
> Signed-off-by: Yan Zhao <yan.y.zhao at intel.com>
> ---

Looks good to me.

Reviewed-by: Zhenyu Wang <zhenyuw at linux.intel.com>

>  drivers/gpu/drm/i915/gvt/mmio_context.c | 9 +++------
>  drivers/gpu/drm/i915/gvt/mmio_context.h | 2 +-
>  drivers/gpu/drm/i915/gvt/scheduler.c    | 2 +-
>  3 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gvt/mmio_context.c b/drivers/gpu/drm/i915/gvt/mmio_context.c
> index 96e1edf21b3f..0c3e2f21e28c 100644
> --- a/drivers/gpu/drm/i915/gvt/mmio_context.c
> +++ b/drivers/gpu/drm/i915/gvt/mmio_context.c
> @@ -438,14 +438,11 @@ static void switch_mocs(struct intel_vgpu *pre, struct intel_vgpu *next,
>  
>  #define CTX_CONTEXT_CONTROL_VAL	0x03
>  
> -bool is_inhibit_context(struct intel_context *ce)
> +bool is_restore_inhibit_context(struct intel_context *ce)
>  {
>  	const u32 *reg_state = ce->lrc_reg_state;
> -	u32 inhibit_mask =
> -		_MASKED_BIT_ENABLE(CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT);
>  
> -	return inhibit_mask ==
> -		(reg_state[CTX_CONTEXT_CONTROL_VAL] & inhibit_mask);
> +	return IS_RESTORE_INHIBIT(reg_state[CTX_CONTEXT_CONTROL_VAL]);
>  }
>  
>  /* Switch ring mmio values (context). */
> @@ -493,7 +490,7 @@ static void switch_mmio(struct intel_vgpu *pre,
>  			 * itself.
>  			 */
>  			if (mmio->in_context &&
> -			    !is_inhibit_context(s->shadow[ring_id]))
> +			    !is_restore_inhibit_context(s->shadow[ring_id]))
>  				continue;
>  
>  			if (mmio->mask)
> diff --git a/drivers/gpu/drm/i915/gvt/mmio_context.h b/drivers/gpu/drm/i915/gvt/mmio_context.h
> index f7eaa442403f..08e3a775fae7 100644
> --- a/drivers/gpu/drm/i915/gvt/mmio_context.h
> +++ b/drivers/gpu/drm/i915/gvt/mmio_context.h
> @@ -49,7 +49,7 @@ void intel_gvt_switch_mmio(struct intel_vgpu *pre,
>  
>  void intel_gvt_init_engine_mmio_context(struct intel_gvt *gvt);
>  
> -bool is_inhibit_context(struct intel_context *ce);
> +bool is_restore_inhibit_context(struct intel_context *ce);
>  
>  int intel_vgpu_restore_inhibit_context(struct intel_vgpu *vgpu,
>  				       struct i915_request *req);
> diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c
> index 8f3ba49b06f5..5c2087600442 100644
> --- a/drivers/gpu/drm/i915/gvt/scheduler.c
> +++ b/drivers/gpu/drm/i915/gvt/scheduler.c
> @@ -313,7 +313,7 @@ static int copy_workload_to_ring_buffer(struct intel_vgpu_workload *workload)
>  	u32 *cs;
>  	int err;
>  
> -	if (IS_GEN(req->i915, 9) && is_inhibit_context(req->hw_context))
> +	if (IS_GEN(req->i915, 9) && is_restore_inhibit_context(req->hw_context))
>  		intel_vgpu_restore_inhibit_context(vgpu, req);
>  
>  	/*
> -- 
> 2.17.1
> 
> _______________________________________________
> intel-gvt-dev mailing list
> intel-gvt-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/intel-gvt-dev/attachments/20190604/38dd1bf7/attachment.sig>