drm/i915/dpt: switch to i915 runtime pm calls

The i915 specific code doesn't need to, and should not, call the display
runtime pm functions. Just call the i915 functions directly, instead of
routing through the parent interface.

Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Link: https://patch.msgid.link/e8e00552ebf439b5f7b5d293014cce950c9c2999.1772030909.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_dpt.c b/drivers/gpu/drm/i915/i915_dpt.c
index f33e886f331648f7ff48d77aab3b7eb9e09a7c59..8b49ebeecff76a1df16355bdd2755dbab4858644 100644 (file)
--- a/drivers/gpu/drm/i915/i915_dpt.c
+++ b/drivers/gpu/drm/i915/i915_dpt.c
@@ -7,7 +7,6 @@
 #include <drm/intel/display_parent_interface.h>
 
 #include "display/intel_display_core.h"
-#include "display/intel_display_rpm.h"
 #include "gem/i915_gem_domain.h"
 #include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_lmem.h"
@@ -138,7 +137,7 @@ struct i915_vma *intel_dpt_pin_to_ggtt(struct i915_address_space *vm,
        if (i915_gem_object_is_stolen(dpt->obj))
                pin_flags |= PIN_MAPPABLE;
 
-       wakeref = intel_display_rpm_get(display);
+       wakeref = intel_runtime_pm_get(&i915->runtime_pm);
        atomic_inc(&display->restore.pending_fb_pin);
 
        for_i915_gem_ww(&ww, err, true) {
@@ -170,7 +169,7 @@ struct i915_vma *intel_dpt_pin_to_ggtt(struct i915_address_space *vm,
        dpt->obj->mm.dirty = true;
 
        atomic_dec(&display->restore.pending_fb_pin);
-       intel_display_rpm_put(display, wakeref);
+       intel_runtime_pm_put(&i915->runtime_pm, wakeref);
 
        return err ? ERR_PTR(err) : vma;
 }