[Intel-gfx] [PATCH 5/5] drm/i915: Rename i915_gem_engine_cleanup() to engine_set_wedged()

Tvrtko Ursulin tvrtko.ursulin at linux.intel.com
Tue Jan 10 12:17:53 UTC 2017


On 10/01/2017 10:27, Chris Wilson wrote:
> It has been some time since i915_gem_engine_cleanup was only called from
> the module unload path, and now it is only called when the GPU is
> wedged. Mika complained that the name is confusing, especially in light
> of the existence of i915_gem_cleanup_engines().
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Cc: Mika Kuoppala <mika.kuoppala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gem.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 0eeb0204848b..7994a241c8b7 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -2735,7 +2735,7 @@ static void nop_submit_request(struct drm_i915_gem_request *request)
>  	intel_engine_init_global_seqno(request->engine, request->global_seqno);
>  }
>
> -static void i915_gem_cleanup_engine(struct intel_engine_cs *engine)
> +static void engine_set_wedged(struct intel_engine_cs *engine)
>  {
>  	struct drm_i915_gem_request *request;
>  	unsigned long flags;
> @@ -2789,7 +2789,7 @@ static int __i915_gem_set_wedged_BKL(void *data)
>  	enum intel_engine_id id;
>
>  	for_each_engine(engine, i915, id)
> -		i915_gem_cleanup_engine(engine);
> +		engine_set_wedged(engine);
>
>  	return 0;
>  }
>

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

Regards,

Tvrtko


More information about the Intel-gfx mailing list