| Message ID | 20200109085839.873553-3-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/14] drm/i915/gt: Push context state allocation earlier | expand |
Chris Wilson <chris@chris-wilson.co.uk> writes: > Now that we have moved the runtime-pm management out of > intel_context_acctive_acquire, and that itself out of ce->ops->pin(), > no s/acctive/active > explicit runtime pm wakeref is required in intel_context_pin(). > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > --- > drivers/gpu/drm/i915/gt/intel_context.c | 5 +---- > 1 file changed, 1 insertion(+), 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; > > -- > 2.25.0.rc1
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;
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> --- drivers/gpu/drm/i915/gt/intel_context.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)