Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: Rename i915_gem_engine_cleanup() to engine_set_wedged()

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

+2 -2
+2 -2
drivers/gpu/drm/i915/i915_gem.c
··· 2735 2735 intel_engine_init_global_seqno(request->engine, request->global_seqno); 2736 2736 } 2737 2737 2738 - static void i915_gem_cleanup_engine(struct intel_engine_cs *engine) 2738 + static void engine_set_wedged(struct intel_engine_cs *engine) 2739 2739 { 2740 2740 struct drm_i915_gem_request *request; 2741 2741 unsigned long flags; ··· 2789 2789 enum intel_engine_id id; 2790 2790 2791 2791 for_each_engine(engine, i915, id) 2792 - i915_gem_cleanup_engine(engine); 2792 + engine_set_wedged(engine); 2793 2793 2794 2794 return 0; 2795 2795 }