From: Jani Nikula Date: Tue, 7 Apr 2026 10:04:37 +0000 (+0300) Subject: drm/i915/pin: switch to i915 core runtime pm X-Git-Tag: v7.2-rc1~141^2~25^2~108 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=e5bec90aade0166eff1ae10327ad0c71026eb582;p=thirdparty%2Flinux.git drm/i915/pin: switch to i915 core runtime pm Remove a dependency on struct intel_display from i915 core code. Reviewed-by: Ville Syrjälä Link: https://patch.msgid.link/c06366c1c6f9202be5d0b6ea649c20aba414e5bc.1775556190.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/i915_fb_pin.c b/drivers/gpu/drm/i915/i915_fb_pin.c index 9ef10cb3e3aa0..1018f4b7bc2cd 100644 --- a/drivers/gpu/drm/i915/i915_fb_pin.c +++ b/drivers/gpu/drm/i915/i915_fb_pin.c @@ -10,7 +10,6 @@ #include #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 @@ err: 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; }