summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2020-01-09 09:57:17 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2020-01-09 14:48:13 +0100
commitd4fb2d76095900952805c07c0067452a1470b85e (patch)
tree7eaa09ea6ba0471ceeead353e13b54dc0ff9f3d9 /drivers/gpu/drm/i915
parentdrm/i915/gt: Pull context activation into central intel_context_pin() (diff)
downloadlinux-d4fb2d76095900952805c07c0067452a1470b85e.tar.xz
linux-d4fb2d76095900952805c07c0067452a1470b85e.zip
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 <chris@chris-wilson.co.uk> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200109085717.873326-3-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/gt/intel_context.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
index cac80d87b2bb..9796a54b4f47 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;