Skip to content

Commit

Permalink
drm/i915: Rename i915_gem_engine_cleanup() to engine_set_wedged()
Browse files Browse the repository at this point in the history
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@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170110172246.27297-5-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Jan 10, 2017
1 parent 3cd9442 commit 2a20d6f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 2a20d6f

Please sign in to comment.