[PATCH 3/3] drm/i915/pin: switch to i915 core runtime pm

Jani Nikula
2026-04-07T10:04:58Z

Remove a dependency on struct intel_display from i915 core code.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_fb_pin.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_fb_pin.c b/drivers/gpu/drm/i915/i915_fb_pin.c
index 9ef10cb3e3aa..1018f4b7bc2c 100644
--- a/drivers/gpu/drm/i915/i915_fb_pin.c
+++ b/drivers/gpu/drm/i915/i915_fb_pin.c
@@ -10,7 +10,6 @@
#include <drm/drm_print.h>

#include "display/intel_display_core.h"
-#include "display/intel_display_rpm.h"
#include "display/intel_display_types.h"
#include "display/intel_fb.h"
#include "display/intel_fb_pin.h"
@@ -122,7 +121,7 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
struct drm_i915_private *i915 = to_i915(fb->dev);
struct drm_gem_object *_obj = intel_fb_bo(fb);
struct drm_i915_gem_object *obj = to_intel_bo(_obj);
- struct ref_tracker *wakeref;
+ intel_wakeref_t wakeref;
struct i915_gem_ww_ctx ww;
struct i915_vma *vma;
unsigned int pinctl;
@@ -141,7 +140,7 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
* intel_runtime_pm_put(), so it is correct to wrap only the
* pin/unpin/fence and not more.
*/
- wakeref = intel_display_rpm_get(display);
+ wakeref = intel_runtime_pm_get(&i915->runtime_pm);

atomic_inc(&display->restore.pending_fb_pin);

@@ -220,7 +219,7 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
vma = ERR_PTR(ret);

atomic_dec(&display->restore.pending_fb_pin);
- intel_display_rpm_put(display, wakeref);
+ intel_runtime_pm_put(&i915->runtime_pm, wakeref);
return vma;
}

--
2.47.3