[Intel-gfx] [PATCH] drm/i915: Avoid ce->gem_context->i915

[Tvrtko Ursulin]

On 30/07/2019 17:34, Chris Wilson wrote:
> My plan for the future is to have kernel contexts no have a GEM context
> backpointer (as they will not belong to any GEM context). In a few
> places, we use ce->gem_context to simply obtain the i915 backpointer,
> which we can use ce->engine->i915 instead.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>   drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 2 +-
>   drivers/gpu/drm/i915/gem/i915_gem_context.c    | 4 ++--
>   drivers/gpu/drm/i915/i915_perf.c               | 2 +-
>   3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c b/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c
> index 2312a0c6af89..997e122545bc 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_client_blt.c
> @@ -152,7 +152,7 @@ static void clear_pages_dma_fence_cb(struct dma_fence *fence,
>   static void clear_pages_worker(struct work_struct *work)
>   {
>   	struct clear_pages_work *w = container_of(work, typeof(*w), work);
> -	struct drm_i915_private *i915 = w->ce->gem_context->i915;
> +	struct drm_i915_private *i915 = w->ce->engine->i915;
>   	struct drm_i915_gem_object *obj = w->sleeve->vma->obj;
>   	struct i915_vma *vma = w->sleeve->vma;
>   	struct i915_request *rq;
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> index b28c7ca681a8..eb2d28a37b58 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> @@ -1194,7 +1194,7 @@ __intel_context_reconfigure_sseu(struct intel_context *ce,
>   {
>   	int ret;
>   
> -	GEM_BUG_ON(INTEL_GEN(ce->gem_context->i915) < 8);
> +	GEM_BUG_ON(INTEL_GEN(ce->engine->i915) < 8);
>   
>   	ret = intel_context_lock_pinned(ce);
>   	if (ret)
> @@ -1216,7 +1216,7 @@ __intel_context_reconfigure_sseu(struct intel_context *ce,
>   static int
>   intel_context_reconfigure_sseu(struct intel_context *ce, struct intel_sseu sseu)
>   {
> -	struct drm_i915_private *i915 = ce->gem_context->i915;
> +	struct drm_i915_private *i915 = ce->engine->i915;
>   	int ret;
>   
>   	ret = mutex_lock_interruptible(&i915->drm.struct_mutex);
> diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> index 988a4092164e..f2cc69ccb635 100644
> --- a/drivers/gpu/drm/i915/i915_perf.c
> +++ b/drivers/gpu/drm/i915/i915_perf.c
> @@ -1667,7 +1667,7 @@ gen8_update_reg_state_unlocked(struct intel_context *ce,
>   			       u32 *reg_state,
>   			       const struct i915_oa_config *oa_config)
>   {
> -	struct drm_i915_private *i915 = ce->gem_context->i915;
> +	struct drm_i915_private *i915 = ce->engine->i915;
>   	u32 ctx_oactxctrl = i915->perf.oa.ctx_oactxctrl_offset;
>   	u32 ctx_flexeu0 = i915->perf.oa.ctx_flexeu0_offset;
>   	/* The MMIO offsets for Flex EU registers aren't contiguous */
> 

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

Regards,

Tvrtko