From: Chris Wilson Date: Thu, 9 Jan 2020 08:57:17 +0000 (+0000) Subject: drm/i915/gt: runtime-pm is no longer required for ce->ops->pin() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d4fb2d76095900952805c07c0067452a1470b85e;p=linux.git drm/i915/gt: runtime-pm is no longer required for ce->ops->pin() Now that we have moved the runtime-pm management out of intel_context_acctive_acquire, and that itself out of ce->ops->pin(), no explicit runtime pm wakeref is required in intel_context_pin(). Signed-off-by: Chris Wilson Reviewed-by: Maarten Lankhorst Link: https://patchwork.freedesktop.org/patch/msgid/20200109085717.873326-3-chris@chris-wilson.co.uk --- diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c index cac80d87b2bb4..9796a54b4f476 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.c +++ b/drivers/gpu/drm/i915/gt/intel_context.c @@ -105,14 +105,11 @@ int __intel_context_do_pin(struct intel_context *ce) return -EINTR; if (likely(!atomic_read(&ce->pin_count))) { - intel_wakeref_t wakeref; - err = intel_context_active_acquire(ce); if (unlikely(err)) goto err; - with_intel_runtime_pm(ce->engine->uncore->rpm, wakeref) - err = ce->ops->pin(ce); + err = ce->ops->pin(ce); if (unlikely(err)) goto err_active;