From e3895af8bb12612972efb1a07f0bb02b2853afda Mon Sep 17 00:00:00 2001 From: Michel Thierry Date: Tue, 18 Apr 2017 13:23:17 -0700 Subject: [PATCH] drm/i915: Rename gen8_(un)request_engine_reset to gen8_reset_engine_start/cancel Git-commit: e3895af8bb12612972efb1a07f0bb02b2853afda Patch-mainline: v4.13-rc1 References: FATE#322643 bsc#1055900 As all other functions related to resetting engines are using reset_engine. V2: remove _request_ and use start/cancel instead (Chris) Cc: Chris Wilson Signed-off-by: Michel Thierry Link: http://patchwork.freedesktop.org/patch/msgid/20170418202335.35232-3-michel.thierry@intel.com Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson Acked-by: Takashi Iwai --- drivers/gpu/drm/i915/intel_uncore.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1683,7 +1683,7 @@ int intel_wait_for_register(struct drm_i return ret; } -static int gen8_request_engine_reset(struct intel_engine_cs *engine) +static int gen8_reset_engine_start(struct intel_engine_cs *engine) { struct drm_i915_private *dev_priv = engine->i915; int ret; @@ -1702,7 +1702,7 @@ static int gen8_request_engine_reset(str return ret; } -static void gen8_unrequest_engine_reset(struct intel_engine_cs *engine) +static void gen8_reset_engine_cancel(struct intel_engine_cs *engine) { struct drm_i915_private *dev_priv = engine->i915; @@ -1717,14 +1717,14 @@ static int gen8_reset_engines(struct drm unsigned int tmp; for_each_engine_masked(engine, dev_priv, engine_mask, tmp) - if (gen8_request_engine_reset(engine)) + if (gen8_reset_engine_start(engine)) goto not_ready; return gen6_reset_engines(dev_priv, engine_mask); not_ready: for_each_engine_masked(engine, dev_priv, engine_mask, tmp) - gen8_unrequest_engine_reset(engine); + gen8_reset_engine_cancel(engine); return -EIO; }