]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915: Rename i915_gem_engine_cleanup() to engine_set_wedged()
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 10 Jan 2017 17:22:46 +0000 (17:22 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 10 Jan 2017 20:49:32 +0000 (20:49 +0000)
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
drivers/gpu/drm/i915/i915_gem.c

index 7f73a35c772539fafb18ec11749ec84cda817131..e5d96de61c14cfe31e3238293721fde7ad19faf1 100644 (file)
@@ -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;
 }