intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/5] drm/i915/display: switch from intel_wakeref_t to struct ref_tracker *
@ 2025-11-25 13:24 Jani Nikula
  2025-11-25 13:24 ` [PATCH v2 1/5] drm/i915/pps: drop wakeref parameter from with_intel_pps_lock() Jani Nikula
                   ` (6 more replies)
  0 siblings, 7 replies; 16+ messages in thread
From: Jani Nikula @ 2025-11-25 13:24 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: jani.nikula

v2 of [1] fixing it for CONFIG_DRM_I915_DEBUG_RUNTIME_PM=n.

[1] https://lore.kernel.org/r/cover.1763729370.git.jani.nikula@intel.com


Jani Nikula (5):
  drm/i915/pps: drop wakeref parameter from with_intel_pps_lock()
  drm/i915/pps: convert intel_wakeref_t to struct ref_tracker *
  drm/i915/power: drop wakeref parameter from
    with_intel_display_power*()
  drm/i915/power: convert intel_wakeref_t to struct ref_tracker *
  drm/{i915,xe}/display: drop intel_wakeref.h usage

 drivers/gpu/drm/i915/display/g4x_dp.c         |  5 +-
 drivers/gpu/drm/i915/display/g4x_hdmi.c       |  2 +-
 drivers/gpu/drm/i915/display/i9xx_plane.c     |  2 +-
 drivers/gpu/drm/i915/display/icl_dsi.c        |  4 +-
 drivers/gpu/drm/i915/display/intel_audio.c    |  6 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c    |  4 +-
 drivers/gpu/drm/i915/display/intel_cmtg.c     |  3 +-
 drivers/gpu/drm/i915/display/intel_crt.c      |  6 +-
 drivers/gpu/drm/i915/display/intel_cursor.c   |  4 +-
 drivers/gpu/drm/i915/display/intel_cx0_phy.c  | 18 +++---
 drivers/gpu/drm/i915/display/intel_ddi.c      | 16 ++---
 drivers/gpu/drm/i915/display/intel_display.c  | 23 +++----
 .../gpu/drm/i915/display/intel_display_core.h |  2 +-
 .../drm/i915/display/intel_display_debugfs.c  |  2 +-
 .../drm/i915/display/intel_display_power.c    | 26 ++++----
 .../drm/i915/display/intel_display_power.h    | 48 ++++++++------
 .../drm/i915/display/intel_display_types.h    |  6 +-
 drivers/gpu/drm/i915/display/intel_dmc.c      |  2 +-
 drivers/gpu/drm/i915/display/intel_dp.c       |  3 +-
 drivers/gpu/drm/i915/display/intel_dp_aux.c   |  4 +-
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 18 +++---
 drivers/gpu/drm/i915/display/intel_dpll_mgr.h |  4 +-
 drivers/gpu/drm/i915/display/intel_dsi.h      |  7 ++-
 drivers/gpu/drm/i915/display/intel_gmbus.c    |  4 +-
 drivers/gpu/drm/i915/display/intel_hdmi.c     |  4 +-
 drivers/gpu/drm/i915/display/intel_hotplug.c  |  2 +-
 drivers/gpu/drm/i915/display/intel_lt_phy.c   | 14 ++---
 drivers/gpu/drm/i915/display/intel_lvds.c     |  2 +-
 .../drm/i915/display/intel_modeset_setup.c    |  2 +-
 drivers/gpu/drm/i915/display/intel_pipe_crc.c |  2 +-
 drivers/gpu/drm/i915/display/intel_pps.c      | 63 ++++++-------------
 drivers/gpu/drm/i915/display/intel_pps.h      | 14 +++--
 drivers/gpu/drm/i915/display/intel_sprite.c   |  6 +-
 drivers/gpu/drm/i915/display/intel_tc.c       | 40 +++++-------
 drivers/gpu/drm/i915/display/intel_vdsc.c     |  2 +-
 .../drm/i915/display/skl_universal_plane.c    |  2 +-
 drivers/gpu/drm/i915/display/skl_watermark.c  |  2 +-
 drivers/gpu/drm/i915/display/vlv_dsi.c        |  2 +-
 .../xe/compat-i915-headers/intel_wakeref.h    | 10 ---
 drivers/gpu/drm/xe/display/xe_display_rpm.c   |  3 +
 40 files changed, 177 insertions(+), 212 deletions(-)
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h

-- 
2.47.3


^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v2 1/5] drm/i915/pps: drop wakeref parameter from with_intel_pps_lock()
  2025-11-25 13:24 [PATCH v2 0/5] drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * Jani Nikula
@ 2025-11-25 13:24 ` Jani Nikula
  2025-12-01  8:06   ` Luca Coelho
  2025-11-25 13:24 ` [PATCH v2 2/5] drm/i915/pps: convert intel_wakeref_t to struct ref_tracker * Jani Nikula
                   ` (5 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Jani Nikula @ 2025-11-25 13:24 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: jani.nikula

Add another level of macro abstraction, and declare the wakeref within
the for loop using __UNIQUE_ID. This allows us to drop a bunch of
boilerplate declarations and parameter passing.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/g4x_dp.c    |  3 +-
 drivers/gpu/drm/i915/display/intel_pps.c | 56 +++++++-----------------
 drivers/gpu/drm/i915/display/intel_pps.h |  7 ++-
 3 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
index a3ff21b2f69f..27f4c55d7484 100644
--- a/drivers/gpu/drm/i915/display/g4x_dp.c
+++ b/drivers/gpu/drm/i915/display/g4x_dp.c
@@ -684,12 +684,11 @@ static void intel_enable_dp(struct intel_atomic_state *state,
 	struct intel_display *display = to_intel_display(state);
 	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
 	u32 dp_reg = intel_de_read(display, intel_dp->output_reg);
-	intel_wakeref_t wakeref;
 
 	if (drm_WARN_ON(display->drm, dp_reg & DP_PORT_EN))
 		return;
 
-	with_intel_pps_lock(intel_dp, wakeref) {
+	with_intel_pps_lock(intel_dp) {
 		if (display->platform.valleyview || display->platform.cherryview)
 			vlv_pps_port_enable_unlocked(encoder, pipe_config);
 
diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
index 25692a547764..34376255b85c 100644
--- a/drivers/gpu/drm/i915/display/intel_pps.c
+++ b/drivers/gpu/drm/i915/display/intel_pps.c
@@ -697,12 +697,10 @@ static void wait_panel_power_cycle(struct intel_dp *intel_dp)
 
 void intel_pps_wait_power_cycle(struct intel_dp *intel_dp)
 {
-	intel_wakeref_t wakeref;
-
 	if (!intel_dp_is_edp(intel_dp))
 		return;
 
-	with_intel_pps_lock(intel_dp, wakeref)
+	with_intel_pps_lock(intel_dp)
 		wait_panel_power_cycle(intel_dp);
 }
 
@@ -811,14 +809,13 @@ bool intel_pps_vdd_on_unlocked(struct intel_dp *intel_dp)
 void intel_pps_vdd_on(struct intel_dp *intel_dp)
 {
 	struct intel_display *display = to_intel_display(intel_dp);
-	intel_wakeref_t wakeref;
 	bool vdd;
 
 	if (!intel_dp_is_edp(intel_dp))
 		return;
 
 	vdd = false;
-	with_intel_pps_lock(intel_dp, wakeref)
+	with_intel_pps_lock(intel_dp)
 		vdd = intel_pps_vdd_on_unlocked(intel_dp);
 	INTEL_DISPLAY_STATE_WARN(display, !vdd, "[ENCODER:%d:%s] %s VDD already requested on\n",
 				 dp_to_dig_port(intel_dp)->base.base.base.id,
@@ -873,8 +870,6 @@ static void intel_pps_vdd_off_sync_unlocked(struct intel_dp *intel_dp)
 
 void intel_pps_vdd_off_sync(struct intel_dp *intel_dp)
 {
-	intel_wakeref_t wakeref;
-
 	if (!intel_dp_is_edp(intel_dp))
 		return;
 
@@ -883,7 +878,7 @@ void intel_pps_vdd_off_sync(struct intel_dp *intel_dp)
 	 * vdd might still be enabled due to the delayed vdd off.
 	 * Make sure vdd is actually turned off here.
 	 */
-	with_intel_pps_lock(intel_dp, wakeref)
+	with_intel_pps_lock(intel_dp)
 		intel_pps_vdd_off_sync_unlocked(intel_dp);
 }
 
@@ -892,9 +887,8 @@ static void edp_panel_vdd_work(struct work_struct *__work)
 	struct intel_pps *pps = container_of(to_delayed_work(__work),
 					     struct intel_pps, panel_vdd_work);
 	struct intel_dp *intel_dp = container_of(pps, struct intel_dp, pps);
-	intel_wakeref_t wakeref;
 
-	with_intel_pps_lock(intel_dp, wakeref) {
+	with_intel_pps_lock(intel_dp) {
 		if (!intel_dp->pps.want_panel_vdd)
 			intel_pps_vdd_off_sync_unlocked(intel_dp);
 	}
@@ -952,12 +946,10 @@ void intel_pps_vdd_off_unlocked(struct intel_dp *intel_dp, bool sync)
 
 void intel_pps_vdd_off(struct intel_dp *intel_dp)
 {
-	intel_wakeref_t wakeref;
-
 	if (!intel_dp_is_edp(intel_dp))
 		return;
 
-	with_intel_pps_lock(intel_dp, wakeref)
+	with_intel_pps_lock(intel_dp)
 		intel_pps_vdd_off_unlocked(intel_dp, false);
 }
 
@@ -1026,12 +1018,10 @@ void intel_pps_on_unlocked(struct intel_dp *intel_dp)
 
 void intel_pps_on(struct intel_dp *intel_dp)
 {
-	intel_wakeref_t wakeref;
-
 	if (!intel_dp_is_edp(intel_dp))
 		return;
 
-	with_intel_pps_lock(intel_dp, wakeref)
+	with_intel_pps_lock(intel_dp)
 		intel_pps_on_unlocked(intel_dp);
 }
 
@@ -1082,12 +1072,10 @@ void intel_pps_off_unlocked(struct intel_dp *intel_dp)
 
 void intel_pps_off(struct intel_dp *intel_dp)
 {
-	intel_wakeref_t wakeref;
-
 	if (!intel_dp_is_edp(intel_dp))
 		return;
 
-	with_intel_pps_lock(intel_dp, wakeref)
+	with_intel_pps_lock(intel_dp)
 		intel_pps_off_unlocked(intel_dp);
 }
 
@@ -1095,7 +1083,6 @@ void intel_pps_off(struct intel_dp *intel_dp)
 void intel_pps_backlight_on(struct intel_dp *intel_dp)
 {
 	struct intel_display *display = to_intel_display(intel_dp);
-	intel_wakeref_t wakeref;
 
 	/*
 	 * If we enable the backlight right away following a panel power
@@ -1105,7 +1092,7 @@ void intel_pps_backlight_on(struct intel_dp *intel_dp)
 	 */
 	wait_backlight_on(intel_dp);
 
-	with_intel_pps_lock(intel_dp, wakeref) {
+	with_intel_pps_lock(intel_dp) {
 		i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
 		u32 pp;
 
@@ -1121,12 +1108,11 @@ void intel_pps_backlight_on(struct intel_dp *intel_dp)
 void intel_pps_backlight_off(struct intel_dp *intel_dp)
 {
 	struct intel_display *display = to_intel_display(intel_dp);
-	intel_wakeref_t wakeref;
 
 	if (!intel_dp_is_edp(intel_dp))
 		return;
 
-	with_intel_pps_lock(intel_dp, wakeref) {
+	with_intel_pps_lock(intel_dp) {
 		i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
 		u32 pp;
 
@@ -1149,11 +1135,10 @@ void intel_pps_backlight_power(struct intel_connector *connector, bool enable)
 {
 	struct intel_display *display = to_intel_display(connector);
 	struct intel_dp *intel_dp = intel_attached_dp(connector);
-	intel_wakeref_t wakeref;
 	bool is_enabled;
 
 	is_enabled = false;
-	with_intel_pps_lock(intel_dp, wakeref)
+	with_intel_pps_lock(intel_dp)
 		is_enabled = ilk_get_pp_control(intel_dp) & EDP_BLC_ENABLE;
 	if (is_enabled == enable)
 		return;
@@ -1251,9 +1236,7 @@ void vlv_pps_pipe_init(struct intel_dp *intel_dp)
 /* Call on all DP, not just eDP */
 void vlv_pps_pipe_reset(struct intel_dp *intel_dp)
 {
-	intel_wakeref_t wakeref;
-
-	with_intel_pps_lock(intel_dp, wakeref)
+	with_intel_pps_lock(intel_dp)
 		intel_dp->pps.vlv_active_pipe = vlv_active_pipe(intel_dp);
 }
 
@@ -1329,9 +1312,7 @@ void vlv_pps_port_disable(struct intel_encoder *encoder,
 {
 	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
 
-	intel_wakeref_t wakeref;
-
-	with_intel_pps_lock(intel_dp, wakeref)
+	with_intel_pps_lock(intel_dp)
 		intel_dp->pps.vlv_active_pipe = INVALID_PIPE;
 }
 
@@ -1362,10 +1343,9 @@ static void pps_vdd_init(struct intel_dp *intel_dp)
 
 bool intel_pps_have_panel_power_or_vdd(struct intel_dp *intel_dp)
 {
-	intel_wakeref_t wakeref;
 	bool have_power = false;
 
-	with_intel_pps_lock(intel_dp, wakeref) {
+	with_intel_pps_lock(intel_dp) {
 		have_power = edp_have_panel_power(intel_dp) ||
 			     edp_have_panel_vdd(intel_dp);
 	}
@@ -1692,12 +1672,11 @@ static void pps_init_registers(struct intel_dp *intel_dp, bool force_disable_vdd
 void intel_pps_encoder_reset(struct intel_dp *intel_dp)
 {
 	struct intel_display *display = to_intel_display(intel_dp);
-	intel_wakeref_t wakeref;
 
 	if (!intel_dp_is_edp(intel_dp))
 		return;
 
-	with_intel_pps_lock(intel_dp, wakeref) {
+	with_intel_pps_lock(intel_dp) {
 		/*
 		 * Reinit the power sequencer also on the resume path, in case
 		 * BIOS did something nasty with it.
@@ -1716,7 +1695,6 @@ void intel_pps_encoder_reset(struct intel_dp *intel_dp)
 
 bool intel_pps_init(struct intel_dp *intel_dp)
 {
-	intel_wakeref_t wakeref;
 	bool ret;
 
 	intel_dp->pps.initializing = true;
@@ -1724,7 +1702,7 @@ bool intel_pps_init(struct intel_dp *intel_dp)
 
 	pps_init_timestamps(intel_dp);
 
-	with_intel_pps_lock(intel_dp, wakeref) {
+	with_intel_pps_lock(intel_dp) {
 		ret = pps_initial_setup(intel_dp);
 
 		pps_init_delays(intel_dp);
@@ -1760,9 +1738,7 @@ static void pps_init_late(struct intel_dp *intel_dp)
 
 void intel_pps_init_late(struct intel_dp *intel_dp)
 {
-	intel_wakeref_t wakeref;
-
-	with_intel_pps_lock(intel_dp, wakeref) {
+	with_intel_pps_lock(intel_dp) {
 		/* Reinit delays after per-panel info has been parsed from VBT */
 		pps_init_late(intel_dp);
 
diff --git a/drivers/gpu/drm/i915/display/intel_pps.h b/drivers/gpu/drm/i915/display/intel_pps.h
index c83007152f07..ad5c458ccdaf 100644
--- a/drivers/gpu/drm/i915/display/intel_pps.h
+++ b/drivers/gpu/drm/i915/display/intel_pps.h
@@ -20,8 +20,11 @@ struct intel_encoder;
 intel_wakeref_t intel_pps_lock(struct intel_dp *intel_dp);
 intel_wakeref_t intel_pps_unlock(struct intel_dp *intel_dp, intel_wakeref_t wakeref);
 
-#define with_intel_pps_lock(dp, wf)						\
-	for ((wf) = intel_pps_lock(dp); (wf); (wf) = intel_pps_unlock((dp), (wf)))
+#define __with_intel_pps_lock(dp, wf) \
+	for (intel_wakeref_t (wf) = intel_pps_lock(dp); (wf); (wf) = intel_pps_unlock((dp), (wf)))
+
+#define with_intel_pps_lock(dp) \
+	__with_intel_pps_lock((dp), __UNIQUE_ID(wakeref))
 
 void intel_pps_backlight_on(struct intel_dp *intel_dp);
 void intel_pps_backlight_off(struct intel_dp *intel_dp);
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH v2 2/5] drm/i915/pps: convert intel_wakeref_t to struct ref_tracker *
  2025-11-25 13:24 [PATCH v2 0/5] drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * Jani Nikula
  2025-11-25 13:24 ` [PATCH v2 1/5] drm/i915/pps: drop wakeref parameter from with_intel_pps_lock() Jani Nikula
@ 2025-11-25 13:24 ` Jani Nikula
  2025-12-01  8:09   ` Luca Coelho
  2025-11-25 13:24 ` [PATCH v2 3/5] drm/i915/power: drop wakeref parameter from with_intel_display_power*() Jani Nikula
                   ` (4 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Jani Nikula @ 2025-11-25 13:24 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: jani.nikula

Under the hood, intel_wakeref_t is just struct ref_tracker *. Use the
actual underlying type both for clarity (we *are* using intel_wakeref_t
as a pointer though it doesn't look like one) and to help i915, xe and
display coexistence without custom types.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp_aux.c | 2 +-
 drivers/gpu/drm/i915/display/intel_pps.c    | 7 +++----
 drivers/gpu/drm/i915/display/intel_pps.h    | 9 ++++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux.c b/drivers/gpu/drm/i915/display/intel_dp_aux.c
index 809799f63e32..38e03f3efac5 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_aux.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c
@@ -246,7 +246,7 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
 	u32 aux_clock_divider;
 	enum intel_display_power_domain aux_domain;
 	intel_wakeref_t aux_wakeref;
-	intel_wakeref_t pps_wakeref = NULL;
+	struct ref_tracker *pps_wakeref = NULL;
 	int i, ret, recv_bytes;
 	int try, clock = 0;
 	u32 status;
diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
index 34376255b85c..b217ec7aa758 100644
--- a/drivers/gpu/drm/i915/display/intel_pps.c
+++ b/drivers/gpu/drm/i915/display/intel_pps.c
@@ -67,10 +67,10 @@ static const char *pps_name(struct intel_dp *intel_dp)
 	return "PPS <invalid>";
 }
 
-intel_wakeref_t intel_pps_lock(struct intel_dp *intel_dp)
+struct ref_tracker *intel_pps_lock(struct intel_dp *intel_dp)
 {
 	struct intel_display *display = to_intel_display(intel_dp);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 
 	/*
 	 * See vlv_pps_reset_all() why we need a power domain reference here.
@@ -81,8 +81,7 @@ intel_wakeref_t intel_pps_lock(struct intel_dp *intel_dp)
 	return wakeref;
 }
 
-intel_wakeref_t intel_pps_unlock(struct intel_dp *intel_dp,
-				 intel_wakeref_t wakeref)
+struct ref_tracker *intel_pps_unlock(struct intel_dp *intel_dp, struct ref_tracker *wakeref)
 {
 	struct intel_display *display = to_intel_display(intel_dp);
 
diff --git a/drivers/gpu/drm/i915/display/intel_pps.h b/drivers/gpu/drm/i915/display/intel_pps.h
index ad5c458ccdaf..f7c96d75be45 100644
--- a/drivers/gpu/drm/i915/display/intel_pps.h
+++ b/drivers/gpu/drm/i915/display/intel_pps.h
@@ -8,20 +8,19 @@
 
 #include <linux/types.h>
 
-#include "intel_wakeref.h"
-
 enum pipe;
 struct intel_connector;
 struct intel_crtc_state;
 struct intel_display;
 struct intel_dp;
 struct intel_encoder;
+struct ref_tracker;
 
-intel_wakeref_t intel_pps_lock(struct intel_dp *intel_dp);
-intel_wakeref_t intel_pps_unlock(struct intel_dp *intel_dp, intel_wakeref_t wakeref);
+struct ref_tracker *intel_pps_lock(struct intel_dp *intel_dp);
+struct ref_tracker *intel_pps_unlock(struct intel_dp *intel_dp, struct ref_tracker *wakeref);
 
 #define __with_intel_pps_lock(dp, wf) \
-	for (intel_wakeref_t (wf) = intel_pps_lock(dp); (wf); (wf) = intel_pps_unlock((dp), (wf)))
+	for (struct ref_tracker *(wf) = intel_pps_lock(dp); (wf); (wf) = intel_pps_unlock((dp), (wf)))
 
 #define with_intel_pps_lock(dp) \
 	__with_intel_pps_lock((dp), __UNIQUE_ID(wakeref))
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH v2 3/5] drm/i915/power: drop wakeref parameter from with_intel_display_power*()
  2025-11-25 13:24 [PATCH v2 0/5] drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * Jani Nikula
  2025-11-25 13:24 ` [PATCH v2 1/5] drm/i915/pps: drop wakeref parameter from with_intel_pps_lock() Jani Nikula
  2025-11-25 13:24 ` [PATCH v2 2/5] drm/i915/pps: convert intel_wakeref_t to struct ref_tracker * Jani Nikula
@ 2025-11-25 13:24 ` Jani Nikula
  2025-12-01  8:11   ` Luca Coelho
  2025-11-25 13:24 ` [PATCH v2 4/5] drm/i915/power: convert intel_wakeref_t to struct ref_tracker * Jani Nikula
                   ` (3 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Jani Nikula @ 2025-11-25 13:24 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: jani.nikula

Add another level of macro abstraction, and declare the wakeref within
the for loop using __UNIQUE_ID. This allows us to drop a bunch of
boilerplate declarations and parameter passing.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_cmtg.c      |  3 +--
 drivers/gpu/drm/i915/display/intel_display.c   | 15 +++++----------
 .../gpu/drm/i915/display/intel_display_power.h | 14 ++++++++++----
 drivers/gpu/drm/i915/display/intel_dp.c        |  3 +--
 drivers/gpu/drm/i915/display/intel_tc.c        | 18 ++++++------------
 5 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_cmtg.c b/drivers/gpu/drm/i915/display/intel_cmtg.c
index 165138b95cb2..e1fdc6fe9762 100644
--- a/drivers/gpu/drm/i915/display/intel_cmtg.c
+++ b/drivers/gpu/drm/i915/display/intel_cmtg.c
@@ -85,7 +85,6 @@ static bool intel_cmtg_transcoder_is_secondary(struct intel_display *display,
 					       enum transcoder trans)
 {
 	enum intel_display_power_domain power_domain;
-	intel_wakeref_t wakeref;
 	u32 val = 0;
 
 	if (!HAS_TRANSCODER(display, trans))
@@ -93,7 +92,7 @@ static bool intel_cmtg_transcoder_is_secondary(struct intel_display *display,
 
 	power_domain = POWER_DOMAIN_TRANSCODER(trans);
 
-	with_intel_display_power_if_enabled(display, power_domain, wakeref)
+	with_intel_display_power_if_enabled(display, power_domain)
 		val = intel_de_read(display, TRANS_DDI_FUNC_CTL2(display, trans));
 
 	return val & CMTG_SECONDARY_MODE;
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 04f5c488f399..34e69b884713 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -3469,12 +3469,11 @@ static bool transcoder_ddi_func_is_enabled(struct intel_display *display,
 					   enum transcoder cpu_transcoder)
 {
 	enum intel_display_power_domain power_domain;
-	intel_wakeref_t wakeref;
 	u32 tmp = 0;
 
 	power_domain = POWER_DOMAIN_TRANSCODER(cpu_transcoder);
 
-	with_intel_display_power_if_enabled(display, power_domain, wakeref)
+	with_intel_display_power_if_enabled(display, power_domain)
 		tmp = intel_de_read(display,
 				    TRANS_DDI_FUNC_CTL(display, cpu_transcoder));
 
@@ -3496,10 +3495,9 @@ static void enabled_uncompressed_joiner_pipes(struct intel_display *display,
 					 joiner_pipes(display)) {
 		enum intel_display_power_domain power_domain;
 		enum pipe pipe = crtc->pipe;
-		intel_wakeref_t wakeref;
 
 		power_domain = POWER_DOMAIN_PIPE(pipe);
-		with_intel_display_power_if_enabled(display, power_domain, wakeref) {
+		with_intel_display_power_if_enabled(display, power_domain) {
 			u32 tmp = intel_de_read(display, ICL_PIPE_DSS_CTL1(pipe));
 
 			if (tmp & UNCOMPRESSED_JOINER_PRIMARY)
@@ -3525,10 +3523,9 @@ static void enabled_bigjoiner_pipes(struct intel_display *display,
 					 joiner_pipes(display)) {
 		enum intel_display_power_domain power_domain;
 		enum pipe pipe = crtc->pipe;
-		intel_wakeref_t wakeref;
 
 		power_domain = intel_dsc_power_domain(crtc, (enum transcoder)pipe);
-		with_intel_display_power_if_enabled(display, power_domain, wakeref) {
+		with_intel_display_power_if_enabled(display, power_domain) {
 			u32 tmp = intel_de_read(display, ICL_PIPE_DSS_CTL1(pipe));
 
 			if (!(tmp & BIG_JOINER_ENABLE))
@@ -3595,10 +3592,9 @@ static void enabled_ultrajoiner_pipes(struct intel_display *display,
 					 joiner_pipes(display)) {
 		enum intel_display_power_domain power_domain;
 		enum pipe pipe = crtc->pipe;
-		intel_wakeref_t wakeref;
 
 		power_domain = intel_dsc_power_domain(crtc, (enum transcoder)pipe);
-		with_intel_display_power_if_enabled(display, power_domain, wakeref) {
+		with_intel_display_power_if_enabled(display, power_domain) {
 			u32 tmp = intel_de_read(display, ICL_PIPE_DSS_CTL1(pipe));
 
 			if (!(tmp & ULTRA_JOINER_ENABLE))
@@ -3756,12 +3752,11 @@ static u8 hsw_enabled_transcoders(struct intel_crtc *crtc)
 	for_each_cpu_transcoder_masked(display, cpu_transcoder,
 				       panel_transcoder_mask) {
 		enum intel_display_power_domain power_domain;
-		intel_wakeref_t wakeref;
 		enum pipe trans_pipe;
 		u32 tmp = 0;
 
 		power_domain = POWER_DOMAIN_TRANSCODER(cpu_transcoder);
-		with_intel_display_power_if_enabled(display, power_domain, wakeref)
+		with_intel_display_power_if_enabled(display, power_domain)
 			tmp = intel_de_read(display,
 					    TRANS_DDI_FUNC_CTL(display, cpu_transcoder));
 
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
index f8813b0e16df..79ce8d94bf7d 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.h
+++ b/drivers/gpu/drm/i915/display/intel_display_power.h
@@ -297,12 +297,18 @@ enum dbuf_slice {
 void gen9_dbuf_slices_update(struct intel_display *display,
 			     u8 req_slices);
 
-#define with_intel_display_power(display, domain, wf) \
-	for ((wf) = intel_display_power_get((display), (domain)); (wf); \
+#define __with_intel_display_power(display, domain, wf) \
+	for (intel_wakeref_t (wf) = intel_display_power_get((display), (domain)); (wf); \
 	     intel_display_power_put_async((display), (domain), (wf)), (wf) = NULL)
 
-#define with_intel_display_power_if_enabled(display, domain, wf) \
-	for ((wf) = intel_display_power_get_if_enabled((display), (domain)); (wf); \
+#define with_intel_display_power(display, domain) \
+	__with_intel_display_power(display, domain, __UNIQUE_ID(wakeref))
+
+#define __with_intel_display_power_if_enabled(display, domain, wf) \
+	for (intel_wakeref_t (wf) = intel_display_power_get_if_enabled((display), (domain)); (wf); \
 	     intel_display_power_put_async((display), (domain), (wf)), (wf) = NULL)
 
+#define with_intel_display_power_if_enabled(display, domain) \
+	__with_intel_display_power_if_enabled(display, domain, __UNIQUE_ID(wakeref))
+
 #endif /* __INTEL_DISPLAY_POWER_H__ */
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 0ec82fcbcf48..7df0e5e13688 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -5791,9 +5791,8 @@ bool intel_digital_port_connected_locked(struct intel_encoder *encoder)
 	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
 	bool is_glitch_free = intel_tc_port_handles_hpd_glitches(dig_port);
 	bool is_connected = false;
-	intel_wakeref_t wakeref;
 
-	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref) {
+	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE) {
 		poll_timeout_us(is_connected = dig_port->connected(encoder),
 				is_connected || is_glitch_free,
 				30, 4000, false);
diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index 1e21fd02685d..c678216af352 100644
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -269,10 +269,9 @@ assert_tc_port_power_enabled(struct intel_tc_port *tc)
 static u32 get_lane_mask(struct intel_tc_port *tc)
 {
 	struct intel_display *display = to_intel_display(tc->dig_port);
-	intel_wakeref_t wakeref;
 	u32 lane_mask;
 
-	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref)
+	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE)
 		lane_mask = intel_de_read(display, PORT_TX_DFLEXDPSP(tc->phy_fia));
 
 	drm_WARN_ON(display->drm, lane_mask == 0xffffffff);
@@ -296,7 +295,6 @@ get_pin_assignment(struct intel_tc_port *tc)
 	struct intel_display *display = to_intel_display(tc->dig_port);
 	enum tc_port tc_port = intel_encoder_to_tc(&tc->dig_port->base);
 	enum intel_tc_pin_assignment pin_assignment;
-	intel_wakeref_t wakeref;
 	i915_reg_t reg;
 	u32 mask;
 	u32 val;
@@ -312,7 +310,7 @@ get_pin_assignment(struct intel_tc_port *tc)
 		mask = DP_PIN_ASSIGNMENT_MASK(tc->phy_fia_idx);
 	}
 
-	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref)
+	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE)
 		val = intel_de_read(display, reg);
 
 	drm_WARN_ON(display->drm, val == 0xffffffff);
@@ -527,12 +525,11 @@ static u32 icl_tc_phy_hpd_live_status(struct intel_tc_port *tc)
 	struct intel_display *display = to_intel_display(tc->dig_port);
 	struct intel_digital_port *dig_port = tc->dig_port;
 	u32 isr_bit = display->hotplug.pch_hpd[dig_port->base.hpd_pin];
-	intel_wakeref_t wakeref;
 	u32 fia_isr;
 	u32 pch_isr;
 	u32 mask = 0;
 
-	with_intel_display_power(display, tc_phy_cold_off_domain(tc), wakeref) {
+	with_intel_display_power(display, tc_phy_cold_off_domain(tc)) {
 		fia_isr = intel_de_read(display, PORT_TX_DFLEXDPSP(tc->phy_fia));
 		pch_isr = intel_de_read(display, SDEISR);
 	}
@@ -774,10 +771,9 @@ tgl_tc_phy_cold_off_domain(struct intel_tc_port *tc)
 static void tgl_tc_phy_init(struct intel_tc_port *tc)
 {
 	struct intel_display *display = to_intel_display(tc->dig_port);
-	intel_wakeref_t wakeref;
 	u32 val;
 
-	with_intel_display_power(display, tc_phy_cold_off_domain(tc), wakeref)
+	with_intel_display_power(display, tc_phy_cold_off_domain(tc))
 		val = intel_de_read(display, PORT_TX_DFLEXDPSP(FIA1));
 
 	drm_WARN_ON(display->drm, val == 0xffffffff);
@@ -819,12 +815,11 @@ static u32 adlp_tc_phy_hpd_live_status(struct intel_tc_port *tc)
 	enum hpd_pin hpd_pin = dig_port->base.hpd_pin;
 	u32 cpu_isr_bits = display->hotplug.hpd[hpd_pin];
 	u32 pch_isr_bit = display->hotplug.pch_hpd[hpd_pin];
-	intel_wakeref_t wakeref;
 	u32 cpu_isr;
 	u32 pch_isr;
 	u32 mask = 0;
 
-	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref) {
+	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE) {
 		cpu_isr = intel_de_read(display, GEN11_DE_HPD_ISR);
 		pch_isr = intel_de_read(display, SDEISR);
 	}
@@ -1015,12 +1010,11 @@ static u32 xelpdp_tc_phy_hpd_live_status(struct intel_tc_port *tc)
 	enum hpd_pin hpd_pin = dig_port->base.hpd_pin;
 	u32 pica_isr_bits = display->hotplug.hpd[hpd_pin];
 	u32 pch_isr_bit = display->hotplug.pch_hpd[hpd_pin];
-	intel_wakeref_t wakeref;
 	u32 pica_isr;
 	u32 pch_isr;
 	u32 mask = 0;
 
-	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref) {
+	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE) {
 		pica_isr = intel_de_read(display, PICAINTERRUPT_ISR);
 		pch_isr = intel_de_read(display, SDEISR);
 	}
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH v2 4/5] drm/i915/power: convert intel_wakeref_t to struct ref_tracker *
  2025-11-25 13:24 [PATCH v2 0/5] drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * Jani Nikula
                   ` (2 preceding siblings ...)
  2025-11-25 13:24 ` [PATCH v2 3/5] drm/i915/power: drop wakeref parameter from with_intel_display_power*() Jani Nikula
@ 2025-11-25 13:24 ` Jani Nikula
  2025-12-01  8:15   ` Luca Coelho
  2025-11-25 13:24 ` [PATCH v2 5/5] drm/{i915,xe}/display: drop intel_wakeref.h usage Jani Nikula
                   ` (2 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Jani Nikula @ 2025-11-25 13:24 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: jani.nikula

Under the hood, intel_wakeref_t is just struct ref_tracker *. Use the
actual underlying type both for clarity (we *are* using intel_wakeref_t
as a pointer though it doesn't look like one) and to help i915, xe and
display coexistence without custom types.

v2: Keep intel_wakeref.h includes as they are

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/g4x_dp.c         |  2 +-
 drivers/gpu/drm/i915/display/g4x_hdmi.c       |  2 +-
 drivers/gpu/drm/i915/display/i9xx_plane.c     |  2 +-
 drivers/gpu/drm/i915/display/icl_dsi.c        |  4 +--
 drivers/gpu/drm/i915/display/intel_audio.c    |  6 ++--
 drivers/gpu/drm/i915/display/intel_cdclk.c    |  4 +--
 drivers/gpu/drm/i915/display/intel_crt.c      |  6 ++--
 drivers/gpu/drm/i915/display/intel_cursor.c   |  4 +--
 drivers/gpu/drm/i915/display/intel_cx0_phy.c  | 18 +++++-----
 drivers/gpu/drm/i915/display/intel_ddi.c      | 16 ++++-----
 drivers/gpu/drm/i915/display/intel_display.c  |  8 ++---
 .../gpu/drm/i915/display/intel_display_core.h |  2 +-
 .../drm/i915/display/intel_display_debugfs.c  |  2 +-
 .../drm/i915/display/intel_display_power.c    | 26 +++++++--------
 .../drm/i915/display/intel_display_power.h    | 33 ++++++++++---------
 .../drm/i915/display/intel_display_types.h    |  6 ++--
 drivers/gpu/drm/i915/display/intel_dmc.c      |  2 +-
 drivers/gpu/drm/i915/display/intel_dp_aux.c   |  2 +-
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 18 +++++-----
 drivers/gpu/drm/i915/display/intel_dpll_mgr.h |  4 +--
 drivers/gpu/drm/i915/display/intel_dsi.h      |  7 ++--
 drivers/gpu/drm/i915/display/intel_gmbus.c    |  4 +--
 drivers/gpu/drm/i915/display/intel_hdmi.c     |  4 +--
 drivers/gpu/drm/i915/display/intel_hotplug.c  |  2 +-
 drivers/gpu/drm/i915/display/intel_lt_phy.c   | 14 ++++----
 drivers/gpu/drm/i915/display/intel_lvds.c     |  2 +-
 .../drm/i915/display/intel_modeset_setup.c    |  2 +-
 drivers/gpu/drm/i915/display/intel_pipe_crc.c |  2 +-
 drivers/gpu/drm/i915/display/intel_sprite.c   |  6 ++--
 drivers/gpu/drm/i915/display/intel_tc.c       | 22 ++++++-------
 drivers/gpu/drm/i915/display/intel_vdsc.c     |  2 +-
 .../drm/i915/display/skl_universal_plane.c    |  2 +-
 drivers/gpu/drm/i915/display/skl_watermark.c  |  2 +-
 drivers/gpu/drm/i915/display/vlv_dsi.c        |  2 +-
 .../xe/compat-i915-headers/intel_wakeref.h    |  4 ---
 drivers/gpu/drm/xe/display/xe_display_rpm.c   |  1 +
 36 files changed, 122 insertions(+), 123 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
index 27f4c55d7484..4cb753177fd8 100644
--- a/drivers/gpu/drm/i915/display/g4x_dp.c
+++ b/drivers/gpu/drm/i915/display/g4x_dp.c
@@ -302,7 +302,7 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder,
 {
 	struct intel_display *display = to_intel_display(encoder);
 	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret;
 
 	wakeref = intel_display_power_get_if_enabled(display,
diff --git a/drivers/gpu/drm/i915/display/g4x_hdmi.c b/drivers/gpu/drm/i915/display/g4x_hdmi.c
index f6e2d1ed5639..8b22447e8e23 100644
--- a/drivers/gpu/drm/i915/display/g4x_hdmi.c
+++ b/drivers/gpu/drm/i915/display/g4x_hdmi.c
@@ -68,7 +68,7 @@ static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder,
 {
 	struct intel_display *display = to_intel_display(encoder);
 	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret;
 
 	wakeref = intel_display_power_get_if_enabled(display,
diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
index 51ccc6bd5f21..6b570335f393 100644
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -724,7 +724,7 @@ static bool i9xx_plane_get_hw_state(struct intel_plane *plane,
 	struct intel_display *display = to_intel_display(plane);
 	enum intel_display_power_domain power_domain;
 	enum i9xx_plane_id i9xx_plane = plane->i9xx_plane;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret;
 	u32 val;
 
diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index 9230792960f2..dac781f54661 100644
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c
@@ -1411,7 +1411,7 @@ static void gen11_dsi_disable_io_power(struct intel_encoder *encoder)
 	enum port port;
 
 	for_each_dsi_port(port, intel_dsi->ports) {
-		intel_wakeref_t wakeref;
+		struct ref_tracker *wakeref;
 
 		wakeref = fetch_and_zero(&intel_dsi->io_wakeref[port]);
 		intel_display_power_put(display,
@@ -1722,7 +1722,7 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder,
 	struct intel_display *display = to_intel_display(encoder);
 	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
 	enum transcoder dsi_trans;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	enum port port;
 	bool ret = false;
 	u32 tmp;
diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
index 5bdaef38f13d..5f3c175afdd2 100644
--- a/drivers/gpu/drm/i915/display/intel_audio.c
+++ b/drivers/gpu/drm/i915/display/intel_audio.c
@@ -1042,10 +1042,10 @@ int intel_audio_min_cdclk(const struct intel_crtc_state *crtc_state)
 static unsigned long intel_audio_component_get_power(struct device *kdev)
 {
 	struct intel_display *display = to_intel_display(kdev);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 
 	/* Catch potential impedance mismatches before they occur! */
-	BUILD_BUG_ON(sizeof(intel_wakeref_t) > sizeof(unsigned long));
+	BUILD_BUG_ON(sizeof(wakeref) > sizeof(unsigned long));
 
 	wakeref = intel_display_power_get(display, POWER_DOMAIN_AUDIO_PLAYBACK);
 
@@ -1074,7 +1074,7 @@ static void intel_audio_component_put_power(struct device *kdev,
 					    unsigned long cookie)
 {
 	struct intel_display *display = to_intel_display(kdev);
-	intel_wakeref_t wakeref = (intel_wakeref_t)cookie;
+	struct ref_tracker *wakeref = (struct ref_tracker *)cookie;
 
 	/* Stop forcing CDCLK to 2*BCLK if no need for audio to be powered. */
 	if (--display->audio.power_refcount == 0)
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 5c90e53b4e46..ada08fd1447b 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -667,7 +667,7 @@ static void vlv_set_cdclk(struct intel_display *display,
 {
 	int cdclk = cdclk_config->cdclk;
 	u32 val, cmd = cdclk_config->voltage_level;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	int ret;
 
 	switch (cdclk) {
@@ -757,7 +757,7 @@ static void chv_set_cdclk(struct intel_display *display,
 {
 	int cdclk = cdclk_config->cdclk;
 	u32 val, cmd = cdclk_config->voltage_level;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	int ret;
 
 	switch (cdclk) {
diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index 82e89cdbe5a5..5f9a03877ea9 100644
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -109,7 +109,7 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,
 {
 	struct intel_display *display = to_intel_display(encoder);
 	struct intel_crt *crt = intel_encoder_to_crt(encoder);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret;
 
 	wakeref = intel_display_power_get_if_enabled(display,
@@ -847,7 +847,7 @@ intel_crt_detect(struct drm_connector *connector,
 	struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));
 	struct intel_encoder *encoder = &crt->base;
 	struct drm_atomic_state *state;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	int status;
 
 	drm_dbg_kms(display->drm, "[CONNECTOR:%d:%s] force=%d\n",
@@ -936,7 +936,7 @@ static int intel_crt_get_modes(struct drm_connector *connector)
 	struct intel_display *display = to_intel_display(connector->dev);
 	struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));
 	struct intel_encoder *encoder = &crt->base;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	struct i2c_adapter *ddc;
 	int ret;
 
diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index a10b2425b94d..341d1cb40295 100644
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -324,7 +324,7 @@ static bool i845_cursor_get_hw_state(struct intel_plane *plane,
 {
 	struct intel_display *display = to_intel_display(plane);
 	enum intel_display_power_domain power_domain;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret;
 
 	power_domain = POWER_DOMAIN_PIPE(PIPE_A);
@@ -727,7 +727,7 @@ static bool i9xx_cursor_get_hw_state(struct intel_plane *plane,
 {
 	struct intel_display *display = to_intel_display(plane);
 	enum intel_display_power_domain power_domain;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret;
 	u32 val;
 
diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
index 27be2a490297..7bd17723e7ab 100644
--- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
@@ -105,11 +105,11 @@ static void intel_cx0_program_msgbus_timer(struct intel_encoder *encoder)
  * We also do the msgbus timer programming here to ensure that the timer
  * is already programmed before any access to the msgbus.
  */
-static intel_wakeref_t intel_cx0_phy_transaction_begin(struct intel_encoder *encoder)
+static struct ref_tracker *intel_cx0_phy_transaction_begin(struct intel_encoder *encoder)
 {
 	struct intel_display *display = to_intel_display(encoder);
 	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 
 	intel_psr_pause(intel_dp);
 	wakeref = intel_display_power_get(display, POWER_DOMAIN_DC_OFF);
@@ -118,7 +118,7 @@ static intel_wakeref_t intel_cx0_phy_transaction_begin(struct intel_encoder *enc
 	return wakeref;
 }
 
-static void intel_cx0_phy_transaction_end(struct intel_encoder *encoder, intel_wakeref_t wakeref)
+static void intel_cx0_phy_transaction_end(struct intel_encoder *encoder, struct ref_tracker *wakeref)
 {
 	struct intel_display *display = to_intel_display(encoder);
 	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
@@ -476,7 +476,7 @@ void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder,
 	struct intel_display *display = to_intel_display(encoder);
 	const struct intel_ddi_buf_trans *trans;
 	u8 owned_lane_mask;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	int n_entries, ln;
 	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
 
@@ -2252,7 +2252,7 @@ static void intel_c10pll_readout_hw_state(struct intel_encoder *encoder,
 	struct intel_display *display = to_intel_display(encoder);
 	enum phy phy = intel_encoder_to_phy(encoder);
 	u8 lane = INTEL_CX0_LANE0;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	int i;
 
 	cx0pll_state->use_c10 = true;
@@ -2756,7 +2756,7 @@ static void intel_c20pll_readout_hw_state(struct intel_encoder *encoder,
 	struct intel_c20pll_state *pll_state = &cx0pll_state->c20;
 	struct intel_display *display = to_intel_display(encoder);
 	bool cntx;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	int i;
 
 	cx0pll_state->use_c10 = false;
@@ -3225,7 +3225,7 @@ static void intel_cx0pll_enable(struct intel_encoder *encoder,
 	bool lane_reversal = dig_port->lane_reversal;
 	u8 maxpclk_lane = lane_reversal ? INTEL_CX0_LANE1 :
 					  INTEL_CX0_LANE0;
-	intel_wakeref_t wakeref = intel_cx0_phy_transaction_begin(encoder);
+	struct ref_tracker *wakeref = intel_cx0_phy_transaction_begin(encoder);
 
 	/*
 	 * Lane reversal is never used in DP-alt mode, in that case the
@@ -3463,7 +3463,7 @@ void intel_lnl_mac_transmit_lfps(struct intel_encoder *encoder,
 				 const struct intel_crtc_state *crtc_state)
 {
 	struct intel_display *display = to_intel_display(encoder);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	int i;
 	u8 owned_lane_mask;
 
@@ -3510,7 +3510,7 @@ static void intel_cx0pll_disable(struct intel_encoder *encoder)
 {
 	struct intel_display *display = to_intel_display(encoder);
 	enum phy phy = intel_encoder_to_phy(encoder);
-	intel_wakeref_t wakeref = intel_cx0_phy_transaction_begin(encoder);
+	struct ref_tracker *wakeref = intel_cx0_phy_transaction_begin(encoder);
 
 	/* 1. Change owned PHY lane power to Disable state. */
 	intel_cx0_powerdown_change_sequence(encoder, INTEL_CX0_BOTH_LANES,
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index ed9798b0ec00..8158f9829ddf 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -728,7 +728,7 @@ int intel_ddi_toggle_hdcp_bits(struct intel_encoder *intel_encoder,
 			       bool enable, u32 hdcp_mask)
 {
 	struct intel_display *display = to_intel_display(intel_encoder);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	int ret = 0;
 
 	wakeref = intel_display_power_get_if_enabled(display,
@@ -749,7 +749,7 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector)
 	int type = intel_connector->base.connector_type;
 	enum port port = encoder->port;
 	enum transcoder cpu_transcoder;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	enum pipe pipe = 0;
 	u32 ddi_mode;
 	bool ret;
@@ -805,7 +805,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder,
 {
 	struct intel_display *display = to_intel_display(encoder);
 	enum port port = encoder->port;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	enum pipe p;
 	u32 tmp;
 	u8 mst_pipe_mask = 0, dp128b132b_pipe_mask = 0;
@@ -848,7 +848,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder,
 	for_each_pipe(display, p) {
 		enum transcoder cpu_transcoder = (enum transcoder)p;
 		u32 port_mask, ddi_select, ddi_mode;
-		intel_wakeref_t trans_wakeref;
+		struct ref_tracker *trans_wakeref;
 
 		trans_wakeref = intel_display_power_get_if_enabled(display,
 								   POWER_DOMAIN_TRANSCODER(cpu_transcoder));
@@ -1002,7 +1002,7 @@ main_link_aux_power_domain_put(struct intel_digital_port *dig_port,
 	struct intel_display *display = to_intel_display(dig_port);
 	enum intel_display_power_domain domain =
 		intel_ddi_main_link_aux_domain(dig_port, crtc_state);
-	intel_wakeref_t wf;
+	struct ref_tracker *wf;
 
 	wf = fetch_and_zero(&dig_port->aux_wakeref);
 	if (!wf)
@@ -3130,7 +3130,7 @@ static void intel_ddi_post_disable_dp(struct intel_atomic_state *state,
 	struct intel_display *display = to_intel_display(encoder);
 	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
 	struct intel_dp *intel_dp = &dig_port->dp;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool is_mst = intel_crtc_has_type(old_crtc_state,
 					  INTEL_OUTPUT_DP_MST);
 
@@ -3198,7 +3198,7 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state,
 	struct intel_display *display = to_intel_display(encoder);
 	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
 	struct intel_hdmi *intel_hdmi = &dig_port->hdmi;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 
 	dig_port->set_infoframes(encoder, false,
 				 old_crtc_state, old_conn_state);
@@ -3965,7 +3965,7 @@ static void bdw_get_trans_port_sync_config(struct intel_crtc_state *crtc_state)
 
 	for_each_cpu_transcoder_masked(display, cpu_transcoder, transcoders) {
 		enum intel_display_power_domain power_domain;
-		intel_wakeref_t trans_wakeref;
+		struct ref_tracker *trans_wakeref;
 
 		power_domain = POWER_DOMAIN_TRANSCODER(cpu_transcoder);
 		trans_wakeref = intel_display_power_get_if_enabled(display,
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 34e69b884713..62e97d725887 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -372,7 +372,7 @@ void assert_transcoder(struct intel_display *display,
 {
 	bool cur_state;
 	enum intel_display_power_domain power_domain;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 
 	/* we keep both pipes enabled on 830 */
 	if (display->platform.i830)
@@ -3035,7 +3035,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
 	struct intel_display *display = to_intel_display(crtc);
 	enum intel_display_power_domain power_domain;
 	enum transcoder cpu_transcoder = (enum transcoder)crtc->pipe;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret = false;
 	u32 tmp;
 
@@ -3379,7 +3379,7 @@ static bool ilk_get_pipe_config(struct intel_crtc *crtc,
 	struct intel_display *display = to_intel_display(crtc);
 	enum intel_display_power_domain power_domain;
 	enum transcoder cpu_transcoder = (enum transcoder)crtc->pipe;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret = false;
 	u32 tmp;
 
@@ -7376,7 +7376,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
 	struct intel_crtc_state *new_crtc_state, *old_crtc_state;
 	struct intel_crtc *crtc;
 	struct intel_power_domain_mask put_domains[I915_MAX_PIPES] = {};
-	intel_wakeref_t wakeref = NULL;
+	struct ref_tracker *wakeref = NULL;
 	int i;
 
 	for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i)
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 9b36654b593d..5b2120afa806 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -386,7 +386,7 @@ struct intel_display {
 
 	struct {
 		struct intel_dmc *dmc;
-		intel_wakeref_t wakeref;
+		struct ref_tracker *wakeref;
 	} dmc;
 
 	struct {
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 9bbfdae8d024..aba13e8a9051 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -86,7 +86,7 @@ static int i915_frontbuffer_tracking(struct seq_file *m, void *unused)
 static int i915_sr_status(struct seq_file *m, void *unused)
 {
 	struct intel_display *display = node_to_intel_display(m->private);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool sr_enabled = false;
 
 	wakeref = intel_display_power_get(display, POWER_DOMAIN_INIT);
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index 08db9bbbfcb1..7cbef1a68266 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -544,8 +544,8 @@ __intel_display_power_get_domain(struct intel_display *display,
  * Any power domain reference obtained by this function must have a symmetric
  * call to intel_display_power_put() to release the reference again.
  */
-intel_wakeref_t intel_display_power_get(struct intel_display *display,
-					enum intel_display_power_domain domain)
+struct ref_tracker *intel_display_power_get(struct intel_display *display,
+					    enum intel_display_power_domain domain)
 {
 	struct i915_power_domains *power_domains = &display->power.domains;
 	struct ref_tracker *wakeref;
@@ -571,7 +571,7 @@ intel_wakeref_t intel_display_power_get(struct intel_display *display,
  * Any power domain reference obtained by this function must have a symmetric
  * call to intel_display_power_put() to release the reference again.
  */
-intel_wakeref_t
+struct ref_tracker *
 intel_display_power_get_if_enabled(struct intel_display *display,
 				   enum intel_display_power_domain domain)
 {
@@ -638,7 +638,7 @@ static void __intel_display_power_put(struct intel_display *display,
 
 static void
 queue_async_put_domains_work(struct i915_power_domains *power_domains,
-			     intel_wakeref_t wakeref,
+			     struct ref_tracker *wakeref,
 			     int delay_ms)
 {
 	struct intel_display *display = container_of(power_domains,
@@ -740,7 +740,7 @@ intel_display_power_put_async_work(struct work_struct *work)
  */
 void __intel_display_power_put_async(struct intel_display *display,
 				     enum intel_display_power_domain domain,
-				     intel_wakeref_t wakeref,
+				     struct ref_tracker *wakeref,
 				     int delay_ms)
 {
 	struct i915_power_domains *power_domains = &display->power.domains;
@@ -799,7 +799,7 @@ void intel_display_power_flush_work(struct intel_display *display)
 {
 	struct i915_power_domains *power_domains = &display->power.domains;
 	struct intel_power_domain_mask async_put_mask;
-	intel_wakeref_t work_wakeref;
+	struct ref_tracker *work_wakeref;
 
 	mutex_lock(&power_domains->lock);
 
@@ -853,7 +853,7 @@ intel_display_power_flush_work_sync(struct intel_display *display)
  */
 void intel_display_power_put(struct intel_display *display,
 			     enum intel_display_power_domain domain,
-			     intel_wakeref_t wakeref)
+			     struct ref_tracker *wakeref)
 {
 	__intel_display_power_put(display, domain);
 	intel_display_rpm_put(display, wakeref);
@@ -885,7 +885,7 @@ intel_display_power_get_in_set(struct intel_display *display,
 			       struct intel_display_power_domain_set *power_domain_set,
 			       enum intel_display_power_domain domain)
 {
-	intel_wakeref_t __maybe_unused wf;
+	struct ref_tracker *__maybe_unused wf;
 
 	drm_WARN_ON(display->drm, test_bit(domain, power_domain_set->mask.bits));
 
@@ -901,7 +901,7 @@ intel_display_power_get_in_set_if_enabled(struct intel_display *display,
 					  struct intel_display_power_domain_set *power_domain_set,
 					  enum intel_display_power_domain domain)
 {
-	intel_wakeref_t wf;
+	struct ref_tracker *wf;
 
 	drm_WARN_ON(display->drm, test_bit(domain, power_domain_set->mask.bits));
 
@@ -928,7 +928,7 @@ intel_display_power_put_mask_in_set(struct intel_display *display,
 		    !bitmap_subset(mask->bits, power_domain_set->mask.bits, POWER_DOMAIN_NUM));
 
 	for_each_power_domain(domain, mask) {
-		intel_wakeref_t __maybe_unused wf = INTEL_WAKEREF_DEF;
+		struct ref_tracker *__maybe_unused wf = INTEL_WAKEREF_DEF;
 
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
 		wf = fetch_and_zero(&power_domain_set->wakerefs[domain]);
@@ -2004,7 +2004,7 @@ void intel_power_domains_init_hw(struct intel_display *display, bool resume)
  */
 void intel_power_domains_driver_remove(struct intel_display *display)
 {
-	intel_wakeref_t wakeref __maybe_unused =
+	struct ref_tracker *wakeref __maybe_unused =
 		fetch_and_zero(&display->power.domains.init_wakeref);
 
 	/* Remove the refcount we took to keep power well support disabled. */
@@ -2065,7 +2065,7 @@ void intel_power_domains_sanitize_state(struct intel_display *display)
  */
 void intel_power_domains_enable(struct intel_display *display)
 {
-	intel_wakeref_t wakeref __maybe_unused =
+	struct ref_tracker *wakeref __maybe_unused =
 		fetch_and_zero(&display->power.domains.init_wakeref);
 
 	intel_display_power_put(display, POWER_DOMAIN_INIT, wakeref);
@@ -2104,7 +2104,7 @@ void intel_power_domains_disable(struct intel_display *display)
 void intel_power_domains_suspend(struct intel_display *display, bool s2idle)
 {
 	struct i915_power_domains *power_domains = &display->power.domains;
-	intel_wakeref_t wakeref __maybe_unused =
+	struct ref_tracker *wakeref __maybe_unused =
 		fetch_and_zero(&power_domains->init_wakeref);
 
 	intel_display_power_put(display, POWER_DOMAIN_INIT, wakeref);
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
index 79ce8d94bf7d..6f8d921b4482 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.h
+++ b/drivers/gpu/drm/i915/display/intel_display_power.h
@@ -16,6 +16,7 @@ enum port;
 struct i915_power_well;
 struct intel_display;
 struct intel_encoder;
+struct ref_tracker;
 struct seq_file;
 
 /*
@@ -142,14 +143,14 @@ struct i915_power_domains {
 	u32 target_dc_state;
 	u32 allowed_dc_mask;
 
-	intel_wakeref_t init_wakeref;
-	intel_wakeref_t disable_wakeref;
+	struct ref_tracker *init_wakeref;
+	struct ref_tracker *disable_wakeref;
 
 	struct mutex lock;
 	int domain_use_count[POWER_DOMAIN_NUM];
 
 	struct delayed_work async_put_work;
-	intel_wakeref_t async_put_wakeref;
+	struct ref_tracker *async_put_wakeref;
 	struct intel_power_domain_mask async_put_domains[2];
 	int async_put_next_delay;
 
@@ -159,7 +160,7 @@ struct i915_power_domains {
 struct intel_display_power_domain_set {
 	struct intel_power_domain_mask mask;
 #ifdef CONFIG_DRM_I915_DEBUG_RUNTIME_PM
-	intel_wakeref_t wakerefs[POWER_DOMAIN_NUM];
+	struct ref_tracker *wakerefs[POWER_DOMAIN_NUM];
 #endif
 };
 
@@ -187,24 +188,24 @@ u32 intel_display_power_get_current_dc_state(struct intel_display *display);
 
 bool intel_display_power_is_enabled(struct intel_display *display,
 				    enum intel_display_power_domain domain);
-intel_wakeref_t intel_display_power_get(struct intel_display *display,
-					enum intel_display_power_domain domain);
-intel_wakeref_t
+struct ref_tracker *intel_display_power_get(struct intel_display *display,
+					    enum intel_display_power_domain domain);
+struct ref_tracker *
 intel_display_power_get_if_enabled(struct intel_display *display,
 				   enum intel_display_power_domain domain);
 void __intel_display_power_put_async(struct intel_display *display,
 				     enum intel_display_power_domain domain,
-				     intel_wakeref_t wakeref,
+				     struct ref_tracker *wakeref,
 				     int delay_ms);
 void intel_display_power_flush_work(struct intel_display *display);
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
 void intel_display_power_put(struct intel_display *display,
 			     enum intel_display_power_domain domain,
-			     intel_wakeref_t wakeref);
+			     struct ref_tracker *wakeref);
 static inline void
 intel_display_power_put_async(struct intel_display *display,
 			      enum intel_display_power_domain domain,
-			      intel_wakeref_t wakeref)
+			      struct ref_tracker *wakeref)
 {
 	__intel_display_power_put_async(display, domain, wakeref, -1);
 }
@@ -212,7 +213,7 @@ intel_display_power_put_async(struct intel_display *display,
 static inline void
 intel_display_power_put_async_delay(struct intel_display *display,
 				    enum intel_display_power_domain domain,
-				    intel_wakeref_t wakeref,
+				    struct ref_tracker *wakeref,
 				    int delay_ms)
 {
 	__intel_display_power_put_async(display, domain, wakeref, delay_ms);
@@ -224,7 +225,7 @@ void intel_display_power_put_unchecked(struct intel_display *display,
 static inline void
 intel_display_power_put(struct intel_display *display,
 			enum intel_display_power_domain domain,
-			intel_wakeref_t wakeref)
+			struct ref_tracker *wakeref)
 {
 	intel_display_power_put_unchecked(display, domain);
 }
@@ -232,7 +233,7 @@ intel_display_power_put(struct intel_display *display,
 static inline void
 intel_display_power_put_async(struct intel_display *display,
 			      enum intel_display_power_domain domain,
-			      intel_wakeref_t wakeref)
+			      struct ref_tracker *wakeref)
 {
 	__intel_display_power_put_async(display, domain, INTEL_WAKEREF_DEF, -1);
 }
@@ -240,7 +241,7 @@ intel_display_power_put_async(struct intel_display *display,
 static inline void
 intel_display_power_put_async_delay(struct intel_display *display,
 				    enum intel_display_power_domain domain,
-				    intel_wakeref_t wakeref,
+				    struct ref_tracker *wakeref,
 				    int delay_ms)
 {
 	__intel_display_power_put_async(display, domain, INTEL_WAKEREF_DEF, delay_ms);
@@ -298,14 +299,14 @@ void gen9_dbuf_slices_update(struct intel_display *display,
 			     u8 req_slices);
 
 #define __with_intel_display_power(display, domain, wf) \
-	for (intel_wakeref_t (wf) = intel_display_power_get((display), (domain)); (wf); \
+	for (struct ref_tracker *(wf) = intel_display_power_get((display), (domain)); (wf); \
 	     intel_display_power_put_async((display), (domain), (wf)), (wf) = NULL)
 
 #define with_intel_display_power(display, domain) \
 	__with_intel_display_power(display, domain, __UNIQUE_ID(wakeref))
 
 #define __with_intel_display_power_if_enabled(display, domain, wf) \
-	for (intel_wakeref_t (wf) = intel_display_power_get_if_enabled((display), (domain)); (wf); \
+	for (struct ref_tracker *(wf) = intel_display_power_get_if_enabled((display), (domain)); (wf); \
 	     intel_display_power_put_async((display), (domain), (wf)), (wf) = NULL)
 
 #define with_intel_display_power_if_enabled(display, domain) \
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 38702a9e0f50..ed0f7448e6cd 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1658,7 +1658,7 @@ struct intel_pps {
 	unsigned long last_power_on;
 	unsigned long last_backlight_off;
 	ktime_t panel_power_off_time;
-	intel_wakeref_t vdd_wakeref;
+	struct ref_tracker *vdd_wakeref;
 
 	union {
 		/*
@@ -1940,8 +1940,8 @@ struct intel_digital_port {
 	/* Used for DP and ICL+ TypeC/DP and TypeC/HDMI ports. */
 	enum aux_ch aux_ch;
 	enum intel_display_power_domain ddi_io_power_domain;
-	intel_wakeref_t ddi_io_wakeref;
-	intel_wakeref_t aux_wakeref;
+	struct ref_tracker *ddi_io_wakeref;
+	struct ref_tracker *aux_wakeref;
 
 	struct intel_tc_port *tc;
 
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index 6ebbd97e6351..2fb6fec6dc99 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -1322,7 +1322,7 @@ static void intel_dmc_runtime_pm_get(struct intel_display *display)
 
 static void intel_dmc_runtime_pm_put(struct intel_display *display)
 {
-	intel_wakeref_t wakeref __maybe_unused =
+	struct ref_tracker *wakeref __maybe_unused =
 		fetch_and_zero(&display->dmc.wakeref);
 
 	intel_display_power_put(display, POWER_DOMAIN_INIT, wakeref);
diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux.c b/drivers/gpu/drm/i915/display/intel_dp_aux.c
index 38e03f3efac5..51b3a168ec33 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_aux.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c
@@ -245,7 +245,7 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
 	i915_reg_t ch_ctl, ch_data[5];
 	u32 aux_clock_divider;
 	enum intel_display_power_domain aux_domain;
-	intel_wakeref_t aux_wakeref;
+	struct ref_tracker *aux_wakeref;
 	struct ref_tracker *pps_wakeref = NULL;
 	int i, ret, recv_bytes;
 	int try, clock = 0;
diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index e0e5e5f65d19..9aa84a430f09 100644
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@ -547,7 +547,7 @@ static bool ibx_pch_dpll_get_hw_state(struct intel_display *display,
 {
 	struct i9xx_dpll_hw_state *hw_state = &dpll_hw_state->i9xx;
 	const enum intel_dpll_id id = pll->info->id;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	u32 val;
 
 	wakeref = intel_display_power_get_if_enabled(display,
@@ -768,7 +768,7 @@ static bool hsw_ddi_wrpll_get_hw_state(struct intel_display *display,
 {
 	struct hsw_dpll_hw_state *hw_state = &dpll_hw_state->hsw;
 	const enum intel_dpll_id id = pll->info->id;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	u32 val;
 
 	wakeref = intel_display_power_get_if_enabled(display,
@@ -789,7 +789,7 @@ static bool hsw_ddi_spll_get_hw_state(struct intel_display *display,
 				      struct intel_dpll_hw_state *dpll_hw_state)
 {
 	struct hsw_dpll_hw_state *hw_state = &dpll_hw_state->hsw;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	u32 val;
 
 	wakeref = intel_display_power_get_if_enabled(display,
@@ -1447,7 +1447,7 @@ static bool skl_ddi_pll_get_hw_state(struct intel_display *display,
 	struct skl_dpll_hw_state *hw_state = &dpll_hw_state->skl;
 	const struct skl_dpll_regs *regs = skl_dpll_regs;
 	const enum intel_dpll_id id = pll->info->id;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret;
 	u32 val;
 
@@ -1485,7 +1485,7 @@ static bool skl_ddi_dpll0_get_hw_state(struct intel_display *display,
 	struct skl_dpll_hw_state *hw_state = &dpll_hw_state->skl;
 	const struct skl_dpll_regs *regs = skl_dpll_regs;
 	const enum intel_dpll_id id = pll->info->id;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	u32 val;
 	bool ret;
 
@@ -2188,7 +2188,7 @@ static bool bxt_ddi_pll_get_hw_state(struct intel_display *display,
 {
 	struct bxt_dpll_hw_state *hw_state = &dpll_hw_state->bxt;
 	enum port port = (enum port)pll->info->id; /* 1:1 port->PLL mapping */
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	enum dpio_phy phy;
 	enum dpio_channel ch;
 	u32 val;
@@ -3598,7 +3598,7 @@ static bool mg_pll_get_hw_state(struct intel_display *display,
 	struct icl_dpll_hw_state *hw_state = &dpll_hw_state->icl;
 	const enum intel_dpll_id id = pll->info->id;
 	enum tc_port tc_port = icl_pll_id_to_tc_port(id);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret = false;
 	u32 val;
 
@@ -3665,7 +3665,7 @@ static bool dkl_pll_get_hw_state(struct intel_display *display,
 	struct icl_dpll_hw_state *hw_state = &dpll_hw_state->icl;
 	const enum intel_dpll_id id = pll->info->id;
 	enum tc_port tc_port = icl_pll_id_to_tc_port(id);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret = false;
 	u32 val;
 
@@ -3737,7 +3737,7 @@ static bool icl_pll_get_hw_state(struct intel_display *display,
 {
 	struct icl_dpll_hw_state *hw_state = &dpll_hw_state->icl;
 	const enum intel_dpll_id id = pll->info->id;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret = false;
 	u32 val;
 
diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
index 322af5c55d7c..5b71c860515f 100644
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
@@ -28,7 +28,6 @@
 #include <linux/types.h>
 
 #include "intel_display_power.h"
-#include "intel_wakeref.h"
 
 #define for_each_dpll(__display, __pll, __i) \
 	for ((__i) = 0; (__i) < (__display)->dpll.num_dpll && \
@@ -42,6 +41,7 @@ struct intel_crtc_state;
 struct intel_dpll_funcs;
 struct intel_encoder;
 struct intel_shared_dpll;
+struct ref_tracker;
 
 /**
  * enum intel_dpll_id - possible DPLL ids
@@ -396,7 +396,7 @@ struct intel_dpll {
 	 * @wakeref: In some platforms a device-level runtime pm reference may
 	 * need to be grabbed to disable DC states while this DPLL is enabled
 	 */
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 };
 
 #define SKL_DPLL0 0
diff --git a/drivers/gpu/drm/i915/display/intel_dsi.h b/drivers/gpu/drm/i915/display/intel_dsi.h
index 89c7166a3860..489d26ffd235 100644
--- a/drivers/gpu/drm/i915/display/intel_dsi.h
+++ b/drivers/gpu/drm/i915/display/intel_dsi.h
@@ -29,6 +29,9 @@
 
 #include "intel_display_types.h"
 
+struct intel_dsi_host;
+struct ref_tracker;
+
 #define INTEL_DSI_VIDEO_MODE	0
 #define INTEL_DSI_COMMAND_MODE	1
 
@@ -37,13 +40,11 @@
 #define DSI_DUAL_LINK_FRONT_BACK	1
 #define DSI_DUAL_LINK_PIXEL_ALT		2
 
-struct intel_dsi_host;
-
 struct intel_dsi {
 	struct intel_encoder base;
 
 	struct intel_dsi_host *dsi_hosts[I915_MAX_PORTS];
-	intel_wakeref_t io_wakeref[I915_MAX_PORTS];
+	struct ref_tracker *io_wakeref[I915_MAX_PORTS];
 
 	/* GPIO Desc for panel and backlight control */
 	struct gpio_desc *gpio_panel;
diff --git a/drivers/gpu/drm/i915/display/intel_gmbus.c b/drivers/gpu/drm/i915/display/intel_gmbus.c
index acc85853b2a7..2caff677600c 100644
--- a/drivers/gpu/drm/i915/display/intel_gmbus.c
+++ b/drivers/gpu/drm/i915/display/intel_gmbus.c
@@ -789,7 +789,7 @@ gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num)
 {
 	struct intel_gmbus *bus = to_intel_gmbus(adapter);
 	struct intel_display *display = bus->display;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	int ret;
 
 	wakeref = intel_display_power_get(display, POWER_DOMAIN_GMBUS);
@@ -829,7 +829,7 @@ int intel_gmbus_output_aksv(struct i2c_adapter *adapter)
 			.buf = buf,
 		}
 	};
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	int ret;
 
 	wakeref = intel_display_power_get(display, POWER_DOMAIN_GMBUS);
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 908faf17f93d..055e68810d0d 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -2518,7 +2518,7 @@ intel_hdmi_set_edid(struct drm_connector *_connector)
 	struct intel_display *display = to_intel_display(connector);
 	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
 	struct i2c_adapter *ddc = connector->base.ddc;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	const struct drm_edid *drm_edid;
 	bool connected = false;
 
@@ -2561,7 +2561,7 @@ intel_hdmi_detect(struct drm_connector *_connector, bool force)
 	enum drm_connector_status status = connector_status_disconnected;
 	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
 	struct intel_encoder *encoder = &hdmi_to_dig_port(intel_hdmi)->base;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 
 	drm_dbg_kms(display->drm, "[CONNECTOR:%d:%s]\n",
 		    connector->base.base.id, connector->base.name);
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
index 7575a063f7be..970aa95ee344 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
@@ -785,7 +785,7 @@ static void i915_hpd_poll_init_work(struct work_struct *work)
 		container_of(work, typeof(*display), hotplug.poll_init_work);
 	struct drm_connector_list_iter conn_iter;
 	struct intel_connector *connector;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool enabled;
 
 	mutex_lock(&display->drm->mode_config.mutex);
diff --git a/drivers/gpu/drm/i915/display/intel_lt_phy.c b/drivers/gpu/drm/i915/display/intel_lt_phy.c
index aaf5a2433690..939c8975fd4c 100644
--- a/drivers/gpu/drm/i915/display/intel_lt_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_lt_phy.c
@@ -1324,11 +1324,11 @@ intel_lt_phy_config_changed(struct intel_encoder *encoder,
 	return true;
 }
 
-static intel_wakeref_t intel_lt_phy_transaction_begin(struct intel_encoder *encoder)
+static struct ref_tracker *intel_lt_phy_transaction_begin(struct intel_encoder *encoder)
 {
 	struct intel_display *display = to_intel_display(encoder);
 	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 
 	intel_psr_pause(intel_dp);
 	wakeref = intel_display_power_get(display, POWER_DOMAIN_DC_OFF);
@@ -1336,7 +1336,7 @@ static intel_wakeref_t intel_lt_phy_transaction_begin(struct intel_encoder *enco
 	return wakeref;
 }
 
-static void intel_lt_phy_transaction_end(struct intel_encoder *encoder, intel_wakeref_t wakeref)
+static void intel_lt_phy_transaction_end(struct intel_encoder *encoder, struct ref_tracker *wakeref)
 {
 	struct intel_display *display = to_intel_display(encoder);
 	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
@@ -1932,7 +1932,7 @@ void intel_lt_phy_pll_enable(struct intel_encoder *encoder,
 	u8 owned_lane_mask = intel_lt_phy_get_owned_lane_mask(encoder);
 	enum phy phy = intel_encoder_to_phy(encoder);
 	enum port port = encoder->port;
-	intel_wakeref_t wakeref = 0;
+	struct ref_tracker *wakeref = 0;
 	u32 lane_phy_pulse_status = owned_lane_mask == INTEL_LT_PHY_BOTH_LANES
 					? (XE3PLPDP_LANE_PHY_PULSE_STATUS(0) |
 					   XE3PLPDP_LANE_PHY_PULSE_STATUS(1))
@@ -2060,7 +2060,7 @@ void intel_lt_phy_pll_disable(struct intel_encoder *encoder)
 	struct intel_display *display = to_intel_display(encoder);
 	enum phy phy = intel_encoder_to_phy(encoder);
 	enum port port = encoder->port;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	u8 owned_lane_mask = intel_lt_phy_get_owned_lane_mask(encoder);
 	u32 lane_pipe_reset = owned_lane_mask == INTEL_LT_PHY_BOTH_LANES
 				? (XELPDP_LANE_PIPE_RESET(0) |
@@ -2137,7 +2137,7 @@ void intel_lt_phy_set_signal_levels(struct intel_encoder *encoder,
 	struct intel_display *display = to_intel_display(encoder);
 	const struct intel_ddi_buf_trans *trans;
 	u8 owned_lane_mask;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	int n_entries, ln;
 	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
 
@@ -2222,7 +2222,7 @@ void intel_lt_phy_pll_readout_hw_state(struct intel_encoder *encoder,
 {
 	u8 owned_lane_mask;
 	u8 lane;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	int i, j, k;
 
 	pll_state->tbt_mode = intel_tc_port_in_tbt_alt_mode(enc_to_dig_port(encoder));
diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
index 89aeb4fb340e..457d60863536 100644
--- a/drivers/gpu/drm/i915/display/intel_lvds.c
+++ b/drivers/gpu/drm/i915/display/intel_lvds.c
@@ -105,7 +105,7 @@ static bool intel_lvds_get_hw_state(struct intel_encoder *encoder,
 {
 	struct intel_display *display = to_intel_display(encoder);
 	struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(encoder);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret;
 
 	wakeref = intel_display_power_get_if_enabled(display, encoder->power_domain);
diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
index 0dcb0597879a..d10cbf69a5f8 100644
--- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c
+++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
@@ -940,7 +940,7 @@ void intel_modeset_setup_hw_state(struct intel_display *display,
 {
 	struct intel_encoder *encoder;
 	struct intel_crtc *crtc;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 
 	wakeref = intel_display_power_get(display, POWER_DOMAIN_INIT);
 
diff --git a/drivers/gpu/drm/i915/display/intel_pipe_crc.c b/drivers/gpu/drm/i915/display/intel_pipe_crc.c
index 71cb0178c8b1..57586c78582d 100644
--- a/drivers/gpu/drm/i915/display/intel_pipe_crc.c
+++ b/drivers/gpu/drm/i915/display/intel_pipe_crc.c
@@ -588,7 +588,7 @@ int intel_crtc_set_crc_source(struct drm_crtc *_crtc, const char *source_name)
 	enum intel_display_power_domain power_domain;
 	enum intel_pipe_crc_source source;
 	enum pipe pipe = crtc->pipe;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	u32 val = 0; /* shut up gcc */
 	int ret = 0;
 	bool enable;
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index 69b6873a6044..2d1c293aeff6 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -462,7 +462,7 @@ vlv_sprite_get_hw_state(struct intel_plane *plane,
 	struct intel_display *display = to_intel_display(plane);
 	enum intel_display_power_domain power_domain;
 	enum plane_id plane_id = plane->id;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret;
 
 	power_domain = POWER_DOMAIN_PIPE(plane->pipe);
@@ -893,7 +893,7 @@ ivb_sprite_get_hw_state(struct intel_plane *plane,
 {
 	struct intel_display *display = to_intel_display(plane);
 	enum intel_display_power_domain power_domain;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret;
 
 	power_domain = POWER_DOMAIN_PIPE(plane->pipe);
@@ -1233,7 +1233,7 @@ g4x_sprite_get_hw_state(struct intel_plane *plane,
 {
 	struct intel_display *display = to_intel_display(plane);
 	enum intel_display_power_domain power_domain;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret;
 
 	power_domain = POWER_DOMAIN_PIPE(plane->pipe);
diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index c678216af352..064f572bbc85 100644
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -51,7 +51,7 @@ struct intel_tc_port {
 	const struct intel_tc_phy_ops *phy_ops;
 
 	struct mutex lock;	/* protects the TypeC port mode */
-	intel_wakeref_t lock_wakeref;
+	struct ref_tracker *lock_wakeref;
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
 	enum intel_display_power_domain lock_power_domain;
 #endif
@@ -182,7 +182,7 @@ bool intel_tc_cold_requires_aux_pw(struct intel_digital_port *dig_port)
 	       intel_display_power_legacy_aux_domain(display, dig_port->aux_ch);
 }
 
-static intel_wakeref_t
+static struct ref_tracker *
 __tc_cold_block(struct intel_tc_port *tc, enum intel_display_power_domain *domain)
 {
 	struct intel_display *display = to_intel_display(tc->dig_port);
@@ -192,11 +192,11 @@ __tc_cold_block(struct intel_tc_port *tc, enum intel_display_power_domain *domai
 	return intel_display_power_get(display, *domain);
 }
 
-static intel_wakeref_t
+static struct ref_tracker *
 tc_cold_block(struct intel_tc_port *tc)
 {
 	enum intel_display_power_domain domain;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 
 	wakeref = __tc_cold_block(tc, &domain);
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
@@ -207,7 +207,7 @@ tc_cold_block(struct intel_tc_port *tc)
 
 static void
 __tc_cold_unblock(struct intel_tc_port *tc, enum intel_display_power_domain domain,
-		  intel_wakeref_t wakeref)
+		  struct ref_tracker *wakeref)
 {
 	struct intel_display *display = to_intel_display(tc->dig_port);
 
@@ -215,7 +215,7 @@ __tc_cold_unblock(struct intel_tc_port *tc, enum intel_display_power_domain doma
 }
 
 static void
-tc_cold_unblock(struct intel_tc_port *tc, intel_wakeref_t wakeref)
+tc_cold_unblock(struct intel_tc_port *tc, struct ref_tracker *wakeref)
 {
 	struct intel_display __maybe_unused *display = to_intel_display(tc->dig_port);
 	enum intel_display_power_domain domain = tc_phy_cold_off_domain(tc);
@@ -625,7 +625,7 @@ static bool icl_tc_phy_is_owned(struct intel_tc_port *tc)
 static void icl_tc_phy_get_hw_state(struct intel_tc_port *tc)
 {
 	enum intel_display_power_domain domain;
-	intel_wakeref_t tc_cold_wref;
+	struct ref_tracker *tc_cold_wref;
 
 	tc_cold_wref = __tc_cold_block(tc, &domain);
 
@@ -892,7 +892,7 @@ static void adlp_tc_phy_get_hw_state(struct intel_tc_port *tc)
 	struct intel_display *display = to_intel_display(tc->dig_port);
 	enum intel_display_power_domain port_power_domain =
 		tc_port_power_domain(tc);
-	intel_wakeref_t port_wakeref;
+	struct ref_tracker *port_wakeref;
 
 	port_wakeref = intel_display_power_get(display, port_power_domain);
 
@@ -911,7 +911,7 @@ static bool adlp_tc_phy_connect(struct intel_tc_port *tc, int required_lanes)
 	struct intel_display *display = to_intel_display(tc->dig_port);
 	enum intel_display_power_domain port_power_domain =
 		tc_port_power_domain(tc);
-	intel_wakeref_t port_wakeref;
+	struct ref_tracker *port_wakeref;
 
 	if (tc->mode == TC_PORT_TBT_ALT) {
 		tc->lock_wakeref = tc_cold_block(tc);
@@ -963,7 +963,7 @@ static void adlp_tc_phy_disconnect(struct intel_tc_port *tc)
 	struct intel_display *display = to_intel_display(tc->dig_port);
 	enum intel_display_power_domain port_power_domain =
 		tc_port_power_domain(tc);
-	intel_wakeref_t port_wakeref;
+	struct ref_tracker *port_wakeref;
 
 	port_wakeref = intel_display_power_get(display, port_power_domain);
 
@@ -1169,7 +1169,7 @@ static bool xelpdp_tc_phy_is_owned(struct intel_tc_port *tc)
 static void xelpdp_tc_phy_get_hw_state(struct intel_tc_port *tc)
 {
 	struct intel_display *display = to_intel_display(tc->dig_port);
-	intel_wakeref_t tc_cold_wref;
+	struct ref_tracker *tc_cold_wref;
 	enum intel_display_power_domain domain;
 
 	tc_cold_wref = __tc_cold_block(tc, &domain);
diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c
index 0e727fc5e80c..ad5fe841e4b3 100644
--- a/drivers/gpu/drm/i915/display/intel_vdsc.c
+++ b/drivers/gpu/drm/i915/display/intel_vdsc.c
@@ -999,7 +999,7 @@ void intel_dsc_get_config(struct intel_crtc_state *crtc_state)
 	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
 	enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
 	enum intel_display_power_domain power_domain;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	u32 dss_ctl1, dss_ctl2;
 
 	if (!intel_dsc_source_support(crtc_state))
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 89c8003ccfe7..0b5a1ec2f77a 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -939,7 +939,7 @@ skl_plane_get_hw_state(struct intel_plane *plane,
 	struct intel_display *display = to_intel_display(plane);
 	enum intel_display_power_domain power_domain;
 	enum plane_id plane_id = plane->id;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	bool ret;
 
 	power_domain = POWER_DOMAIN_PIPE(plane->pipe);
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 7964cfffdaae..a6aab79812e5 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -718,7 +718,7 @@ static void skl_pipe_ddb_get_hw_state(struct intel_crtc *crtc,
 	struct intel_display *display = to_intel_display(crtc);
 	enum intel_display_power_domain power_domain;
 	enum pipe pipe = crtc->pipe;
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	enum plane_id plane_id;
 
 	power_domain = POWER_DOMAIN_PIPE(pipe);
diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
index 19bdd8662359..d705af3bf8ba 100644
--- a/drivers/gpu/drm/i915/display/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
@@ -936,7 +936,7 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
 {
 	struct intel_display *display = to_intel_display(encoder);
 	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
-	intel_wakeref_t wakeref;
+	struct ref_tracker *wakeref;
 	enum port port;
 	bool active = false;
 
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
index 2a32faea9db5..910a8a60da64 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
@@ -3,8 +3,4 @@
  * Copyright © 2023 Intel Corporation
  */
 
-#include <linux/types.h>
-
-typedef struct ref_tracker *intel_wakeref_t;
-
 #define INTEL_WAKEREF_DEF ERR_PTR(-ENOENT)
diff --git a/drivers/gpu/drm/xe/display/xe_display_rpm.c b/drivers/gpu/drm/xe/display/xe_display_rpm.c
index 340f65884812..9416ec784e39 100644
--- a/drivers/gpu/drm/xe/display/xe_display_rpm.c
+++ b/drivers/gpu/drm/xe/display/xe_display_rpm.c
@@ -5,6 +5,7 @@
 
 #include "intel_display_core.h"
 #include "intel_display_rpm.h"
+#include "intel_wakeref.h"
 #include "xe_device.h"
 #include "xe_device_types.h"
 #include "xe_pm.h"
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH v2 5/5] drm/{i915,xe}/display: drop intel_wakeref.h usage
  2025-11-25 13:24 [PATCH v2 0/5] drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * Jani Nikula
                   ` (3 preceding siblings ...)
  2025-11-25 13:24 ` [PATCH v2 4/5] drm/i915/power: convert intel_wakeref_t to struct ref_tracker * Jani Nikula
@ 2025-11-25 13:24 ` Jani Nikula
  2025-12-01  8:17   ` Luca Coelho
  2025-11-25 14:18 ` ✓ i915.CI.BAT: success for drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * (rev2) Patchwork
  2025-11-26  2:30 ` ✗ i915.CI.Full: failure " Patchwork
  6 siblings, 1 reply; 16+ messages in thread
From: Jani Nikula @ 2025-11-25 13:24 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: jani.nikula

Drop the display dependency on intel_wakeref.h header. The contract in
the parent interface is that -ENOENT means there's no tracking. It
doesn't actually require us to use a shared macro for it. Duplicate the
macro in the few places that need this instead of inlining, primarily
for documentation reasons.

This allows us to remove the xe compat intel_wakeref.h header.

v2: Define INTEL_WAKEREF_DEF in intel_display_power.h

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_power.h     | 5 +++--
 drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h | 6 ------
 drivers/gpu/drm/xe/display/xe_display_rpm.c            | 4 +++-
 3 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h

diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
index 6f8d921b4482..d616d5d09cbe 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.h
+++ b/drivers/gpu/drm/i915/display/intel_display_power.h
@@ -9,8 +9,6 @@
 #include <linux/mutex.h>
 #include <linux/workqueue.h>
 
-#include "intel_wakeref.h"
-
 enum aux_ch;
 enum port;
 struct i915_power_well;
@@ -19,6 +17,9 @@ struct intel_encoder;
 struct ref_tracker;
 struct seq_file;
 
+/* -ENOENT means we got the ref, but there's no tracking */
+#define INTEL_WAKEREF_DEF ERR_PTR(-ENOENT)
+
 /*
  * Keep the pipe, transcoder, port (DDI_LANES,DDI_IO,AUX) domain instances
  * consecutive, so that the pipe,transcoder,port -> power domain macros
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
deleted file mode 100644
index 910a8a60da64..000000000000
--- a/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2023 Intel Corporation
- */
-
-#define INTEL_WAKEREF_DEF ERR_PTR(-ENOENT)
diff --git a/drivers/gpu/drm/xe/display/xe_display_rpm.c b/drivers/gpu/drm/xe/display/xe_display_rpm.c
index 9416ec784e39..b3db40035499 100644
--- a/drivers/gpu/drm/xe/display/xe_display_rpm.c
+++ b/drivers/gpu/drm/xe/display/xe_display_rpm.c
@@ -5,11 +5,13 @@
 
 #include "intel_display_core.h"
 #include "intel_display_rpm.h"
-#include "intel_wakeref.h"
 #include "xe_device.h"
 #include "xe_device_types.h"
 #include "xe_pm.h"
 
+/* -ENOENT means we got the ref, but there's no tracking */
+#define INTEL_WAKEREF_DEF ERR_PTR(-ENOENT)
+
 static struct ref_tracker *xe_display_rpm_get(const struct drm_device *drm)
 {
 	return xe_pm_runtime_resume_and_get(to_xe_device(drm)) ? INTEL_WAKEREF_DEF : NULL;
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* ✓ i915.CI.BAT: success for drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * (rev2)
  2025-11-25 13:24 [PATCH v2 0/5] drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * Jani Nikula
                   ` (4 preceding siblings ...)
  2025-11-25 13:24 ` [PATCH v2 5/5] drm/{i915,xe}/display: drop intel_wakeref.h usage Jani Nikula
@ 2025-11-25 14:18 ` Patchwork
  2025-11-26  2:30 ` ✗ i915.CI.Full: failure " Patchwork
  6 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2025-11-25 14:18 UTC (permalink / raw)
  To: Jani Nikula; +Cc: intel-gfx

[-- Attachment #1: Type: text/plain, Size: 4274 bytes --]

== Series Details ==

Series: drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * (rev2)
URL   : https://patchwork.freedesktop.org/series/157906/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_17583 -> Patchwork_157906v2
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/index.html

Participating hosts (45 -> 44)
------------------------------

  Missing    (1): fi-snb-2520m 

Known issues
------------

  Here are the changes found in Patchwork_157906v2 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_lmem_swapping@basic:
    - fi-kbl-guc:         NOTRUN -> [SKIP][1] ([i915#4613]) +3 other tests skip
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/fi-kbl-guc/igt@gem_lmem_swapping@basic.html

  * igt@i915_selftest@live:
    - bat-mtlp-8:         [PASS][2] -> [DMESG-FAIL][3] ([i915#12061]) +1 other test dmesg-fail
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/bat-mtlp-8/igt@i915_selftest@live.html
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/bat-mtlp-8/igt@i915_selftest@live.html

  * igt@i915_selftest@live@workarounds:
    - bat-arls-5:         [PASS][4] -> [DMESG-FAIL][5] ([i915#12061]) +1 other test dmesg-fail
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/bat-arls-5/igt@i915_selftest@live@workarounds.html
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/bat-arls-5/igt@i915_selftest@live@workarounds.html
    - bat-mtlp-6:         [PASS][6] -> [DMESG-FAIL][7] ([i915#12061]) +1 other test dmesg-fail
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/bat-mtlp-6/igt@i915_selftest@live@workarounds.html
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/bat-mtlp-6/igt@i915_selftest@live@workarounds.html

  * igt@kms_cursor_legacy@basic-flip-before-cursor-legacy:
    - fi-kbl-guc:         NOTRUN -> [SKIP][8] ([i915#11190]) +16 other tests skip
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/fi-kbl-guc/igt@kms_cursor_legacy@basic-flip-before-cursor-legacy.html

  * igt@prime_vgem@basic-fence-flip:
    - fi-kbl-guc:         NOTRUN -> [SKIP][9] +14 other tests skip
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/fi-kbl-guc/igt@prime_vgem@basic-fence-flip.html

  
#### Possible fixes ####

  * igt@gem_exec_fence@basic-busy:
    - fi-kbl-guc:         [INCOMPLETE][10] -> [PASS][11] +1 other test pass
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/fi-kbl-guc/igt@gem_exec_fence@basic-busy.html
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/fi-kbl-guc/igt@gem_exec_fence@basic-busy.html

  * igt@i915_selftest@live@workarounds:
    - bat-arlh-2:         [DMESG-FAIL][12] ([i915#12061]) -> [PASS][13] +1 other test pass
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/bat-arlh-2/igt@i915_selftest@live@workarounds.html
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/bat-arlh-2/igt@i915_selftest@live@workarounds.html
    - bat-mtlp-9:         [DMESG-FAIL][14] ([i915#12061]) -> [PASS][15] +1 other test pass
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/bat-mtlp-9/igt@i915_selftest@live@workarounds.html
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/bat-mtlp-9/igt@i915_selftest@live@workarounds.html

  
  [i915#11190]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11190
  [i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061
  [i915#4613]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4613


Build changes
-------------

  * Linux: CI_DRM_17583 -> Patchwork_157906v2

  CI-20190529: 20190529
  CI_DRM_17583: 0a21e96e0b6840d2a4e0b45a957679eeddeb4362 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8637: 730ee3dfb26f8d7891fc240b0132a08c5bc7b949 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_157906v2: 0a21e96e0b6840d2a4e0b45a957679eeddeb4362 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/index.html

[-- Attachment #2: Type: text/html, Size: 5356 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* ✗ i915.CI.Full: failure for drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * (rev2)
  2025-11-25 13:24 [PATCH v2 0/5] drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * Jani Nikula
                   ` (5 preceding siblings ...)
  2025-11-25 14:18 ` ✓ i915.CI.BAT: success for drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * (rev2) Patchwork
@ 2025-11-26  2:30 ` Patchwork
  6 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2025-11-26  2:30 UTC (permalink / raw)
  To: Jani Nikula; +Cc: intel-gfx

[-- Attachment #1: Type: text/plain, Size: 73808 bytes --]

== Series Details ==

Series: drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * (rev2)
URL   : https://patchwork.freedesktop.org/series/157906/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_17583_full -> Patchwork_157906v2_full
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_157906v2_full absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_157906v2_full, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
  to document this new failure mode, which will reduce false positives in CI.

  

Participating hosts (10 -> 10)
------------------------------

  No changes in participating hosts

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_157906v2_full:

### IGT changes ###

#### Possible regressions ####

  * igt@kms_content_protection@suspend-resume:
    - shard-mtlp:         NOTRUN -> [SKIP][1]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-mtlp-7/igt@kms_content_protection@suspend-resume.html

  
Known issues
------------

  Here are the changes found in Patchwork_157906v2_full that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@device_reset@cold-reset-bound:
    - shard-tglu:         NOTRUN -> [SKIP][2] ([i915#11078])
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@device_reset@cold-reset-bound.html

  * igt@gem_ccs@ctrl-surf-copy-new-ctx:
    - shard-tglu-1:       NOTRUN -> [SKIP][3] ([i915#9323])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@gem_ccs@ctrl-surf-copy-new-ctx.html

  * igt@gem_create@create-ext-cpu-access-big:
    - shard-tglu:         NOTRUN -> [SKIP][4] ([i915#6335])
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-9/igt@gem_create@create-ext-cpu-access-big.html

  * igt@gem_ctx_sseu@invalid-sseu:
    - shard-tglu:         NOTRUN -> [SKIP][5] ([i915#280])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-9/igt@gem_ctx_sseu@invalid-sseu.html

  * igt@gem_eio@hibernate:
    - shard-tglu:         NOTRUN -> [ABORT][6] ([i915#15317] / [i915#7975])
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-9/igt@gem_eio@hibernate.html

  * igt@gem_exec_balancer@parallel-bb-first:
    - shard-tglu-1:       NOTRUN -> [SKIP][7] ([i915#4525]) +1 other test skip
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@gem_exec_balancer@parallel-bb-first.html

  * igt@gem_exec_balancer@parallel-contexts:
    - shard-tglu:         NOTRUN -> [SKIP][8] ([i915#4525])
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-9/igt@gem_exec_balancer@parallel-contexts.html

  * igt@gem_exec_capture@capture-recoverable:
    - shard-tglu:         NOTRUN -> [SKIP][9] ([i915#6344])
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@gem_exec_capture@capture-recoverable.html

  * igt@gem_lmem_swapping@random:
    - shard-tglu-1:       NOTRUN -> [SKIP][10] ([i915#4613])
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@gem_lmem_swapping@random.html

  * igt@gem_lmem_swapping@smem-oom@lmem0:
    - shard-dg2:          [PASS][11] -> [DMESG-WARN][12] ([i915#5493]) +1 other test dmesg-warn
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg2-1/igt@gem_lmem_swapping@smem-oom@lmem0.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-8/igt@gem_lmem_swapping@smem-oom@lmem0.html

  * igt@gem_render_copy@y-tiled-ccs-to-y-tiled-mc-ccs:
    - shard-glk:          NOTRUN -> [SKIP][13] +154 other tests skip
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk6/igt@gem_render_copy@y-tiled-ccs-to-y-tiled-mc-ccs.html

  * igt@gem_render_copy@y-tiled-mc-ccs-to-vebox-yf-tiled:
    - shard-mtlp:         NOTRUN -> [SKIP][14] ([i915#8428])
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-mtlp-7/igt@gem_render_copy@y-tiled-mc-ccs-to-vebox-yf-tiled.html

  * igt@gem_userptr_blits@unsync-unmap:
    - shard-tglu-1:       NOTRUN -> [SKIP][15] ([i915#3297]) +2 other tests skip
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@gem_userptr_blits@unsync-unmap.html

  * igt@gem_workarounds@suspend-resume:
    - shard-tglu:         [PASS][16] -> [ABORT][17] ([i915#15317]) +1 other test abort
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-tglu-4/igt@gem_workarounds@suspend-resume.html
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-10/igt@gem_workarounds@suspend-resume.html

  * igt@gen9_exec_parse@bb-secure:
    - shard-tglu:         NOTRUN -> [SKIP][18] ([i915#2527] / [i915#2856])
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@gen9_exec_parse@bb-secure.html

  * igt@gen9_exec_parse@bb-start-param:
    - shard-tglu-1:       NOTRUN -> [SKIP][19] ([i915#2527] / [i915#2856]) +2 other tests skip
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@gen9_exec_parse@bb-start-param.html

  * igt@i915_module_load@resize-bar:
    - shard-tglu:         NOTRUN -> [SKIP][20] ([i915#6412])
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@i915_module_load@resize-bar.html

  * igt@i915_suspend@forcewake:
    - shard-glk:          NOTRUN -> [INCOMPLETE][21] ([i915#4817])
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk9/igt@i915_suspend@forcewake.html

  * igt@kms_async_flips@async-flip-suspend-resume:
    - shard-glk10:        NOTRUN -> [ABORT][22] ([i915#15317]) +2 other tests abort
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk10/igt@kms_async_flips@async-flip-suspend-resume.html

  * igt@kms_async_flips@async-flip-suspend-resume@pipe-b-hdmi-a-2:
    - shard-rkl:          [PASS][23] -> [ABORT][24] ([i915#15317])
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_async_flips@async-flip-suspend-resume@pipe-b-hdmi-a-2.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-1/igt@kms_async_flips@async-flip-suspend-resume@pipe-b-hdmi-a-2.html

  * igt@kms_async_flips@async-flip-suspend-resume@pipe-c-hdmi-a-2:
    - shard-rkl:          NOTRUN -> [INCOMPLETE][25] ([i915#12761])
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-1/igt@kms_async_flips@async-flip-suspend-resume@pipe-c-hdmi-a-2.html

  * igt@kms_atomic_transition@plane-all-modeset-transition-fencing-internal-panels:
    - shard-tglu:         NOTRUN -> [SKIP][26] ([i915#1769] / [i915#3555])
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-9/igt@kms_atomic_transition@plane-all-modeset-transition-fencing-internal-panels.html

  * igt@kms_big_fb@4-tiled-16bpp-rotate-180:
    - shard-tglu-1:       NOTRUN -> [SKIP][27] ([i915#5286]) +3 other tests skip
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_big_fb@4-tiled-16bpp-rotate-180.html

  * igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180:
    - shard-tglu:         NOTRUN -> [SKIP][28] ([i915#5286]) +1 other test skip
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180.html

  * igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180-hflip:
    - shard-mtlp:         [PASS][29] -> [FAIL][30] ([i915#5138])
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-mtlp-6/igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180-hflip.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-mtlp-2/igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180-hflip.html

  * igt@kms_ccs@bad-rotation-90-4-tiled-dg2-rc-ccs@pipe-b-hdmi-a-1:
    - shard-rkl:          NOTRUN -> [SKIP][31] ([i915#6095]) +25 other tests skip
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-2/igt@kms_ccs@bad-rotation-90-4-tiled-dg2-rc-ccs@pipe-b-hdmi-a-1.html

  * igt@kms_ccs@ccs-on-another-bo-4-tiled-mtl-rc-ccs@pipe-b-hdmi-a-3:
    - shard-dg2:          NOTRUN -> [SKIP][32] ([i915#10307] / [i915#6095]) +74 other tests skip
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-5/igt@kms_ccs@ccs-on-another-bo-4-tiled-mtl-rc-ccs@pipe-b-hdmi-a-3.html

  * igt@kms_ccs@crc-primary-basic-4-tiled-mtl-rc-ccs-cc@pipe-b-hdmi-a-1:
    - shard-tglu:         NOTRUN -> [SKIP][33] ([i915#6095]) +4 other tests skip
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@kms_ccs@crc-primary-basic-4-tiled-mtl-rc-ccs-cc@pipe-b-hdmi-a-1.html

  * igt@kms_ccs@crc-primary-basic-y-tiled-ccs@pipe-c-hdmi-a-3:
    - shard-dg1:          NOTRUN -> [SKIP][34] ([i915#6095]) +51 other tests skip
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg1-12/igt@kms_ccs@crc-primary-basic-y-tiled-ccs@pipe-c-hdmi-a-3.html

  * igt@kms_ccs@crc-primary-basic-y-tiled-gen12-rc-ccs@pipe-d-hdmi-a-1:
    - shard-dg2:          NOTRUN -> [SKIP][35] ([i915#10307] / [i915#10434] / [i915#6095])
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-4/igt@kms_ccs@crc-primary-basic-y-tiled-gen12-rc-ccs@pipe-d-hdmi-a-1.html

  * igt@kms_ccs@crc-primary-rotation-180-4-tiled-lnl-ccs:
    - shard-tglu-1:       NOTRUN -> [SKIP][36] ([i915#12313])
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_ccs@crc-primary-rotation-180-4-tiled-lnl-ccs.html

  * igt@kms_ccs@crc-primary-rotation-180-4-tiled-mtl-rc-ccs@pipe-b-hdmi-a-1:
    - shard-tglu-1:       NOTRUN -> [SKIP][37] ([i915#6095]) +44 other tests skip
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_ccs@crc-primary-rotation-180-4-tiled-mtl-rc-ccs@pipe-b-hdmi-a-1.html

  * igt@kms_ccs@crc-primary-suspend-4-tiled-mtl-rc-ccs-cc@pipe-b-hdmi-a-3:
    - shard-dg2:          NOTRUN -> [SKIP][38] ([i915#6095]) +3 other tests skip
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-5/igt@kms_ccs@crc-primary-suspend-4-tiled-mtl-rc-ccs-cc@pipe-b-hdmi-a-3.html

  * igt@kms_ccs@crc-primary-suspend-y-tiled-gen12-mc-ccs:
    - shard-glk10:        NOTRUN -> [SKIP][39] +13 other tests skip
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk10/igt@kms_ccs@crc-primary-suspend-y-tiled-gen12-mc-ccs.html

  * igt@kms_ccs@crc-sprite-planes-basic-y-tiled-ccs@pipe-c-hdmi-a-1:
    - shard-rkl:          NOTRUN -> [SKIP][40] ([i915#14098] / [i915#6095]) +12 other tests skip
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-2/igt@kms_ccs@crc-sprite-planes-basic-y-tiled-ccs@pipe-c-hdmi-a-1.html

  * igt@kms_chamelium_edid@dp-edid-resolution-list:
    - shard-tglu:         NOTRUN -> [SKIP][41] ([i915#11151] / [i915#7828]) +1 other test skip
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@kms_chamelium_edid@dp-edid-resolution-list.html

  * igt@kms_chamelium_hpd@hdmi-hpd-storm-disable:
    - shard-tglu-1:       NOTRUN -> [SKIP][42] ([i915#11151] / [i915#7828]) +2 other tests skip
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_chamelium_hpd@hdmi-hpd-storm-disable.html

  * igt@kms_content_protection@atomic:
    - shard-tglu:         NOTRUN -> [SKIP][43] ([i915#6944] / [i915#7116] / [i915#7118] / [i915#9424])
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@kms_content_protection@atomic.html

  * igt@kms_content_protection@dp-mst-lic-type-1:
    - shard-tglu-1:       NOTRUN -> [SKIP][44] ([i915#3116] / [i915#3299])
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_content_protection@dp-mst-lic-type-1.html

  * igt@kms_content_protection@srm:
    - shard-tglu:         NOTRUN -> [SKIP][45] ([i915#6944] / [i915#7116] / [i915#7118])
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-9/igt@kms_content_protection@srm.html

  * igt@kms_cursor_crc@cursor-offscreen-512x170:
    - shard-tglu-1:       NOTRUN -> [SKIP][46] ([i915#13049])
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_cursor_crc@cursor-offscreen-512x170.html

  * igt@kms_cursor_crc@cursor-rapid-movement-32x10:
    - shard-tglu-1:       NOTRUN -> [SKIP][47] ([i915#3555]) +3 other tests skip
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_cursor_crc@cursor-rapid-movement-32x10.html

  * igt@kms_cursor_crc@cursor-sliding-256x85@pipe-a-hdmi-a-1:
    - shard-rkl:          NOTRUN -> [FAIL][48] ([i915#13566])
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-2/igt@kms_cursor_crc@cursor-sliding-256x85@pipe-a-hdmi-a-1.html

  * igt@kms_cursor_crc@cursor-suspend@pipe-a-hdmi-a-2:
    - shard-rkl:          NOTRUN -> [ABORT][49] ([i915#15317])
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_cursor_crc@cursor-suspend@pipe-a-hdmi-a-2.html

  * igt@kms_cursor_legacy@2x-flip-vs-cursor-legacy:
    - shard-mtlp:         NOTRUN -> [SKIP][50] ([i915#9809])
   [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-mtlp-7/igt@kms_cursor_legacy@2x-flip-vs-cursor-legacy.html

  * igt@kms_cursor_legacy@basic-busy-flip-before-cursor-varying-size:
    - shard-tglu:         NOTRUN -> [SKIP][51] ([i915#4103])
   [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-9/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-varying-size.html

  * igt@kms_debugfs@display-on-read-all:
    - shard-dg1:          [PASS][52] -> [DMESG-WARN][53] ([i915#4423]) +2 other tests dmesg-warn
   [52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg1-15/igt@kms_debugfs@display-on-read-all.html
   [53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg1-18/igt@kms_debugfs@display-on-read-all.html

  * igt@kms_dither@fb-8bpc-vs-panel-6bpc:
    - shard-tglu:         NOTRUN -> [SKIP][54] ([i915#1769] / [i915#3555] / [i915#3804])
   [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@kms_dither@fb-8bpc-vs-panel-6bpc.html

  * igt@kms_dither@fb-8bpc-vs-panel-6bpc@pipe-a-hdmi-a-1:
    - shard-tglu:         NOTRUN -> [SKIP][55] ([i915#3804])
   [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@kms_dither@fb-8bpc-vs-panel-6bpc@pipe-a-hdmi-a-1.html

  * igt@kms_dp_aux_dev:
    - shard-dg2:          [PASS][56] -> [SKIP][57] ([i915#1257])
   [56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg2-11/igt@kms_dp_aux_dev.html
   [57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-3/igt@kms_dp_aux_dev.html
    - shard-tglu-1:       NOTRUN -> [SKIP][58] ([i915#1257])
   [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_dp_aux_dev.html

  * igt@kms_fbcon_fbt@fbc-suspend:
    - shard-glk:          NOTRUN -> [INCOMPLETE][59] ([i915#9878])
   [59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk5/igt@kms_fbcon_fbt@fbc-suspend.html

  * igt@kms_feature_discovery@display-4x:
    - shard-tglu-1:       NOTRUN -> [SKIP][60] ([i915#1839]) +1 other test skip
   [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_feature_discovery@display-4x.html

  * igt@kms_flip@2x-flip-vs-dpms-off-vs-modeset-interruptible:
    - shard-tglu:         NOTRUN -> [SKIP][61] ([i915#3637] / [i915#9934]) +2 other tests skip
   [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-9/igt@kms_flip@2x-flip-vs-dpms-off-vs-modeset-interruptible.html

  * igt@kms_flip@2x-flip-vs-fences:
    - shard-tglu-1:       NOTRUN -> [SKIP][62] ([i915#3637] / [i915#9934]) +2 other tests skip
   [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_flip@2x-flip-vs-fences.html

  * igt@kms_flip@flip-vs-suspend:
    - shard-glk:          NOTRUN -> [INCOMPLETE][63] ([i915#12745] / [i915#4839])
   [63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk9/igt@kms_flip@flip-vs-suspend.html

  * igt@kms_flip@flip-vs-suspend-interruptible@a-hdmi-a1:
    - shard-tglu:         NOTRUN -> [ABORT][64] ([i915#15317]) +2 other tests abort
   [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@kms_flip@flip-vs-suspend-interruptible@a-hdmi-a1.html

  * igt@kms_flip@flip-vs-suspend-interruptible@a-hdmi-a3:
    - shard-dg1:          NOTRUN -> [ABORT][65] ([i915#15317]) +2 other tests abort
   [65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg1-13/igt@kms_flip@flip-vs-suspend-interruptible@a-hdmi-a3.html

  * igt@kms_flip@flip-vs-suspend@a-hdmi-a1:
    - shard-glk:          NOTRUN -> [INCOMPLETE][66] ([i915#12745])
   [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk9/igt@kms_flip@flip-vs-suspend@a-hdmi-a1.html
    - shard-dg2:          NOTRUN -> [ABORT][67] ([i915#15317])
   [67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-4/igt@kms_flip@flip-vs-suspend@a-hdmi-a1.html

  * igt@kms_flip@flip-vs-suspend@d-hdmi-a4:
    - shard-dg1:          NOTRUN -> [DMESG-WARN][68] ([i915#4423])
   [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg1-14/igt@kms_flip@flip-vs-suspend@d-hdmi-a4.html

  * igt@kms_flip_scaled_crc@flip-32bpp-4tile-to-32bpp-4tiledg2rcccs-upscaling@pipe-a-valid-mode:
    - shard-tglu:         NOTRUN -> [SKIP][69] ([i915#2587] / [i915#2672]) +2 other tests skip
   [69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@kms_flip_scaled_crc@flip-32bpp-4tile-to-32bpp-4tiledg2rcccs-upscaling@pipe-a-valid-mode.html

  * igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-upscaling:
    - shard-tglu:         NOTRUN -> [SKIP][70] ([i915#2587] / [i915#2672] / [i915#3555])
   [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-9/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-upscaling.html

  * igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-32bpp-4tile-downscaling:
    - shard-tglu-1:       NOTRUN -> [SKIP][71] ([i915#2672] / [i915#3555])
   [71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-32bpp-4tile-downscaling.html

  * igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-32bpp-4tile-downscaling@pipe-a-valid-mode:
    - shard-tglu-1:       NOTRUN -> [SKIP][72] ([i915#2587] / [i915#2672])
   [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-32bpp-4tile-downscaling@pipe-a-valid-mode.html

  * igt@kms_flip_scaled_crc@flip-64bpp-yftile-to-16bpp-yftile-upscaling:
    - shard-tglu:         NOTRUN -> [SKIP][73] ([i915#2672] / [i915#3555]) +1 other test skip
   [73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-9/igt@kms_flip_scaled_crc@flip-64bpp-yftile-to-16bpp-yftile-upscaling.html

  * igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile-downscaling@pipe-a-default-mode:
    - shard-mtlp:         NOTRUN -> [SKIP][74] ([i915#2672] / [i915#3555] / [i915#8813]) +1 other test skip
   [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-mtlp-7/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile-downscaling@pipe-a-default-mode.html

  * igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-shrfb-pgflip-blt:
    - shard-tglu-1:       NOTRUN -> [SKIP][75] +26 other tests skip
   [75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-shrfb-pgflip-blt.html

  * igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-wc:
    - shard-tglu-1:       NOTRUN -> [SKIP][76] ([i915#15102]) +8 other tests skip
   [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-wc.html

  * igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-cpu:
    - shard-tglu:         NOTRUN -> [SKIP][77] ([i915#15102]) +5 other tests skip
   [77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-cpu.html

  * igt@kms_frontbuffer_tracking@psr-2p-primscrn-spr-indfb-draw-mmap-gtt:
    - shard-tglu:         NOTRUN -> [SKIP][78] +20 other tests skip
   [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-9/igt@kms_frontbuffer_tracking@psr-2p-primscrn-spr-indfb-draw-mmap-gtt.html

  * igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-draw-pwrite:
    - shard-mtlp:         NOTRUN -> [SKIP][79] ([i915#1825])
   [79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-mtlp-7/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-draw-pwrite.html

  * igt@kms_hdmi_inject@inject-audio:
    - shard-snb:          [PASS][80] -> [SKIP][81]
   [80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-snb1/igt@kms_hdmi_inject@inject-audio.html
   [81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-snb7/igt@kms_hdmi_inject@inject-audio.html

  * igt@kms_hdr@bpc-switch:
    - shard-tglu:         NOTRUN -> [SKIP][82] ([i915#3555] / [i915#8228])
   [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@kms_hdr@bpc-switch.html

  * igt@kms_hdr@invalid-metadata-sizes:
    - shard-dg2:          [PASS][83] -> [SKIP][84] ([i915#3555] / [i915#8228])
   [83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg2-11/igt@kms_hdr@invalid-metadata-sizes.html
   [84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-3/igt@kms_hdr@invalid-metadata-sizes.html
    - shard-rkl:          [PASS][85] -> [SKIP][86] ([i915#3555] / [i915#8228])
   [85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_hdr@invalid-metadata-sizes.html
   [86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_hdr@invalid-metadata-sizes.html
    - shard-tglu-1:       NOTRUN -> [SKIP][87] ([i915#3555] / [i915#8228])
   [87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_hdr@invalid-metadata-sizes.html

  * igt@kms_joiner@invalid-modeset-big-joiner:
    - shard-mtlp:         NOTRUN -> [SKIP][88] ([i915#10656])
   [88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-mtlp-7/igt@kms_joiner@invalid-modeset-big-joiner.html

  * igt@kms_joiner@switch-modeset-ultra-joiner-big-joiner:
    - shard-tglu-1:       NOTRUN -> [SKIP][89] ([i915#13522])
   [89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_joiner@switch-modeset-ultra-joiner-big-joiner.html

  * igt@kms_pipe_crc_basic@suspend-read-crc@pipe-a-hdmi-a-1:
    - shard-glk:          NOTRUN -> [ABORT][90] ([i915#15317]) +3 other tests abort
   [90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk6/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-a-hdmi-a-1.html

  * igt@kms_pipe_crc_basic@suspend-read-crc@pipe-b-hdmi-a-2:
    - shard-glk:          NOTRUN -> [INCOMPLETE][91] ([i915#13409] / [i915#13476])
   [91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk6/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-b-hdmi-a-2.html

  * igt@kms_plane_multiple@tiling-4:
    - shard-tglu:         NOTRUN -> [SKIP][92] ([i915#14259])
   [92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@kms_plane_multiple@tiling-4.html

  * igt@kms_plane_multiple@tiling-yf:
    - shard-tglu-1:       NOTRUN -> [SKIP][93] ([i915#14259])
   [93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_plane_multiple@tiling-yf.html

  * igt@kms_plane_scaling@plane-upscale-20x20-with-rotation@pipe-a:
    - shard-tglu-1:       NOTRUN -> [SKIP][94] ([i915#12247]) +4 other tests skip
   [94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_plane_scaling@plane-upscale-20x20-with-rotation@pipe-a.html

  * igt@kms_pm_backlight@fade-with-suspend:
    - shard-mtlp:         [PASS][95] -> [ABORT][96] ([i915#15317]) +5 other tests abort
   [95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-mtlp-2/igt@kms_pm_backlight@fade-with-suspend.html
   [96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-mtlp-4/igt@kms_pm_backlight@fade-with-suspend.html
    - shard-tglu-1:       NOTRUN -> [SKIP][97] ([i915#9812]) +1 other test skip
   [97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_pm_backlight@fade-with-suspend.html

  * igt@kms_pm_rpm@dpms-mode-unset-non-lpsp:
    - shard-dg2:          [PASS][98] -> [SKIP][99] ([i915#15073])
   [98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg2-7/igt@kms_pm_rpm@dpms-mode-unset-non-lpsp.html
   [99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-4/igt@kms_pm_rpm@dpms-mode-unset-non-lpsp.html

  * igt@kms_pm_rpm@modeset-non-lpsp-stress-no-wait:
    - shard-rkl:          [PASS][100] -> [SKIP][101] ([i915#15073]) +1 other test skip
   [100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-3/igt@kms_pm_rpm@modeset-non-lpsp-stress-no-wait.html
   [101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-2/igt@kms_pm_rpm@modeset-non-lpsp-stress-no-wait.html

  * igt@kms_pm_rpm@system-suspend-modeset:
    - shard-tglu:         [PASS][102] -> [ABORT][103] ([i915#10553] / [i915#15317])
   [102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-tglu-4/igt@kms_pm_rpm@system-suspend-modeset.html
   [103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-4/igt@kms_pm_rpm@system-suspend-modeset.html

  * igt@kms_prime@d3hot:
    - shard-tglu-1:       NOTRUN -> [SKIP][104] ([i915#6524])
   [104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_prime@d3hot.html

  * igt@kms_psr2_sf@fbc-pr-overlay-plane-move-continuous-exceed-sf:
    - shard-glk10:        NOTRUN -> [SKIP][105] ([i915#11520])
   [105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk10/igt@kms_psr2_sf@fbc-pr-overlay-plane-move-continuous-exceed-sf.html

  * igt@kms_psr2_sf@pr-overlay-primary-update-sf-dmg-area:
    - shard-glk:          NOTRUN -> [SKIP][106] ([i915#11520]) +7 other tests skip
   [106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk6/igt@kms_psr2_sf@pr-overlay-primary-update-sf-dmg-area.html

  * igt@kms_psr2_sf@psr2-overlay-plane-move-continuous-exceed-fully-sf:
    - shard-tglu:         NOTRUN -> [SKIP][107] ([i915#11520]) +1 other test skip
   [107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@kms_psr2_sf@psr2-overlay-plane-move-continuous-exceed-fully-sf.html

  * igt@kms_psr2_sf@psr2-overlay-plane-move-continuous-exceed-sf:
    - shard-tglu-1:       NOTRUN -> [SKIP][108] ([i915#11520]) +3 other tests skip
   [108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_psr2_sf@psr2-overlay-plane-move-continuous-exceed-sf.html

  * igt@kms_psr@fbc-psr-primary-render:
    - shard-tglu:         NOTRUN -> [SKIP][109] ([i915#9732]) +5 other tests skip
   [109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-7/igt@kms_psr@fbc-psr-primary-render.html

  * igt@kms_psr@psr-cursor-plane-onoff:
    - shard-tglu-1:       NOTRUN -> [SKIP][110] ([i915#9732]) +11 other tests skip
   [110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_psr@psr-cursor-plane-onoff.html

  * igt@kms_sharpness_filter@filter-strength:
    - shard-tglu-1:       NOTRUN -> [SKIP][111] ([i915#15232])
   [111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_sharpness_filter@filter-strength.html

  * igt@kms_universal_plane@cursor-fb-leak:
    - shard-mtlp:         [PASS][112] -> [FAIL][113] ([i915#9196]) +1 other test fail
   [112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-mtlp-6/igt@kms_universal_plane@cursor-fb-leak.html
   [113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-mtlp-7/igt@kms_universal_plane@cursor-fb-leak.html

  * igt@kms_writeback@writeback-pixel-formats:
    - shard-tglu-1:       NOTRUN -> [SKIP][114] ([i915#2437] / [i915#9412])
   [114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@kms_writeback@writeback-pixel-formats.html

  * igt@perf@blocking@0-rcs0:
    - shard-rkl:          [PASS][115] -> [FAIL][116] ([i915#10538]) +1 other test fail
   [115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-7/igt@perf@blocking@0-rcs0.html
   [116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-3/igt@perf@blocking@0-rcs0.html
    - shard-tglu:         [PASS][117] -> [FAIL][118] ([i915#10538]) +1 other test fail
   [117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-tglu-10/igt@perf@blocking@0-rcs0.html
   [118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-8/igt@perf@blocking@0-rcs0.html

  * igt@perf_pmu@module-unload:
    - shard-tglu:         NOTRUN -> [FAIL][119] ([i915#14433])
   [119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-9/igt@perf_pmu@module-unload.html

  * igt@sriov_basic@bind-unbind-vf@vf-1:
    - shard-tglu-1:       NOTRUN -> [FAIL][120] ([i915#12910]) +9 other tests fail
   [120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-1/igt@sriov_basic@bind-unbind-vf@vf-1.html

  
#### Possible fixes ####

  * igt@i915_pm_rc6_residency@rc6-accuracy:
    - shard-dg2:          [FAIL][121] ([i915#12964]) -> [PASS][122] +1 other test pass
   [121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg2-6/igt@i915_pm_rc6_residency@rc6-accuracy.html
   [122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-1/igt@i915_pm_rc6_residency@rc6-accuracy.html

  * igt@i915_suspend@basic-s2idle-without-i915:
    - shard-glk:          [ABORT][123] ([i915#15317]) -> [PASS][124]
   [123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-glk6/igt@i915_suspend@basic-s2idle-without-i915.html
   [124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk1/igt@i915_suspend@basic-s2idle-without-i915.html

  * igt@kms_async_flips@async-flip-suspend-resume@pipe-a-hdmi-a-2:
    - shard-rkl:          [ABORT][125] ([i915#15317]) -> [PASS][126]
   [125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_async_flips@async-flip-suspend-resume@pipe-a-hdmi-a-2.html
   [126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-1/igt@kms_async_flips@async-flip-suspend-resume@pipe-a-hdmi-a-2.html

  * igt@kms_atomic_transition@plane-all-modeset-transition:
    - shard-dg2:          [FAIL][127] ([i915#5956]) -> [PASS][128]
   [127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg2-4/igt@kms_atomic_transition@plane-all-modeset-transition.html
   [128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-5/igt@kms_atomic_transition@plane-all-modeset-transition.html

  * igt@kms_atomic_transition@plane-all-modeset-transition-fencing:
    - shard-tglu:         [FAIL][129] ([i915#14857]) -> [PASS][130] +1 other test pass
   [129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-tglu-4/igt@kms_atomic_transition@plane-all-modeset-transition-fencing.html
   [130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-4/igt@kms_atomic_transition@plane-all-modeset-transition-fencing.html

  * igt@kms_hdr@bpc-switch:
    - shard-rkl:          [SKIP][131] ([i915#3555] / [i915#8228]) -> [PASS][132]
   [131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-3/igt@kms_hdr@bpc-switch.html
   [132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-1/igt@kms_hdr@bpc-switch.html

  * igt@kms_joiner@invalid-modeset-force-big-joiner:
    - shard-dg2:          [SKIP][133] ([i915#10656] / [i915#12388]) -> [PASS][134]
   [133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg2-5/igt@kms_joiner@invalid-modeset-force-big-joiner.html
   [134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-11/igt@kms_joiner@invalid-modeset-force-big-joiner.html

  * igt@kms_plane@plane-panning-bottom-right-suspend:
    - shard-tglu:         [ABORT][135] ([i915#15317]) -> [PASS][136] +1 other test pass
   [135]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-tglu-2/igt@kms_plane@plane-panning-bottom-right-suspend.html
   [136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-9/igt@kms_plane@plane-panning-bottom-right-suspend.html

  * igt@kms_plane_scaling@intel-max-src-size:
    - shard-dg2:          [SKIP][137] ([i915#6953] / [i915#9423]) -> [PASS][138]
   [137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg2-5/igt@kms_plane_scaling@intel-max-src-size.html
   [138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-11/igt@kms_plane_scaling@intel-max-src-size.html
    - shard-rkl:          [SKIP][139] ([i915#6953]) -> [PASS][140]
   [139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_plane_scaling@intel-max-src-size.html
   [140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_plane_scaling@intel-max-src-size.html

  * igt@kms_pm_rpm@modeset-non-lpsp-stress-no-wait:
    - shard-dg2:          [SKIP][141] ([i915#15073]) -> [PASS][142]
   [141]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg2-4/igt@kms_pm_rpm@modeset-non-lpsp-stress-no-wait.html
   [142]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-5/igt@kms_pm_rpm@modeset-non-lpsp-stress-no-wait.html

  * igt@kms_pm_rpm@system-suspend-modeset:
    - shard-mtlp:         [ABORT][143] ([i915#10553] / [i915#15317]) -> [PASS][144]
   [143]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-mtlp-3/igt@kms_pm_rpm@system-suspend-modeset.html
   [144]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-mtlp-7/igt@kms_pm_rpm@system-suspend-modeset.html

  * igt@perf@blocking:
    - shard-mtlp:         [FAIL][145] ([i915#10538]) -> [PASS][146] +1 other test pass
   [145]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-mtlp-5/igt@perf@blocking.html
   [146]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-mtlp-5/igt@perf@blocking.html

  * igt@perf_pmu@busy-double-start:
    - shard-dg2:          [FAIL][147] ([i915#4349]) -> [PASS][148] +1 other test pass
   [147]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg2-11/igt@perf_pmu@busy-double-start.html
   [148]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-11/igt@perf_pmu@busy-double-start.html

  
#### Warnings ####

  * igt@device_reset@unbind-cold-reset-rebind:
    - shard-rkl:          [SKIP][149] ([i915#11078]) -> [SKIP][150] ([i915#11078] / [i915#14544])
   [149]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@device_reset@unbind-cold-reset-rebind.html
   [150]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@device_reset@unbind-cold-reset-rebind.html

  * igt@gem_bad_reloc@negative-reloc-lut:
    - shard-rkl:          [SKIP][151] ([i915#3281]) -> [SKIP][152] ([i915#14544] / [i915#3281]) +2 other tests skip
   [151]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@gem_bad_reloc@negative-reloc-lut.html
   [152]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@gem_bad_reloc@negative-reloc-lut.html

  * igt@gem_ccs@ctrl-surf-copy-new-ctx:
    - shard-rkl:          [SKIP][153] ([i915#14544] / [i915#9323]) -> [SKIP][154] ([i915#9323])
   [153]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@gem_ccs@ctrl-surf-copy-new-ctx.html
   [154]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@gem_ccs@ctrl-surf-copy-new-ctx.html

  * igt@gem_ccs@large-ctrl-surf-copy:
    - shard-rkl:          [SKIP][155] ([i915#13008]) -> [SKIP][156] ([i915#13008] / [i915#14544])
   [155]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@gem_ccs@large-ctrl-surf-copy.html
   [156]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@gem_ccs@large-ctrl-surf-copy.html

  * igt@gem_eio@in-flight-suspend:
    - shard-dg1:          [ABORT][157] ([i915#15317]) -> [ABORT][158] ([i915#15317] / [i915#4391] / [i915#4423])
   [157]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg1-17/igt@gem_eio@in-flight-suspend.html
   [158]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg1-15/igt@gem_eio@in-flight-suspend.html

  * igt@gem_exec_balancer@parallel-bb-first:
    - shard-rkl:          [SKIP][159] ([i915#14544] / [i915#4525]) -> [SKIP][160] ([i915#4525])
   [159]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@gem_exec_balancer@parallel-bb-first.html
   [160]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@gem_exec_balancer@parallel-bb-first.html

  * igt@gem_exec_reloc@basic-gtt-read-active:
    - shard-rkl:          [SKIP][161] ([i915#14544] / [i915#3281]) -> [SKIP][162] ([i915#3281]) +1 other test skip
   [161]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@gem_exec_reloc@basic-gtt-read-active.html
   [162]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@gem_exec_reloc@basic-gtt-read-active.html

  * igt@gem_exec_suspend@basic-s3:
    - shard-rkl:          [ABORT][163] ([i915#15317]) -> [INCOMPLETE][164] ([i915#13356]) +1 other test incomplete
   [163]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-7/igt@gem_exec_suspend@basic-s3.html
   [164]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-3/igt@gem_exec_suspend@basic-s3.html

  * igt@gem_lmem_swapping@basic:
    - shard-rkl:          [SKIP][165] ([i915#4613]) -> [SKIP][166] ([i915#14544] / [i915#4613])
   [165]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@gem_lmem_swapping@basic.html
   [166]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@gem_lmem_swapping@basic.html

  * igt@gem_lmem_swapping@random:
    - shard-rkl:          [SKIP][167] ([i915#14544] / [i915#4613]) -> [SKIP][168] ([i915#4613])
   [167]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@gem_lmem_swapping@random.html
   [168]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@gem_lmem_swapping@random.html

  * igt@gem_partial_pwrite_pread@write-uncached:
    - shard-rkl:          [SKIP][169] ([i915#3282]) -> [SKIP][170] ([i915#14544] / [i915#3282]) +3 other tests skip
   [169]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@gem_partial_pwrite_pread@write-uncached.html
   [170]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@gem_partial_pwrite_pread@write-uncached.html

  * igt@gem_readwrite@write-bad-handle:
    - shard-rkl:          [SKIP][171] ([i915#14544] / [i915#3282]) -> [SKIP][172] ([i915#3282])
   [171]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@gem_readwrite@write-bad-handle.html
   [172]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@gem_readwrite@write-bad-handle.html

  * igt@gem_userptr_blits@unsync-unmap:
    - shard-rkl:          [SKIP][173] ([i915#14544] / [i915#3297]) -> [SKIP][174] ([i915#3297])
   [173]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@gem_userptr_blits@unsync-unmap.html
   [174]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@gem_userptr_blits@unsync-unmap.html

  * igt@gen9_exec_parse@batch-invalid-length:
    - shard-rkl:          [SKIP][175] ([i915#2527]) -> [SKIP][176] ([i915#14544] / [i915#2527])
   [175]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@gen9_exec_parse@batch-invalid-length.html
   [176]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@gen9_exec_parse@batch-invalid-length.html

  * igt@gen9_exec_parse@secure-batches:
    - shard-rkl:          [SKIP][177] ([i915#14544] / [i915#2527]) -> [SKIP][178] ([i915#2527])
   [177]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@gen9_exec_parse@secure-batches.html
   [178]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@gen9_exec_parse@secure-batches.html

  * igt@i915_pm_rc6_residency@media-rc6-accuracy:
    - shard-rkl:          [SKIP][179] -> [SKIP][180] ([i915#14544]) +5 other tests skip
   [179]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@i915_pm_rc6_residency@media-rc6-accuracy.html
   [180]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@i915_pm_rc6_residency@media-rc6-accuracy.html

  * igt@intel_hwmon@hwmon-read:
    - shard-rkl:          [SKIP][181] ([i915#7707]) -> [SKIP][182] ([i915#14544] / [i915#7707])
   [181]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@intel_hwmon@hwmon-read.html
   [182]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@intel_hwmon@hwmon-read.html

  * igt@kms_async_flips@async-flip-suspend-resume:
    - shard-mtlp:         [FAIL][183] ([i915#15313]) -> [ABORT][184] ([i915#15317])
   [183]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-mtlp-5/igt@kms_async_flips@async-flip-suspend-resume.html
   [184]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-mtlp-6/igt@kms_async_flips@async-flip-suspend-resume.html

  * igt@kms_big_fb@4-tiled-16bpp-rotate-180:
    - shard-rkl:          [SKIP][185] ([i915#14544] / [i915#5286]) -> [SKIP][186] ([i915#5286]) +2 other tests skip
   [185]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_big_fb@4-tiled-16bpp-rotate-180.html
   [186]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_big_fb@4-tiled-16bpp-rotate-180.html

  * igt@kms_big_fb@4-tiled-64bpp-rotate-0:
    - shard-rkl:          [SKIP][187] ([i915#5286]) -> [SKIP][188] ([i915#14544] / [i915#5286]) +1 other test skip
   [187]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_big_fb@4-tiled-64bpp-rotate-0.html
   [188]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_big_fb@4-tiled-64bpp-rotate-0.html

  * igt@kms_big_fb@linear-32bpp-rotate-90:
    - shard-rkl:          [SKIP][189] ([i915#14544] / [i915#3638]) -> [SKIP][190] ([i915#3638]) +1 other test skip
   [189]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_big_fb@linear-32bpp-rotate-90.html
   [190]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_big_fb@linear-32bpp-rotate-90.html

  * igt@kms_big_fb@x-tiled-8bpp-rotate-270:
    - shard-rkl:          [SKIP][191] ([i915#3638]) -> [SKIP][192] ([i915#14544] / [i915#3638])
   [191]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@kms_big_fb@x-tiled-8bpp-rotate-270.html
   [192]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_big_fb@x-tiled-8bpp-rotate-270.html

  * igt@kms_ccs@bad-pixel-format-4-tiled-dg2-rc-ccs@pipe-b-hdmi-a-2:
    - shard-rkl:          [SKIP][193] ([i915#6095]) -> [SKIP][194] ([i915#14544] / [i915#6095]) +3 other tests skip
   [193]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@kms_ccs@bad-pixel-format-4-tiled-dg2-rc-ccs@pipe-b-hdmi-a-2.html
   [194]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_ccs@bad-pixel-format-4-tiled-dg2-rc-ccs@pipe-b-hdmi-a-2.html

  * igt@kms_ccs@bad-pixel-format-y-tiled-ccs:
    - shard-rkl:          [SKIP][195] ([i915#14098] / [i915#14544] / [i915#6095]) -> [SKIP][196] ([i915#14098] / [i915#6095]) +7 other tests skip
   [195]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_ccs@bad-pixel-format-y-tiled-ccs.html
   [196]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_ccs@bad-pixel-format-y-tiled-ccs.html

  * igt@kms_ccs@ccs-on-another-bo-y-tiled-gen12-mc-ccs:
    - shard-rkl:          [SKIP][197] ([i915#14098] / [i915#6095]) -> [SKIP][198] ([i915#14098] / [i915#14544] / [i915#6095]) +3 other tests skip
   [197]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_ccs@ccs-on-another-bo-y-tiled-gen12-mc-ccs.html
   [198]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_ccs@ccs-on-another-bo-y-tiled-gen12-mc-ccs.html

  * igt@kms_ccs@crc-primary-rotation-180-4-tiled-lnl-ccs:
    - shard-rkl:          [SKIP][199] ([i915#12313] / [i915#14544]) -> [SKIP][200] ([i915#12313])
   [199]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_ccs@crc-primary-rotation-180-4-tiled-lnl-ccs.html
   [200]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_ccs@crc-primary-rotation-180-4-tiled-lnl-ccs.html

  * igt@kms_ccs@crc-sprite-planes-basic-4-tiled-mtl-rc-ccs@pipe-a-hdmi-a-2:
    - shard-rkl:          [SKIP][201] ([i915#14544] / [i915#6095]) -> [SKIP][202] ([i915#6095]) +7 other tests skip
   [201]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_ccs@crc-sprite-planes-basic-4-tiled-mtl-rc-ccs@pipe-a-hdmi-a-2.html
   [202]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_ccs@crc-sprite-planes-basic-4-tiled-mtl-rc-ccs@pipe-a-hdmi-a-2.html

  * igt@kms_ccs@random-ccs-data-4-tiled-lnl-ccs:
    - shard-rkl:          [SKIP][203] ([i915#12313]) -> [SKIP][204] ([i915#12313] / [i915#14544])
   [203]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_ccs@random-ccs-data-4-tiled-lnl-ccs.html
   [204]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_ccs@random-ccs-data-4-tiled-lnl-ccs.html

  * igt@kms_chamelium_edid@dp-mode-timings:
    - shard-rkl:          [SKIP][205] ([i915#11151] / [i915#14544] / [i915#7828]) -> [SKIP][206] ([i915#11151] / [i915#7828]) +1 other test skip
   [205]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_chamelium_edid@dp-mode-timings.html
   [206]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_chamelium_edid@dp-mode-timings.html

  * igt@kms_chamelium_hpd@dp-hpd-with-enabled-mode:
    - shard-rkl:          [SKIP][207] ([i915#11151] / [i915#7828]) -> [SKIP][208] ([i915#11151] / [i915#14544] / [i915#7828]) +2 other tests skip
   [207]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@kms_chamelium_hpd@dp-hpd-with-enabled-mode.html
   [208]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_chamelium_hpd@dp-hpd-with-enabled-mode.html

  * igt@kms_cursor_crc@cursor-rapid-movement-32x10:
    - shard-rkl:          [SKIP][209] ([i915#14544] / [i915#3555]) -> [SKIP][210] ([i915#3555]) +1 other test skip
   [209]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_cursor_crc@cursor-rapid-movement-32x10.html
   [210]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_cursor_crc@cursor-rapid-movement-32x10.html

  * igt@kms_cursor_legacy@2x-cursor-vs-flip-legacy:
    - shard-rkl:          [SKIP][211] ([i915#14544]) -> [SKIP][212] +3 other tests skip
   [211]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_cursor_legacy@2x-cursor-vs-flip-legacy.html
   [212]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_cursor_legacy@2x-cursor-vs-flip-legacy.html

  * igt@kms_cursor_legacy@short-busy-flip-before-cursor-atomic-transitions:
    - shard-rkl:          [SKIP][213] ([i915#4103]) -> [SKIP][214] ([i915#14544] / [i915#4103])
   [213]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@kms_cursor_legacy@short-busy-flip-before-cursor-atomic-transitions.html
   [214]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_cursor_legacy@short-busy-flip-before-cursor-atomic-transitions.html

  * igt@kms_dp_aux_dev:
    - shard-rkl:          [SKIP][215] ([i915#1257] / [i915#14544]) -> [SKIP][216] ([i915#1257])
   [215]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_dp_aux_dev.html
   [216]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_dp_aux_dev.html

  * igt@kms_feature_discovery@chamelium:
    - shard-rkl:          [SKIP][217] ([i915#4854]) -> [SKIP][218] ([i915#14544] / [i915#4854])
   [217]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_feature_discovery@chamelium.html
   [218]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_feature_discovery@chamelium.html

  * igt@kms_feature_discovery@display-4x:
    - shard-rkl:          [SKIP][219] ([i915#14544] / [i915#1839]) -> [SKIP][220] ([i915#1839])
   [219]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_feature_discovery@display-4x.html
   [220]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_feature_discovery@display-4x.html

  * igt@kms_flip@2x-flip-vs-expired-vblank:
    - shard-rkl:          [SKIP][221] ([i915#9934]) -> [SKIP][222] ([i915#14544] / [i915#9934]) +1 other test skip
   [221]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_flip@2x-flip-vs-expired-vblank.html
   [222]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_flip@2x-flip-vs-expired-vblank.html

  * igt@kms_flip@2x-flip-vs-panning-interruptible:
    - shard-rkl:          [SKIP][223] ([i915#14544] / [i915#9934]) -> [SKIP][224] ([i915#9934]) +1 other test skip
   [223]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_flip@2x-flip-vs-panning-interruptible.html
   [224]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_flip@2x-flip-vs-panning-interruptible.html

  * igt@kms_flip@2x-flip-vs-suspend:
    - shard-glk:          [INCOMPLETE][225] ([i915#12745] / [i915#4839]) -> [INCOMPLETE][226] ([i915#12745] / [i915#4839] / [i915#6113])
   [225]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-glk6/igt@kms_flip@2x-flip-vs-suspend.html
   [226]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk1/igt@kms_flip@2x-flip-vs-suspend.html

  * igt@kms_flip@2x-flip-vs-suspend@ab-hdmi-a1-hdmi-a2:
    - shard-glk:          [INCOMPLETE][227] ([i915#4839]) -> [INCOMPLETE][228] ([i915#4839] / [i915#6113])
   [227]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-glk6/igt@kms_flip@2x-flip-vs-suspend@ab-hdmi-a1-hdmi-a2.html
   [228]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk1/igt@kms_flip@2x-flip-vs-suspend@ab-hdmi-a1-hdmi-a2.html

  * igt@kms_flip@flip-vs-suspend:
    - shard-dg1:          [ABORT][229] ([i915#15317]) -> [ABORT][230] ([i915#15317] / [i915#4423])
   [229]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg1-13/igt@kms_flip@flip-vs-suspend.html
   [230]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg1-14/igt@kms_flip@flip-vs-suspend.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-offscreen-pri-indfb-draw-render:
    - shard-rkl:          [SKIP][231] ([i915#14544] / [i915#15102]) -> [SKIP][232] ([i915#15102])
   [231]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscreen-pri-indfb-draw-render.html
   [232]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscreen-pri-indfb-draw-render.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-offscreen-pri-shrfb-draw-blt:
    - shard-rkl:          [SKIP][233] ([i915#15102]) -> [SKIP][234] ([i915#14544] / [i915#15102]) +1 other test skip
   [233]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscreen-pri-shrfb-draw-blt.html
   [234]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscreen-pri-shrfb-draw-blt.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw:
    - shard-rkl:          [SKIP][235] ([i915#15102] / [i915#3023]) -> [SKIP][236] ([i915#14544] / [i915#15102] / [i915#3023]) +6 other tests skip
   [235]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw.html
   [236]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw.html

  * igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-indfb-plflip-blt:
    - shard-rkl:          [SKIP][237] ([i915#1825]) -> [SKIP][238] ([i915#14544] / [i915#1825]) +12 other tests skip
   [237]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-indfb-plflip-blt.html
   [238]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-indfb-plflip-blt.html

  * igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-shrfb-pgflip-blt:
    - shard-rkl:          [SKIP][239] ([i915#14544] / [i915#1825]) -> [SKIP][240] ([i915#1825]) +10 other tests skip
   [239]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-shrfb-pgflip-blt.html
   [240]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-shrfb-pgflip-blt.html

  * igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu:
    - shard-dg2:          [SKIP][241] ([i915#10433] / [i915#15102] / [i915#3458]) -> [SKIP][242] ([i915#15102] / [i915#3458]) +1 other test skip
   [241]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg2-4/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu.html
   [242]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu.html

  * igt@kms_frontbuffer_tracking@psr-1p-primscrn-shrfb-msflip-blt:
    - shard-rkl:          [SKIP][243] ([i915#14544] / [i915#15102] / [i915#3023]) -> [SKIP][244] ([i915#15102] / [i915#3023]) +2 other tests skip
   [243]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_frontbuffer_tracking@psr-1p-primscrn-shrfb-msflip-blt.html
   [244]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_frontbuffer_tracking@psr-1p-primscrn-shrfb-msflip-blt.html

  * igt@kms_frontbuffer_tracking@psr-rgb565-draw-mmap-cpu:
    - shard-dg2:          [SKIP][245] ([i915#15102] / [i915#3458]) -> [SKIP][246] ([i915#10433] / [i915#15102] / [i915#3458])
   [245]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg2-7/igt@kms_frontbuffer_tracking@psr-rgb565-draw-mmap-cpu.html
   [246]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg2-4/igt@kms_frontbuffer_tracking@psr-rgb565-draw-mmap-cpu.html

  * igt@kms_joiner@invalid-modeset-force-big-joiner:
    - shard-rkl:          [SKIP][247] ([i915#10656] / [i915#12388]) -> [SKIP][248] ([i915#10656] / [i915#12388] / [i915#14544])
   [247]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_joiner@invalid-modeset-force-big-joiner.html
   [248]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_joiner@invalid-modeset-force-big-joiner.html

  * igt@kms_plane@plane-panning-bottom-right-suspend:
    - shard-glk:          [ABORT][249] ([i915#15317]) -> [INCOMPLETE][250] ([i915#13026]) +1 other test incomplete
   [249]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-glk5/igt@kms_plane@plane-panning-bottom-right-suspend.html
   [250]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-glk5/igt@kms_plane@plane-panning-bottom-right-suspend.html

  * igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a:
    - shard-rkl:          [INCOMPLETE][251] ([i915#14412]) -> [ABORT][252] ([i915#15317]) +1 other test abort
   [251]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-3/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a.html
   [252]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-2/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a.html

  * igt@kms_plane_multiple@2x-tiling-yf:
    - shard-rkl:          [SKIP][253] ([i915#13958]) -> [SKIP][254] ([i915#13958] / [i915#14544])
   [253]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@kms_plane_multiple@2x-tiling-yf.html
   [254]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_plane_multiple@2x-tiling-yf.html

  * igt@kms_plane_multiple@tiling-yf:
    - shard-rkl:          [SKIP][255] ([i915#14259] / [i915#14544]) -> [SKIP][256] ([i915#14259])
   [255]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_plane_multiple@tiling-yf.html
   [256]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_plane_multiple@tiling-yf.html

  * igt@kms_pm_backlight@fade:
    - shard-rkl:          [SKIP][257] ([i915#14544] / [i915#5354]) -> [SKIP][258] ([i915#5354])
   [257]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_pm_backlight@fade.html
   [258]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_pm_backlight@fade.html

  * igt@kms_pm_dc@dc9-dpms:
    - shard-rkl:          [SKIP][259] ([i915#4281]) -> [SKIP][260] ([i915#14544] / [i915#4281])
   [259]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_pm_dc@dc9-dpms.html
   [260]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_pm_dc@dc9-dpms.html
    - shard-tglu:         [SKIP][261] ([i915#15128]) -> [SKIP][262] ([i915#4281])
   [261]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-tglu-6/igt@kms_pm_dc@dc9-dpms.html
   [262]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-tglu-5/igt@kms_pm_dc@dc9-dpms.html

  * igt@kms_pm_rpm@modeset-lpsp-stress:
    - shard-rkl:          [SKIP][263] ([i915#14544] / [i915#15073]) -> [SKIP][264] ([i915#15073])
   [263]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_pm_rpm@modeset-lpsp-stress.html
   [264]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_pm_rpm@modeset-lpsp-stress.html

  * igt@kms_pm_rpm@system-suspend-modeset:
    - shard-dg1:          [ABORT][265] ([i915#10553] / [i915#15317] / [i915#4423]) -> [ABORT][266] ([i915#10553] / [i915#15317])
   [265]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-dg1-15/igt@kms_pm_rpm@system-suspend-modeset.html
   [266]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-dg1-18/igt@kms_pm_rpm@system-suspend-modeset.html

  * igt@kms_prime@basic-modeset-hybrid:
    - shard-rkl:          [SKIP][267] ([i915#6524]) -> [SKIP][268] ([i915#14544] / [i915#6524])
   [267]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_prime@basic-modeset-hybrid.html
   [268]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_prime@basic-modeset-hybrid.html

  * igt@kms_psr2_sf@pr-overlay-plane-update-sf-dmg-area:
    - shard-rkl:          [SKIP][269] ([i915#11520]) -> [SKIP][270] ([i915#11520] / [i915#14544]) +3 other tests skip
   [269]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_psr2_sf@pr-overlay-plane-update-sf-dmg-area.html
   [270]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_psr2_sf@pr-overlay-plane-update-sf-dmg-area.html

  * igt@kms_psr2_sf@psr2-overlay-plane-update-sf-dmg-area:
    - shard-rkl:          [SKIP][271] ([i915#11520] / [i915#14544]) -> [SKIP][272] ([i915#11520]) +2 other tests skip
   [271]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_psr2_sf@psr2-overlay-plane-update-sf-dmg-area.html
   [272]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-3/igt@kms_psr2_sf@psr2-overlay-plane-update-sf-dmg-area.html

  * igt@kms_psr@fbc-pr-cursor-mmap-cpu:
    - shard-rkl:          [SKIP][273] ([i915#1072] / [i915#9732]) -> [SKIP][274] ([i915#1072] / [i915#14544] / [i915#9732]) +6 other tests skip
   [273]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@kms_psr@fbc-pr-cursor-mmap-cpu.html
   [274]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_psr@fbc-pr-cursor-mmap-cpu.html

  * igt@kms_psr@psr2-cursor-plane-move:
    - shard-rkl:          [SKIP][275] ([i915#1072] / [i915#14544] / [i915#9732]) -> [SKIP][276] ([i915#1072] / [i915#9732]) +6 other tests skip
   [275]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@kms_psr@psr2-cursor-plane-move.html
   [276]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@kms_psr@psr2-cursor-plane-move.html

  * igt@kms_psr_stress_test@invalidate-primary-flip-overlay:
    - shard-rkl:          [SKIP][277] ([i915#9685]) -> [SKIP][278] ([i915#14544] / [i915#9685])
   [277]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html
   [278]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html

  * igt@kms_setmode@basic-clone-single-crtc:
    - shard-rkl:          [SKIP][279] ([i915#3555]) -> [SKIP][280] ([i915#14544] / [i915#3555]) +3 other tests skip
   [279]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_setmode@basic-clone-single-crtc.html
   [280]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_setmode@basic-clone-single-crtc.html

  * igt@kms_sharpness_filter@filter-rotations:
    - shard-rkl:          [SKIP][281] ([i915#15232]) -> [SKIP][282] ([i915#14544] / [i915#15232])
   [281]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@kms_sharpness_filter@filter-rotations.html
   [282]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_sharpness_filter@filter-rotations.html

  * igt@kms_vrr@max-min:
    - shard-rkl:          [SKIP][283] ([i915#9906]) -> [SKIP][284] ([i915#14544] / [i915#9906])
   [283]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-4/igt@kms_vrr@max-min.html
   [284]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_vrr@max-min.html

  * igt@kms_writeback@writeback-fb-id-xrgb2101010:
    - shard-rkl:          [SKIP][285] ([i915#2437] / [i915#9412]) -> [SKIP][286] ([i915#14544] / [i915#2437] / [i915#9412])
   [285]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@kms_writeback@writeback-fb-id-xrgb2101010.html
   [286]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@kms_writeback@writeback-fb-id-xrgb2101010.html

  * igt@perf@unprivileged-single-ctx-counters:
    - shard-rkl:          [SKIP][287] ([i915#2433]) -> [SKIP][288] ([i915#14544] / [i915#2433])
   [287]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@perf@unprivileged-single-ctx-counters.html
   [288]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@perf@unprivileged-single-ctx-counters.html

  * igt@prime_vgem@fence-read-hang:
    - shard-rkl:          [SKIP][289] ([i915#3708]) -> [SKIP][290] ([i915#14544] / [i915#3708])
   [289]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-1/igt@prime_vgem@fence-read-hang.html
   [290]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-6/igt@prime_vgem@fence-read-hang.html

  * igt@sriov_basic@bind-unbind-vf:
    - shard-rkl:          [SKIP][291] ([i915#14544] / [i915#9917]) -> [SKIP][292] ([i915#9917])
   [291]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17583/shard-rkl-6/igt@sriov_basic@bind-unbind-vf.html
   [292]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/shard-rkl-4/igt@sriov_basic@bind-unbind-vf.html

  
  [i915#10307]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10307
  [i915#10433]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10433
  [i915#10434]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10434
  [i915#10538]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10538
  [i915#10553]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10553
  [i915#10656]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10656
  [i915#1072]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1072
  [i915#11078]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11078
  [i915#11151]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11151
  [i915#11520]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11520
  [i915#12247]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12247
  [i915#12313]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12313
  [i915#12388]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12388
  [i915#1257]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1257
  [i915#12745]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12745
  [i915#12761]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12761
  [i915#12910]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12910
  [i915#12964]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12964
  [i915#13008]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13008
  [i915#13026]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13026
  [i915#13049]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13049
  [i915#13356]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13356
  [i915#13409]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13409
  [i915#13476]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13476
  [i915#13522]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13522
  [i915#13566]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13566
  [i915#13958]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13958
  [i915#14098]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14098
  [i915#14259]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14259
  [i915#14412]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14412
  [i915#14433]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14433
  [i915#14544]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14544
  [i915#14857]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14857
  [i915#15073]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15073
  [i915#15102]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15102
  [i915#15128]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15128
  [i915#15232]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15232
  [i915#15313]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15313
  [i915#15317]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15317
  [i915#1769]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1769
  [i915#1825]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1825
  [i915#1839]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1839
  [i915#2433]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2433
  [i915#2437]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2437
  [i915#2527]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2527
  [i915#2587]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2587
  [i915#2672]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2672
  [i915#280]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/280
  [i915#2856]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2856
  [i915#3023]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3023
  [i915#3116]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3116
  [i915#3281]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3281
  [i915#3282]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3282
  [i915#3297]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3297
  [i915#3299]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3299
  [i915#3458]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3458
  [i915#3555]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3555
  [i915#3637]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3637
  [i915#3638]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3638
  [i915#3708]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3708
  [i915#3804]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3804
  [i915#4103]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4103
  [i915#4281]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4281
  [i915#4349]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4349
  [i915#4391]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4391
  [i915#4423]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4423
  [i915#4525]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4525
  [i915#4613]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4613
  [i915#4817]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4817
  [i915#4839]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4839
  [i915#4854]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4854
  [i915#5138]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5138
  [i915#5286]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5286
  [i915#5354]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5354
  [i915#5493]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5493
  [i915#5956]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5956
  [i915#6095]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6095
  [i915#6113]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6113
  [i915#6335]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6335
  [i915#6344]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6344
  [i915#6412]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6412
  [i915#6524]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6524
  [i915#6944]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6944
  [i915#6953]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6953
  [i915#7116]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7116
  [i915#7118]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7118
  [i915#7707]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7707
  [i915#7828]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7828
  [i915#7975]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7975
  [i915#8228]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8228
  [i915#8428]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8428
  [i915#8813]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8813
  [i915#9196]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9196
  [i915#9323]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9323
  [i915#9412]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9412
  [i915#9423]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9423
  [i915#9424]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9424
  [i915#9685]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9685
  [i915#9732]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9732
  [i915#9809]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9809
  [i915#9812]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9812
  [i915#9878]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9878
  [i915#9906]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9906
  [i915#9917]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9917
  [i915#9934]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9934


Build changes
-------------

  * Linux: CI_DRM_17583 -> Patchwork_157906v2

  CI-20190529: 20190529
  CI_DRM_17583: 0a21e96e0b6840d2a4e0b45a957679eeddeb4362 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8637: 730ee3dfb26f8d7891fc240b0132a08c5bc7b949 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_157906v2: 0a21e96e0b6840d2a4e0b45a957679eeddeb4362 @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_157906v2/index.html

[-- Attachment #2: Type: text/html, Size: 99693 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v2 1/5] drm/i915/pps: drop wakeref parameter from with_intel_pps_lock()
  2025-11-25 13:24 ` [PATCH v2 1/5] drm/i915/pps: drop wakeref parameter from with_intel_pps_lock() Jani Nikula
@ 2025-12-01  8:06   ` Luca Coelho
  0 siblings, 0 replies; 16+ messages in thread
From: Luca Coelho @ 2025-12-01  8:06 UTC (permalink / raw)
  To: Jani Nikula, intel-gfx, intel-xe

On Tue, 2025-11-25 at 15:24 +0200, Jani Nikula wrote:
> Add another level of macro abstraction, and declare the wakeref within
> the for loop using __UNIQUE_ID. This allows us to drop a bunch of
> boilerplate declarations and parameter passing.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/g4x_dp.c    |  3 +-
>  drivers/gpu/drm/i915/display/intel_pps.c | 56 +++++++-----------------
>  drivers/gpu/drm/i915/display/intel_pps.h |  7 ++-
>  3 files changed, 22 insertions(+), 44 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
> index a3ff21b2f69f..27f4c55d7484 100644
> --- a/drivers/gpu/drm/i915/display/g4x_dp.c
> +++ b/drivers/gpu/drm/i915/display/g4x_dp.c
> @@ -684,12 +684,11 @@ static void intel_enable_dp(struct intel_atomic_state *state,
>  	struct intel_display *display = to_intel_display(state);
>  	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
>  	u32 dp_reg = intel_de_read(display, intel_dp->output_reg);
> -	intel_wakeref_t wakeref;
>  
>  	if (drm_WARN_ON(display->drm, dp_reg & DP_PORT_EN))
>  		return;
>  
> -	with_intel_pps_lock(intel_dp, wakeref) {
> +	with_intel_pps_lock(intel_dp) {
>  		if (display->platform.valleyview || display->platform.cherryview)
>  			vlv_pps_port_enable_unlocked(encoder, pipe_config);
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
> index 25692a547764..34376255b85c 100644
> --- a/drivers/gpu/drm/i915/display/intel_pps.c
> +++ b/drivers/gpu/drm/i915/display/intel_pps.c
> @@ -697,12 +697,10 @@ static void wait_panel_power_cycle(struct intel_dp *intel_dp)
>  
>  void intel_pps_wait_power_cycle(struct intel_dp *intel_dp)
>  {
> -	intel_wakeref_t wakeref;
> -
>  	if (!intel_dp_is_edp(intel_dp))
>  		return;
>  
> -	with_intel_pps_lock(intel_dp, wakeref)
> +	with_intel_pps_lock(intel_dp)
>  		wait_panel_power_cycle(intel_dp);
>  }
>  
> @@ -811,14 +809,13 @@ bool intel_pps_vdd_on_unlocked(struct intel_dp *intel_dp)
>  void intel_pps_vdd_on(struct intel_dp *intel_dp)
>  {
>  	struct intel_display *display = to_intel_display(intel_dp);
> -	intel_wakeref_t wakeref;
>  	bool vdd;
>  
>  	if (!intel_dp_is_edp(intel_dp))
>  		return;
>  
>  	vdd = false;
> -	with_intel_pps_lock(intel_dp, wakeref)
> +	with_intel_pps_lock(intel_dp)
>  		vdd = intel_pps_vdd_on_unlocked(intel_dp);
>  	INTEL_DISPLAY_STATE_WARN(display, !vdd, "[ENCODER:%d:%s] %s VDD already requested on\n",
>  				 dp_to_dig_port(intel_dp)->base.base.base.id,
> @@ -873,8 +870,6 @@ static void intel_pps_vdd_off_sync_unlocked(struct intel_dp *intel_dp)
>  
>  void intel_pps_vdd_off_sync(struct intel_dp *intel_dp)
>  {
> -	intel_wakeref_t wakeref;
> -
>  	if (!intel_dp_is_edp(intel_dp))
>  		return;
>  
> @@ -883,7 +878,7 @@ void intel_pps_vdd_off_sync(struct intel_dp *intel_dp)
>  	 * vdd might still be enabled due to the delayed vdd off.
>  	 * Make sure vdd is actually turned off here.
>  	 */
> -	with_intel_pps_lock(intel_dp, wakeref)
> +	with_intel_pps_lock(intel_dp)
>  		intel_pps_vdd_off_sync_unlocked(intel_dp);
>  }
>  
> @@ -892,9 +887,8 @@ static void edp_panel_vdd_work(struct work_struct *__work)
>  	struct intel_pps *pps = container_of(to_delayed_work(__work),
>  					     struct intel_pps, panel_vdd_work);
>  	struct intel_dp *intel_dp = container_of(pps, struct intel_dp, pps);
> -	intel_wakeref_t wakeref;
>  
> -	with_intel_pps_lock(intel_dp, wakeref) {
> +	with_intel_pps_lock(intel_dp) {
>  		if (!intel_dp->pps.want_panel_vdd)
>  			intel_pps_vdd_off_sync_unlocked(intel_dp);
>  	}
> @@ -952,12 +946,10 @@ void intel_pps_vdd_off_unlocked(struct intel_dp *intel_dp, bool sync)
>  
>  void intel_pps_vdd_off(struct intel_dp *intel_dp)
>  {
> -	intel_wakeref_t wakeref;
> -
>  	if (!intel_dp_is_edp(intel_dp))
>  		return;
>  
> -	with_intel_pps_lock(intel_dp, wakeref)
> +	with_intel_pps_lock(intel_dp)
>  		intel_pps_vdd_off_unlocked(intel_dp, false);
>  }
>  
> @@ -1026,12 +1018,10 @@ void intel_pps_on_unlocked(struct intel_dp *intel_dp)
>  
>  void intel_pps_on(struct intel_dp *intel_dp)
>  {
> -	intel_wakeref_t wakeref;
> -
>  	if (!intel_dp_is_edp(intel_dp))
>  		return;
>  
> -	with_intel_pps_lock(intel_dp, wakeref)
> +	with_intel_pps_lock(intel_dp)
>  		intel_pps_on_unlocked(intel_dp);
>  }
>  
> @@ -1082,12 +1072,10 @@ void intel_pps_off_unlocked(struct intel_dp *intel_dp)
>  
>  void intel_pps_off(struct intel_dp *intel_dp)
>  {
> -	intel_wakeref_t wakeref;
> -
>  	if (!intel_dp_is_edp(intel_dp))
>  		return;
>  
> -	with_intel_pps_lock(intel_dp, wakeref)
> +	with_intel_pps_lock(intel_dp)
>  		intel_pps_off_unlocked(intel_dp);
>  }
>  
> @@ -1095,7 +1083,6 @@ void intel_pps_off(struct intel_dp *intel_dp)
>  void intel_pps_backlight_on(struct intel_dp *intel_dp)
>  {
>  	struct intel_display *display = to_intel_display(intel_dp);
> -	intel_wakeref_t wakeref;
>  
>  	/*
>  	 * If we enable the backlight right away following a panel power
> @@ -1105,7 +1092,7 @@ void intel_pps_backlight_on(struct intel_dp *intel_dp)
>  	 */
>  	wait_backlight_on(intel_dp);
>  
> -	with_intel_pps_lock(intel_dp, wakeref) {
> +	with_intel_pps_lock(intel_dp) {
>  		i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
>  		u32 pp;
>  
> @@ -1121,12 +1108,11 @@ void intel_pps_backlight_on(struct intel_dp *intel_dp)
>  void intel_pps_backlight_off(struct intel_dp *intel_dp)
>  {
>  	struct intel_display *display = to_intel_display(intel_dp);
> -	intel_wakeref_t wakeref;
>  
>  	if (!intel_dp_is_edp(intel_dp))
>  		return;
>  
> -	with_intel_pps_lock(intel_dp, wakeref) {
> +	with_intel_pps_lock(intel_dp) {
>  		i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
>  		u32 pp;
>  
> @@ -1149,11 +1135,10 @@ void intel_pps_backlight_power(struct intel_connector *connector, bool enable)
>  {
>  	struct intel_display *display = to_intel_display(connector);
>  	struct intel_dp *intel_dp = intel_attached_dp(connector);
> -	intel_wakeref_t wakeref;
>  	bool is_enabled;
>  
>  	is_enabled = false;
> -	with_intel_pps_lock(intel_dp, wakeref)
> +	with_intel_pps_lock(intel_dp)
>  		is_enabled = ilk_get_pp_control(intel_dp) & EDP_BLC_ENABLE;
>  	if (is_enabled == enable)
>  		return;
> @@ -1251,9 +1236,7 @@ void vlv_pps_pipe_init(struct intel_dp *intel_dp)
>  /* Call on all DP, not just eDP */
>  void vlv_pps_pipe_reset(struct intel_dp *intel_dp)
>  {
> -	intel_wakeref_t wakeref;
> -
> -	with_intel_pps_lock(intel_dp, wakeref)
> +	with_intel_pps_lock(intel_dp)
>  		intel_dp->pps.vlv_active_pipe = vlv_active_pipe(intel_dp);
>  }
>  
> @@ -1329,9 +1312,7 @@ void vlv_pps_port_disable(struct intel_encoder *encoder,
>  {
>  	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
>  
> -	intel_wakeref_t wakeref;
> -
> -	with_intel_pps_lock(intel_dp, wakeref)
> +	with_intel_pps_lock(intel_dp)
>  		intel_dp->pps.vlv_active_pipe = INVALID_PIPE;
>  }
>  
> @@ -1362,10 +1343,9 @@ static void pps_vdd_init(struct intel_dp *intel_dp)
>  
>  bool intel_pps_have_panel_power_or_vdd(struct intel_dp *intel_dp)
>  {
> -	intel_wakeref_t wakeref;
>  	bool have_power = false;
>  
> -	with_intel_pps_lock(intel_dp, wakeref) {
> +	with_intel_pps_lock(intel_dp) {
>  		have_power = edp_have_panel_power(intel_dp) ||
>  			     edp_have_panel_vdd(intel_dp);
>  	}
> @@ -1692,12 +1672,11 @@ static void pps_init_registers(struct intel_dp *intel_dp, bool force_disable_vdd
>  void intel_pps_encoder_reset(struct intel_dp *intel_dp)
>  {
>  	struct intel_display *display = to_intel_display(intel_dp);
> -	intel_wakeref_t wakeref;
>  
>  	if (!intel_dp_is_edp(intel_dp))
>  		return;
>  
> -	with_intel_pps_lock(intel_dp, wakeref) {
> +	with_intel_pps_lock(intel_dp) {
>  		/*
>  		 * Reinit the power sequencer also on the resume path, in case
>  		 * BIOS did something nasty with it.
> @@ -1716,7 +1695,6 @@ void intel_pps_encoder_reset(struct intel_dp *intel_dp)
>  
>  bool intel_pps_init(struct intel_dp *intel_dp)
>  {
> -	intel_wakeref_t wakeref;
>  	bool ret;
>  
>  	intel_dp->pps.initializing = true;
> @@ -1724,7 +1702,7 @@ bool intel_pps_init(struct intel_dp *intel_dp)
>  
>  	pps_init_timestamps(intel_dp);
>  
> -	with_intel_pps_lock(intel_dp, wakeref) {
> +	with_intel_pps_lock(intel_dp) {
>  		ret = pps_initial_setup(intel_dp);
>  
>  		pps_init_delays(intel_dp);
> @@ -1760,9 +1738,7 @@ static void pps_init_late(struct intel_dp *intel_dp)
>  
>  void intel_pps_init_late(struct intel_dp *intel_dp)
>  {
> -	intel_wakeref_t wakeref;
> -
> -	with_intel_pps_lock(intel_dp, wakeref) {
> +	with_intel_pps_lock(intel_dp) {
>  		/* Reinit delays after per-panel info has been parsed from VBT */
>  		pps_init_late(intel_dp);
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_pps.h b/drivers/gpu/drm/i915/display/intel_pps.h
> index c83007152f07..ad5c458ccdaf 100644
> --- a/drivers/gpu/drm/i915/display/intel_pps.h
> +++ b/drivers/gpu/drm/i915/display/intel_pps.h
> @@ -20,8 +20,11 @@ struct intel_encoder;
>  intel_wakeref_t intel_pps_lock(struct intel_dp *intel_dp);
>  intel_wakeref_t intel_pps_unlock(struct intel_dp *intel_dp, intel_wakeref_t wakeref);
>  
> -#define with_intel_pps_lock(dp, wf)						\
> -	for ((wf) = intel_pps_lock(dp); (wf); (wf) = intel_pps_unlock((dp), (wf)))
> +#define __with_intel_pps_lock(dp, wf) \
> +	for (intel_wakeref_t (wf) = intel_pps_lock(dp); (wf); (wf) = intel_pps_unlock((dp), (wf)))
> +
> +#define with_intel_pps_lock(dp) \
> +	__with_intel_pps_lock((dp), __UNIQUE_ID(wakeref))
>  
>  void intel_pps_backlight_on(struct intel_dp *intel_dp);
>  void intel_pps_backlight_off(struct intel_dp *intel_dp);

Nice!

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>

--
Cheers,
Luca.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v2 2/5] drm/i915/pps: convert intel_wakeref_t to struct ref_tracker *
  2025-11-25 13:24 ` [PATCH v2 2/5] drm/i915/pps: convert intel_wakeref_t to struct ref_tracker * Jani Nikula
@ 2025-12-01  8:09   ` Luca Coelho
  0 siblings, 0 replies; 16+ messages in thread
From: Luca Coelho @ 2025-12-01  8:09 UTC (permalink / raw)
  To: Jani Nikula, intel-gfx, intel-xe

On Tue, 2025-11-25 at 15:24 +0200, Jani Nikula wrote:
> Under the hood, intel_wakeref_t is just struct ref_tracker *. Use the
> actual underlying type both for clarity (we *are* using intel_wakeref_t
> as a pointer though it doesn't look like one) and to help i915, xe and
> display coexistence without custom types.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_dp_aux.c | 2 +-
>  drivers/gpu/drm/i915/display/intel_pps.c    | 7 +++----
>  drivers/gpu/drm/i915/display/intel_pps.h    | 9 ++++-----
>  3 files changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux.c b/drivers/gpu/drm/i915/display/intel_dp_aux.c
> index 809799f63e32..38e03f3efac5 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_aux.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c
> @@ -246,7 +246,7 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
>  	u32 aux_clock_divider;
>  	enum intel_display_power_domain aux_domain;
>  	intel_wakeref_t aux_wakeref;
> -	intel_wakeref_t pps_wakeref = NULL;
> +	struct ref_tracker *pps_wakeref = NULL;
>  	int i, ret, recv_bytes;
>  	int try, clock = 0;
>  	u32 status;
> diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
> index 34376255b85c..b217ec7aa758 100644
> --- a/drivers/gpu/drm/i915/display/intel_pps.c
> +++ b/drivers/gpu/drm/i915/display/intel_pps.c
> @@ -67,10 +67,10 @@ static const char *pps_name(struct intel_dp *intel_dp)
>  	return "PPS <invalid>";
>  }
>  
> -intel_wakeref_t intel_pps_lock(struct intel_dp *intel_dp)
> +struct ref_tracker *intel_pps_lock(struct intel_dp *intel_dp)
>  {
>  	struct intel_display *display = to_intel_display(intel_dp);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  
>  	/*
>  	 * See vlv_pps_reset_all() why we need a power domain reference here.
> @@ -81,8 +81,7 @@ intel_wakeref_t intel_pps_lock(struct intel_dp *intel_dp)
>  	return wakeref;
>  }
>  
> -intel_wakeref_t intel_pps_unlock(struct intel_dp *intel_dp,
> -				 intel_wakeref_t wakeref)
> +struct ref_tracker *intel_pps_unlock(struct intel_dp *intel_dp, struct ref_tracker *wakeref)
>  {
>  	struct intel_display *display = to_intel_display(intel_dp);
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_pps.h b/drivers/gpu/drm/i915/display/intel_pps.h
> index ad5c458ccdaf..f7c96d75be45 100644
> --- a/drivers/gpu/drm/i915/display/intel_pps.h
> +++ b/drivers/gpu/drm/i915/display/intel_pps.h
> @@ -8,20 +8,19 @@
>  
>  #include <linux/types.h>
>  
> -#include "intel_wakeref.h"
> -
>  enum pipe;
>  struct intel_connector;
>  struct intel_crtc_state;
>  struct intel_display;
>  struct intel_dp;
>  struct intel_encoder;
> +struct ref_tracker;
>  
> -intel_wakeref_t intel_pps_lock(struct intel_dp *intel_dp);
> -intel_wakeref_t intel_pps_unlock(struct intel_dp *intel_dp, intel_wakeref_t wakeref);
> +struct ref_tracker *intel_pps_lock(struct intel_dp *intel_dp);
> +struct ref_tracker *intel_pps_unlock(struct intel_dp *intel_dp, struct ref_tracker *wakeref);
>  
>  #define __with_intel_pps_lock(dp, wf) \
> -	for (intel_wakeref_t (wf) = intel_pps_lock(dp); (wf); (wf) = intel_pps_unlock((dp), (wf)))
> +	for (struct ref_tracker *(wf) = intel_pps_lock(dp); (wf); (wf) = intel_pps_unlock((dp), (wf)))
>  
>  #define with_intel_pps_lock(dp) \
>  	__with_intel_pps_lock((dp), __UNIQUE_ID(wakeref))


Reviewed-by: Luca Coelho <luciano.coelho@intel.com>

--
Cheers,
Luca.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v2 3/5] drm/i915/power: drop wakeref parameter from with_intel_display_power*()
  2025-11-25 13:24 ` [PATCH v2 3/5] drm/i915/power: drop wakeref parameter from with_intel_display_power*() Jani Nikula
@ 2025-12-01  8:11   ` Luca Coelho
  0 siblings, 0 replies; 16+ messages in thread
From: Luca Coelho @ 2025-12-01  8:11 UTC (permalink / raw)
  To: Jani Nikula, intel-gfx, intel-xe

On Tue, 2025-11-25 at 15:24 +0200, Jani Nikula wrote:
> Add another level of macro abstraction, and declare the wakeref within
> the for loop using __UNIQUE_ID. This allows us to drop a bunch of
> boilerplate declarations and parameter passing.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_cmtg.c      |  3 +--
>  drivers/gpu/drm/i915/display/intel_display.c   | 15 +++++----------
>  .../gpu/drm/i915/display/intel_display_power.h | 14 ++++++++++----
>  drivers/gpu/drm/i915/display/intel_dp.c        |  3 +--
>  drivers/gpu/drm/i915/display/intel_tc.c        | 18 ++++++------------
>  5 files changed, 23 insertions(+), 30 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_cmtg.c b/drivers/gpu/drm/i915/display/intel_cmtg.c
> index 165138b95cb2..e1fdc6fe9762 100644
> --- a/drivers/gpu/drm/i915/display/intel_cmtg.c
> +++ b/drivers/gpu/drm/i915/display/intel_cmtg.c
> @@ -85,7 +85,6 @@ static bool intel_cmtg_transcoder_is_secondary(struct intel_display *display,
>  					       enum transcoder trans)
>  {
>  	enum intel_display_power_domain power_domain;
> -	intel_wakeref_t wakeref;
>  	u32 val = 0;
>  
>  	if (!HAS_TRANSCODER(display, trans))
> @@ -93,7 +92,7 @@ static bool intel_cmtg_transcoder_is_secondary(struct intel_display *display,
>  
>  	power_domain = POWER_DOMAIN_TRANSCODER(trans);
>  
> -	with_intel_display_power_if_enabled(display, power_domain, wakeref)
> +	with_intel_display_power_if_enabled(display, power_domain)
>  		val = intel_de_read(display, TRANS_DDI_FUNC_CTL2(display, trans));
>  
>  	return val & CMTG_SECONDARY_MODE;
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 04f5c488f399..34e69b884713 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -3469,12 +3469,11 @@ static bool transcoder_ddi_func_is_enabled(struct intel_display *display,
>  					   enum transcoder cpu_transcoder)
>  {
>  	enum intel_display_power_domain power_domain;
> -	intel_wakeref_t wakeref;
>  	u32 tmp = 0;
>  
>  	power_domain = POWER_DOMAIN_TRANSCODER(cpu_transcoder);
>  
> -	with_intel_display_power_if_enabled(display, power_domain, wakeref)
> +	with_intel_display_power_if_enabled(display, power_domain)
>  		tmp = intel_de_read(display,
>  				    TRANS_DDI_FUNC_CTL(display, cpu_transcoder));
>  
> @@ -3496,10 +3495,9 @@ static void enabled_uncompressed_joiner_pipes(struct intel_display *display,
>  					 joiner_pipes(display)) {
>  		enum intel_display_power_domain power_domain;
>  		enum pipe pipe = crtc->pipe;
> -		intel_wakeref_t wakeref;
>  
>  		power_domain = POWER_DOMAIN_PIPE(pipe);
> -		with_intel_display_power_if_enabled(display, power_domain, wakeref) {
> +		with_intel_display_power_if_enabled(display, power_domain) {
>  			u32 tmp = intel_de_read(display, ICL_PIPE_DSS_CTL1(pipe));
>  
>  			if (tmp & UNCOMPRESSED_JOINER_PRIMARY)
> @@ -3525,10 +3523,9 @@ static void enabled_bigjoiner_pipes(struct intel_display *display,
>  					 joiner_pipes(display)) {
>  		enum intel_display_power_domain power_domain;
>  		enum pipe pipe = crtc->pipe;
> -		intel_wakeref_t wakeref;
>  
>  		power_domain = intel_dsc_power_domain(crtc, (enum transcoder)pipe);
> -		with_intel_display_power_if_enabled(display, power_domain, wakeref) {
> +		with_intel_display_power_if_enabled(display, power_domain) {
>  			u32 tmp = intel_de_read(display, ICL_PIPE_DSS_CTL1(pipe));
>  
>  			if (!(tmp & BIG_JOINER_ENABLE))
> @@ -3595,10 +3592,9 @@ static void enabled_ultrajoiner_pipes(struct intel_display *display,
>  					 joiner_pipes(display)) {
>  		enum intel_display_power_domain power_domain;
>  		enum pipe pipe = crtc->pipe;
> -		intel_wakeref_t wakeref;
>  
>  		power_domain = intel_dsc_power_domain(crtc, (enum transcoder)pipe);
> -		with_intel_display_power_if_enabled(display, power_domain, wakeref) {
> +		with_intel_display_power_if_enabled(display, power_domain) {
>  			u32 tmp = intel_de_read(display, ICL_PIPE_DSS_CTL1(pipe));
>  
>  			if (!(tmp & ULTRA_JOINER_ENABLE))
> @@ -3756,12 +3752,11 @@ static u8 hsw_enabled_transcoders(struct intel_crtc *crtc)
>  	for_each_cpu_transcoder_masked(display, cpu_transcoder,
>  				       panel_transcoder_mask) {
>  		enum intel_display_power_domain power_domain;
> -		intel_wakeref_t wakeref;
>  		enum pipe trans_pipe;
>  		u32 tmp = 0;
>  
>  		power_domain = POWER_DOMAIN_TRANSCODER(cpu_transcoder);
> -		with_intel_display_power_if_enabled(display, power_domain, wakeref)
> +		with_intel_display_power_if_enabled(display, power_domain)
>  			tmp = intel_de_read(display,
>  					    TRANS_DDI_FUNC_CTL(display, cpu_transcoder));
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
> index f8813b0e16df..79ce8d94bf7d 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
> @@ -297,12 +297,18 @@ enum dbuf_slice {
>  void gen9_dbuf_slices_update(struct intel_display *display,
>  			     u8 req_slices);
>  
> -#define with_intel_display_power(display, domain, wf) \
> -	for ((wf) = intel_display_power_get((display), (domain)); (wf); \
> +#define __with_intel_display_power(display, domain, wf) \
> +	for (intel_wakeref_t (wf) = intel_display_power_get((display), (domain)); (wf); \
>  	     intel_display_power_put_async((display), (domain), (wf)), (wf) = NULL)
>  
> -#define with_intel_display_power_if_enabled(display, domain, wf) \
> -	for ((wf) = intel_display_power_get_if_enabled((display), (domain)); (wf); \
> +#define with_intel_display_power(display, domain) \
> +	__with_intel_display_power(display, domain, __UNIQUE_ID(wakeref))
> +
> +#define __with_intel_display_power_if_enabled(display, domain, wf) \
> +	for (intel_wakeref_t (wf) = intel_display_power_get_if_enabled((display), (domain)); (wf); \
>  	     intel_display_power_put_async((display), (domain), (wf)), (wf) = NULL)
>  
> +#define with_intel_display_power_if_enabled(display, domain) \
> +	__with_intel_display_power_if_enabled(display, domain, __UNIQUE_ID(wakeref))
> +
>  #endif /* __INTEL_DISPLAY_POWER_H__ */
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 0ec82fcbcf48..7df0e5e13688 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -5791,9 +5791,8 @@ bool intel_digital_port_connected_locked(struct intel_encoder *encoder)
>  	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
>  	bool is_glitch_free = intel_tc_port_handles_hpd_glitches(dig_port);
>  	bool is_connected = false;
> -	intel_wakeref_t wakeref;
>  
> -	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref) {
> +	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE) {
>  		poll_timeout_us(is_connected = dig_port->connected(encoder),
>  				is_connected || is_glitch_free,
>  				30, 4000, false);
> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
> index 1e21fd02685d..c678216af352 100644
> --- a/drivers/gpu/drm/i915/display/intel_tc.c
> +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> @@ -269,10 +269,9 @@ assert_tc_port_power_enabled(struct intel_tc_port *tc)
>  static u32 get_lane_mask(struct intel_tc_port *tc)
>  {
>  	struct intel_display *display = to_intel_display(tc->dig_port);
> -	intel_wakeref_t wakeref;
>  	u32 lane_mask;
>  
> -	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref)
> +	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE)
>  		lane_mask = intel_de_read(display, PORT_TX_DFLEXDPSP(tc->phy_fia));
>  
>  	drm_WARN_ON(display->drm, lane_mask == 0xffffffff);
> @@ -296,7 +295,6 @@ get_pin_assignment(struct intel_tc_port *tc)
>  	struct intel_display *display = to_intel_display(tc->dig_port);
>  	enum tc_port tc_port = intel_encoder_to_tc(&tc->dig_port->base);
>  	enum intel_tc_pin_assignment pin_assignment;
> -	intel_wakeref_t wakeref;
>  	i915_reg_t reg;
>  	u32 mask;
>  	u32 val;
> @@ -312,7 +310,7 @@ get_pin_assignment(struct intel_tc_port *tc)
>  		mask = DP_PIN_ASSIGNMENT_MASK(tc->phy_fia_idx);
>  	}
>  
> -	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref)
> +	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE)
>  		val = intel_de_read(display, reg);
>  
>  	drm_WARN_ON(display->drm, val == 0xffffffff);
> @@ -527,12 +525,11 @@ static u32 icl_tc_phy_hpd_live_status(struct intel_tc_port *tc)
>  	struct intel_display *display = to_intel_display(tc->dig_port);
>  	struct intel_digital_port *dig_port = tc->dig_port;
>  	u32 isr_bit = display->hotplug.pch_hpd[dig_port->base.hpd_pin];
> -	intel_wakeref_t wakeref;
>  	u32 fia_isr;
>  	u32 pch_isr;
>  	u32 mask = 0;
>  
> -	with_intel_display_power(display, tc_phy_cold_off_domain(tc), wakeref) {
> +	with_intel_display_power(display, tc_phy_cold_off_domain(tc)) {
>  		fia_isr = intel_de_read(display, PORT_TX_DFLEXDPSP(tc->phy_fia));
>  		pch_isr = intel_de_read(display, SDEISR);
>  	}
> @@ -774,10 +771,9 @@ tgl_tc_phy_cold_off_domain(struct intel_tc_port *tc)
>  static void tgl_tc_phy_init(struct intel_tc_port *tc)
>  {
>  	struct intel_display *display = to_intel_display(tc->dig_port);
> -	intel_wakeref_t wakeref;
>  	u32 val;
>  
> -	with_intel_display_power(display, tc_phy_cold_off_domain(tc), wakeref)
> +	with_intel_display_power(display, tc_phy_cold_off_domain(tc))
>  		val = intel_de_read(display, PORT_TX_DFLEXDPSP(FIA1));
>  
>  	drm_WARN_ON(display->drm, val == 0xffffffff);
> @@ -819,12 +815,11 @@ static u32 adlp_tc_phy_hpd_live_status(struct intel_tc_port *tc)
>  	enum hpd_pin hpd_pin = dig_port->base.hpd_pin;
>  	u32 cpu_isr_bits = display->hotplug.hpd[hpd_pin];
>  	u32 pch_isr_bit = display->hotplug.pch_hpd[hpd_pin];
> -	intel_wakeref_t wakeref;
>  	u32 cpu_isr;
>  	u32 pch_isr;
>  	u32 mask = 0;
>  
> -	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref) {
> +	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE) {
>  		cpu_isr = intel_de_read(display, GEN11_DE_HPD_ISR);
>  		pch_isr = intel_de_read(display, SDEISR);
>  	}
> @@ -1015,12 +1010,11 @@ static u32 xelpdp_tc_phy_hpd_live_status(struct intel_tc_port *tc)
>  	enum hpd_pin hpd_pin = dig_port->base.hpd_pin;
>  	u32 pica_isr_bits = display->hotplug.hpd[hpd_pin];
>  	u32 pch_isr_bit = display->hotplug.pch_hpd[hpd_pin];
> -	intel_wakeref_t wakeref;
>  	u32 pica_isr;
>  	u32 pch_isr;
>  	u32 mask = 0;
>  
> -	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref) {
> +	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE) {
>  		pica_isr = intel_de_read(display, PICAINTERRUPT_ISR);
>  		pch_isr = intel_de_read(display, SDEISR);
>  	}

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>

--
Cheers,
Luca.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v2 4/5] drm/i915/power: convert intel_wakeref_t to struct ref_tracker *
  2025-11-25 13:24 ` [PATCH v2 4/5] drm/i915/power: convert intel_wakeref_t to struct ref_tracker * Jani Nikula
@ 2025-12-01  8:15   ` Luca Coelho
  2025-12-01 12:25     ` Jani Nikula
  0 siblings, 1 reply; 16+ messages in thread
From: Luca Coelho @ 2025-12-01  8:15 UTC (permalink / raw)
  To: Jani Nikula, intel-gfx, intel-xe

On Tue, 2025-11-25 at 15:24 +0200, Jani Nikula wrote:
> Under the hood, intel_wakeref_t is just struct ref_tracker *. Use the
> actual underlying type both for clarity (we *are* using intel_wakeref_t
> as a pointer though it doesn't look like one) and to help i915, xe and
> display coexistence without custom types.
> 
> v2: Keep intel_wakeref.h includes as they are
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/g4x_dp.c         |  2 +-
>  drivers/gpu/drm/i915/display/g4x_hdmi.c       |  2 +-
>  drivers/gpu/drm/i915/display/i9xx_plane.c     |  2 +-
>  drivers/gpu/drm/i915/display/icl_dsi.c        |  4 +--
>  drivers/gpu/drm/i915/display/intel_audio.c    |  6 ++--
>  drivers/gpu/drm/i915/display/intel_cdclk.c    |  4 +--
>  drivers/gpu/drm/i915/display/intel_crt.c      |  6 ++--
>  drivers/gpu/drm/i915/display/intel_cursor.c   |  4 +--
>  drivers/gpu/drm/i915/display/intel_cx0_phy.c  | 18 +++++-----
>  drivers/gpu/drm/i915/display/intel_ddi.c      | 16 ++++-----
>  drivers/gpu/drm/i915/display/intel_display.c  |  8 ++---
>  .../gpu/drm/i915/display/intel_display_core.h |  2 +-
>  .../drm/i915/display/intel_display_debugfs.c  |  2 +-
>  .../drm/i915/display/intel_display_power.c    | 26 +++++++--------
>  .../drm/i915/display/intel_display_power.h    | 33 ++++++++++---------
>  .../drm/i915/display/intel_display_types.h    |  6 ++--
>  drivers/gpu/drm/i915/display/intel_dmc.c      |  2 +-
>  drivers/gpu/drm/i915/display/intel_dp_aux.c   |  2 +-
>  drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 18 +++++-----
>  drivers/gpu/drm/i915/display/intel_dpll_mgr.h |  4 +--
>  drivers/gpu/drm/i915/display/intel_dsi.h      |  7 ++--
>  drivers/gpu/drm/i915/display/intel_gmbus.c    |  4 +--
>  drivers/gpu/drm/i915/display/intel_hdmi.c     |  4 +--
>  drivers/gpu/drm/i915/display/intel_hotplug.c  |  2 +-
>  drivers/gpu/drm/i915/display/intel_lt_phy.c   | 14 ++++----
>  drivers/gpu/drm/i915/display/intel_lvds.c     |  2 +-
>  .../drm/i915/display/intel_modeset_setup.c    |  2 +-
>  drivers/gpu/drm/i915/display/intel_pipe_crc.c |  2 +-
>  drivers/gpu/drm/i915/display/intel_sprite.c   |  6 ++--
>  drivers/gpu/drm/i915/display/intel_tc.c       | 22 ++++++-------
>  drivers/gpu/drm/i915/display/intel_vdsc.c     |  2 +-
>  .../drm/i915/display/skl_universal_plane.c    |  2 +-
>  drivers/gpu/drm/i915/display/skl_watermark.c  |  2 +-
>  drivers/gpu/drm/i915/display/vlv_dsi.c        |  2 +-
>  .../xe/compat-i915-headers/intel_wakeref.h    |  4 ---
>  drivers/gpu/drm/xe/display/xe_display_rpm.c   |  1 +
>  36 files changed, 122 insertions(+), 123 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
> index 27f4c55d7484..4cb753177fd8 100644
> --- a/drivers/gpu/drm/i915/display/g4x_dp.c
> +++ b/drivers/gpu/drm/i915/display/g4x_dp.c
> @@ -302,7 +302,7 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder,
>  {
>  	struct intel_display *display = to_intel_display(encoder);
>  	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret;
>  
>  	wakeref = intel_display_power_get_if_enabled(display,
> diff --git a/drivers/gpu/drm/i915/display/g4x_hdmi.c b/drivers/gpu/drm/i915/display/g4x_hdmi.c
> index f6e2d1ed5639..8b22447e8e23 100644
> --- a/drivers/gpu/drm/i915/display/g4x_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/g4x_hdmi.c
> @@ -68,7 +68,7 @@ static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder,
>  {
>  	struct intel_display *display = to_intel_display(encoder);
>  	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret;
>  
>  	wakeref = intel_display_power_get_if_enabled(display,
> diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
> index 51ccc6bd5f21..6b570335f393 100644
> --- a/drivers/gpu/drm/i915/display/i9xx_plane.c
> +++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
> @@ -724,7 +724,7 @@ static bool i9xx_plane_get_hw_state(struct intel_plane *plane,
>  	struct intel_display *display = to_intel_display(plane);
>  	enum intel_display_power_domain power_domain;
>  	enum i9xx_plane_id i9xx_plane = plane->i9xx_plane;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret;
>  	u32 val;
>  
> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
> index 9230792960f2..dac781f54661 100644
> --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> @@ -1411,7 +1411,7 @@ static void gen11_dsi_disable_io_power(struct intel_encoder *encoder)
>  	enum port port;
>  
>  	for_each_dsi_port(port, intel_dsi->ports) {
> -		intel_wakeref_t wakeref;
> +		struct ref_tracker *wakeref;
>  
>  		wakeref = fetch_and_zero(&intel_dsi->io_wakeref[port]);
>  		intel_display_power_put(display,
> @@ -1722,7 +1722,7 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder,
>  	struct intel_display *display = to_intel_display(encoder);
>  	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
>  	enum transcoder dsi_trans;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	enum port port;
>  	bool ret = false;
>  	u32 tmp;
> diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
> index 5bdaef38f13d..5f3c175afdd2 100644
> --- a/drivers/gpu/drm/i915/display/intel_audio.c
> +++ b/drivers/gpu/drm/i915/display/intel_audio.c
> @@ -1042,10 +1042,10 @@ int intel_audio_min_cdclk(const struct intel_crtc_state *crtc_state)
>  static unsigned long intel_audio_component_get_power(struct device *kdev)
>  {
>  	struct intel_display *display = to_intel_display(kdev);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  
>  	/* Catch potential impedance mismatches before they occur! */
> -	BUILD_BUG_ON(sizeof(intel_wakeref_t) > sizeof(unsigned long));
> +	BUILD_BUG_ON(sizeof(wakeref) > sizeof(unsigned long));
>  
>  	wakeref = intel_display_power_get(display, POWER_DOMAIN_AUDIO_PLAYBACK);
>  
> @@ -1074,7 +1074,7 @@ static void intel_audio_component_put_power(struct device *kdev,
>  					    unsigned long cookie)
>  {
>  	struct intel_display *display = to_intel_display(kdev);
> -	intel_wakeref_t wakeref = (intel_wakeref_t)cookie;
> +	struct ref_tracker *wakeref = (struct ref_tracker *)cookie;
>  
>  	/* Stop forcing CDCLK to 2*BCLK if no need for audio to be powered. */
>  	if (--display->audio.power_refcount == 0)
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index 5c90e53b4e46..ada08fd1447b 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -667,7 +667,7 @@ static void vlv_set_cdclk(struct intel_display *display,
>  {
>  	int cdclk = cdclk_config->cdclk;
>  	u32 val, cmd = cdclk_config->voltage_level;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	int ret;
>  
>  	switch (cdclk) {
> @@ -757,7 +757,7 @@ static void chv_set_cdclk(struct intel_display *display,
>  {
>  	int cdclk = cdclk_config->cdclk;
>  	u32 val, cmd = cdclk_config->voltage_level;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	int ret;
>  
>  	switch (cdclk) {
> diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
> index 82e89cdbe5a5..5f9a03877ea9 100644
> --- a/drivers/gpu/drm/i915/display/intel_crt.c
> +++ b/drivers/gpu/drm/i915/display/intel_crt.c
> @@ -109,7 +109,7 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,
>  {
>  	struct intel_display *display = to_intel_display(encoder);
>  	struct intel_crt *crt = intel_encoder_to_crt(encoder);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret;
>  
>  	wakeref = intel_display_power_get_if_enabled(display,
> @@ -847,7 +847,7 @@ intel_crt_detect(struct drm_connector *connector,
>  	struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));
>  	struct intel_encoder *encoder = &crt->base;
>  	struct drm_atomic_state *state;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	int status;
>  
>  	drm_dbg_kms(display->drm, "[CONNECTOR:%d:%s] force=%d\n",
> @@ -936,7 +936,7 @@ static int intel_crt_get_modes(struct drm_connector *connector)
>  	struct intel_display *display = to_intel_display(connector->dev);
>  	struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));
>  	struct intel_encoder *encoder = &crt->base;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	struct i2c_adapter *ddc;
>  	int ret;
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
> index a10b2425b94d..341d1cb40295 100644
> --- a/drivers/gpu/drm/i915/display/intel_cursor.c
> +++ b/drivers/gpu/drm/i915/display/intel_cursor.c
> @@ -324,7 +324,7 @@ static bool i845_cursor_get_hw_state(struct intel_plane *plane,
>  {
>  	struct intel_display *display = to_intel_display(plane);
>  	enum intel_display_power_domain power_domain;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret;
>  
>  	power_domain = POWER_DOMAIN_PIPE(PIPE_A);
> @@ -727,7 +727,7 @@ static bool i9xx_cursor_get_hw_state(struct intel_plane *plane,
>  {
>  	struct intel_display *display = to_intel_display(plane);
>  	enum intel_display_power_domain power_domain;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret;
>  	u32 val;
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
> index 27be2a490297..7bd17723e7ab 100644
> --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c
> +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
> @@ -105,11 +105,11 @@ static void intel_cx0_program_msgbus_timer(struct intel_encoder *encoder)
>   * We also do the msgbus timer programming here to ensure that the timer
>   * is already programmed before any access to the msgbus.
>   */
> -static intel_wakeref_t intel_cx0_phy_transaction_begin(struct intel_encoder *encoder)
> +static struct ref_tracker *intel_cx0_phy_transaction_begin(struct intel_encoder *encoder)
>  {
>  	struct intel_display *display = to_intel_display(encoder);
>  	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  
>  	intel_psr_pause(intel_dp);
>  	wakeref = intel_display_power_get(display, POWER_DOMAIN_DC_OFF);
> @@ -118,7 +118,7 @@ static intel_wakeref_t intel_cx0_phy_transaction_begin(struct intel_encoder *enc
>  	return wakeref;
>  }
>  
> -static void intel_cx0_phy_transaction_end(struct intel_encoder *encoder, intel_wakeref_t wakeref)
> +static void intel_cx0_phy_transaction_end(struct intel_encoder *encoder, struct ref_tracker *wakeref)
>  {
>  	struct intel_display *display = to_intel_display(encoder);
>  	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> @@ -476,7 +476,7 @@ void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder,
>  	struct intel_display *display = to_intel_display(encoder);
>  	const struct intel_ddi_buf_trans *trans;
>  	u8 owned_lane_mask;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	int n_entries, ln;
>  	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
>  
> @@ -2252,7 +2252,7 @@ static void intel_c10pll_readout_hw_state(struct intel_encoder *encoder,
>  	struct intel_display *display = to_intel_display(encoder);
>  	enum phy phy = intel_encoder_to_phy(encoder);
>  	u8 lane = INTEL_CX0_LANE0;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	int i;
>  
>  	cx0pll_state->use_c10 = true;
> @@ -2756,7 +2756,7 @@ static void intel_c20pll_readout_hw_state(struct intel_encoder *encoder,
>  	struct intel_c20pll_state *pll_state = &cx0pll_state->c20;
>  	struct intel_display *display = to_intel_display(encoder);
>  	bool cntx;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	int i;
>  
>  	cx0pll_state->use_c10 = false;
> @@ -3225,7 +3225,7 @@ static void intel_cx0pll_enable(struct intel_encoder *encoder,
>  	bool lane_reversal = dig_port->lane_reversal;
>  	u8 maxpclk_lane = lane_reversal ? INTEL_CX0_LANE1 :
>  					  INTEL_CX0_LANE0;
> -	intel_wakeref_t wakeref = intel_cx0_phy_transaction_begin(encoder);
> +	struct ref_tracker *wakeref = intel_cx0_phy_transaction_begin(encoder);
>  
>  	/*
>  	 * Lane reversal is never used in DP-alt mode, in that case the
> @@ -3463,7 +3463,7 @@ void intel_lnl_mac_transmit_lfps(struct intel_encoder *encoder,
>  				 const struct intel_crtc_state *crtc_state)
>  {
>  	struct intel_display *display = to_intel_display(encoder);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	int i;
>  	u8 owned_lane_mask;
>  
> @@ -3510,7 +3510,7 @@ static void intel_cx0pll_disable(struct intel_encoder *encoder)
>  {
>  	struct intel_display *display = to_intel_display(encoder);
>  	enum phy phy = intel_encoder_to_phy(encoder);
> -	intel_wakeref_t wakeref = intel_cx0_phy_transaction_begin(encoder);
> +	struct ref_tracker *wakeref = intel_cx0_phy_transaction_begin(encoder);
>  
>  	/* 1. Change owned PHY lane power to Disable state. */
>  	intel_cx0_powerdown_change_sequence(encoder, INTEL_CX0_BOTH_LANES,
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index ed9798b0ec00..8158f9829ddf 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -728,7 +728,7 @@ int intel_ddi_toggle_hdcp_bits(struct intel_encoder *intel_encoder,
>  			       bool enable, u32 hdcp_mask)
>  {
>  	struct intel_display *display = to_intel_display(intel_encoder);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	int ret = 0;
>  
>  	wakeref = intel_display_power_get_if_enabled(display,
> @@ -749,7 +749,7 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector)
>  	int type = intel_connector->base.connector_type;
>  	enum port port = encoder->port;
>  	enum transcoder cpu_transcoder;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	enum pipe pipe = 0;
>  	u32 ddi_mode;
>  	bool ret;
> @@ -805,7 +805,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder,
>  {
>  	struct intel_display *display = to_intel_display(encoder);
>  	enum port port = encoder->port;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	enum pipe p;
>  	u32 tmp;
>  	u8 mst_pipe_mask = 0, dp128b132b_pipe_mask = 0;
> @@ -848,7 +848,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder,
>  	for_each_pipe(display, p) {
>  		enum transcoder cpu_transcoder = (enum transcoder)p;
>  		u32 port_mask, ddi_select, ddi_mode;
> -		intel_wakeref_t trans_wakeref;
> +		struct ref_tracker *trans_wakeref;
>  
>  		trans_wakeref = intel_display_power_get_if_enabled(display,
>  								   POWER_DOMAIN_TRANSCODER(cpu_transcoder));
> @@ -1002,7 +1002,7 @@ main_link_aux_power_domain_put(struct intel_digital_port *dig_port,
>  	struct intel_display *display = to_intel_display(dig_port);
>  	enum intel_display_power_domain domain =
>  		intel_ddi_main_link_aux_domain(dig_port, crtc_state);
> -	intel_wakeref_t wf;
> +	struct ref_tracker *wf;
>  
>  	wf = fetch_and_zero(&dig_port->aux_wakeref);
>  	if (!wf)
> @@ -3130,7 +3130,7 @@ static void intel_ddi_post_disable_dp(struct intel_atomic_state *state,
>  	struct intel_display *display = to_intel_display(encoder);
>  	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
>  	struct intel_dp *intel_dp = &dig_port->dp;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool is_mst = intel_crtc_has_type(old_crtc_state,
>  					  INTEL_OUTPUT_DP_MST);
>  
> @@ -3198,7 +3198,7 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state,
>  	struct intel_display *display = to_intel_display(encoder);
>  	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
>  	struct intel_hdmi *intel_hdmi = &dig_port->hdmi;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  
>  	dig_port->set_infoframes(encoder, false,
>  				 old_crtc_state, old_conn_state);
> @@ -3965,7 +3965,7 @@ static void bdw_get_trans_port_sync_config(struct intel_crtc_state *crtc_state)
>  
>  	for_each_cpu_transcoder_masked(display, cpu_transcoder, transcoders) {
>  		enum intel_display_power_domain power_domain;
> -		intel_wakeref_t trans_wakeref;
> +		struct ref_tracker *trans_wakeref;
>  
>  		power_domain = POWER_DOMAIN_TRANSCODER(cpu_transcoder);
>  		trans_wakeref = intel_display_power_get_if_enabled(display,
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 34e69b884713..62e97d725887 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -372,7 +372,7 @@ void assert_transcoder(struct intel_display *display,
>  {
>  	bool cur_state;
>  	enum intel_display_power_domain power_domain;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  
>  	/* we keep both pipes enabled on 830 */
>  	if (display->platform.i830)
> @@ -3035,7 +3035,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
>  	struct intel_display *display = to_intel_display(crtc);
>  	enum intel_display_power_domain power_domain;
>  	enum transcoder cpu_transcoder = (enum transcoder)crtc->pipe;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret = false;
>  	u32 tmp;
>  
> @@ -3379,7 +3379,7 @@ static bool ilk_get_pipe_config(struct intel_crtc *crtc,
>  	struct intel_display *display = to_intel_display(crtc);
>  	enum intel_display_power_domain power_domain;
>  	enum transcoder cpu_transcoder = (enum transcoder)crtc->pipe;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret = false;
>  	u32 tmp;
>  
> @@ -7376,7 +7376,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
>  	struct intel_crtc_state *new_crtc_state, *old_crtc_state;
>  	struct intel_crtc *crtc;
>  	struct intel_power_domain_mask put_domains[I915_MAX_PIPES] = {};
> -	intel_wakeref_t wakeref = NULL;
> +	struct ref_tracker *wakeref = NULL;
>  	int i;
>  
>  	for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i)
> diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
> index 9b36654b593d..5b2120afa806 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_core.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_core.h
> @@ -386,7 +386,7 @@ struct intel_display {
>  
>  	struct {
>  		struct intel_dmc *dmc;
> -		intel_wakeref_t wakeref;
> +		struct ref_tracker *wakeref;
>  	} dmc;
>  
>  	struct {
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index 9bbfdae8d024..aba13e8a9051 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -86,7 +86,7 @@ static int i915_frontbuffer_tracking(struct seq_file *m, void *unused)
>  static int i915_sr_status(struct seq_file *m, void *unused)
>  {
>  	struct intel_display *display = node_to_intel_display(m->private);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool sr_enabled = false;
>  
>  	wakeref = intel_display_power_get(display, POWER_DOMAIN_INIT);
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 08db9bbbfcb1..7cbef1a68266 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -544,8 +544,8 @@ __intel_display_power_get_domain(struct intel_display *display,
>   * Any power domain reference obtained by this function must have a symmetric
>   * call to intel_display_power_put() to release the reference again.
>   */
> -intel_wakeref_t intel_display_power_get(struct intel_display *display,
> -					enum intel_display_power_domain domain)
> +struct ref_tracker *intel_display_power_get(struct intel_display *display,
> +					    enum intel_display_power_domain domain)
>  {
>  	struct i915_power_domains *power_domains = &display->power.domains;
>  	struct ref_tracker *wakeref;
> @@ -571,7 +571,7 @@ intel_wakeref_t intel_display_power_get(struct intel_display *display,
>   * Any power domain reference obtained by this function must have a symmetric
>   * call to intel_display_power_put() to release the reference again.
>   */
> -intel_wakeref_t
> +struct ref_tracker *
>  intel_display_power_get_if_enabled(struct intel_display *display,
>  				   enum intel_display_power_domain domain)
>  {
> @@ -638,7 +638,7 @@ static void __intel_display_power_put(struct intel_display *display,
>  
>  static void
>  queue_async_put_domains_work(struct i915_power_domains *power_domains,
> -			     intel_wakeref_t wakeref,
> +			     struct ref_tracker *wakeref,
>  			     int delay_ms)
>  {
>  	struct intel_display *display = container_of(power_domains,
> @@ -740,7 +740,7 @@ intel_display_power_put_async_work(struct work_struct *work)
>   */
>  void __intel_display_power_put_async(struct intel_display *display,
>  				     enum intel_display_power_domain domain,
> -				     intel_wakeref_t wakeref,
> +				     struct ref_tracker *wakeref,
>  				     int delay_ms)
>  {
>  	struct i915_power_domains *power_domains = &display->power.domains;
> @@ -799,7 +799,7 @@ void intel_display_power_flush_work(struct intel_display *display)
>  {
>  	struct i915_power_domains *power_domains = &display->power.domains;
>  	struct intel_power_domain_mask async_put_mask;
> -	intel_wakeref_t work_wakeref;
> +	struct ref_tracker *work_wakeref;
>  
>  	mutex_lock(&power_domains->lock);
>  
> @@ -853,7 +853,7 @@ intel_display_power_flush_work_sync(struct intel_display *display)
>   */
>  void intel_display_power_put(struct intel_display *display,
>  			     enum intel_display_power_domain domain,
> -			     intel_wakeref_t wakeref)
> +			     struct ref_tracker *wakeref)
>  {
>  	__intel_display_power_put(display, domain);
>  	intel_display_rpm_put(display, wakeref);
> @@ -885,7 +885,7 @@ intel_display_power_get_in_set(struct intel_display *display,
>  			       struct intel_display_power_domain_set *power_domain_set,
>  			       enum intel_display_power_domain domain)
>  {
> -	intel_wakeref_t __maybe_unused wf;
> +	struct ref_tracker *__maybe_unused wf;
>  
>  	drm_WARN_ON(display->drm, test_bit(domain, power_domain_set->mask.bits));
>  
> @@ -901,7 +901,7 @@ intel_display_power_get_in_set_if_enabled(struct intel_display *display,
>  					  struct intel_display_power_domain_set *power_domain_set,
>  					  enum intel_display_power_domain domain)
>  {
> -	intel_wakeref_t wf;
> +	struct ref_tracker *wf;
>  
>  	drm_WARN_ON(display->drm, test_bit(domain, power_domain_set->mask.bits));
>  
> @@ -928,7 +928,7 @@ intel_display_power_put_mask_in_set(struct intel_display *display,
>  		    !bitmap_subset(mask->bits, power_domain_set->mask.bits, POWER_DOMAIN_NUM));
>  
>  	for_each_power_domain(domain, mask) {
> -		intel_wakeref_t __maybe_unused wf = INTEL_WAKEREF_DEF;
> +		struct ref_tracker *__maybe_unused wf = INTEL_WAKEREF_DEF;
>  
>  #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
>  		wf = fetch_and_zero(&power_domain_set->wakerefs[domain]);
> @@ -2004,7 +2004,7 @@ void intel_power_domains_init_hw(struct intel_display *display, bool resume)
>   */
>  void intel_power_domains_driver_remove(struct intel_display *display)
>  {
> -	intel_wakeref_t wakeref __maybe_unused =
> +	struct ref_tracker *wakeref __maybe_unused =
>  		fetch_and_zero(&display->power.domains.init_wakeref);
>  
>  	/* Remove the refcount we took to keep power well support disabled. */
> @@ -2065,7 +2065,7 @@ void intel_power_domains_sanitize_state(struct intel_display *display)
>   */
>  void intel_power_domains_enable(struct intel_display *display)
>  {
> -	intel_wakeref_t wakeref __maybe_unused =
> +	struct ref_tracker *wakeref __maybe_unused =
>  		fetch_and_zero(&display->power.domains.init_wakeref);
>  
>  	intel_display_power_put(display, POWER_DOMAIN_INIT, wakeref);
> @@ -2104,7 +2104,7 @@ void intel_power_domains_disable(struct intel_display *display)
>  void intel_power_domains_suspend(struct intel_display *display, bool s2idle)
>  {
>  	struct i915_power_domains *power_domains = &display->power.domains;
> -	intel_wakeref_t wakeref __maybe_unused =
> +	struct ref_tracker *wakeref __maybe_unused =
>  		fetch_and_zero(&power_domains->init_wakeref);
>  
>  	intel_display_power_put(display, POWER_DOMAIN_INIT, wakeref);
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
> index 79ce8d94bf7d..6f8d921b4482 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
> @@ -16,6 +16,7 @@ enum port;
>  struct i915_power_well;
>  struct intel_display;
>  struct intel_encoder;
> +struct ref_tracker;
>  struct seq_file;
>  
>  /*
> @@ -142,14 +143,14 @@ struct i915_power_domains {
>  	u32 target_dc_state;
>  	u32 allowed_dc_mask;
>  
> -	intel_wakeref_t init_wakeref;
> -	intel_wakeref_t disable_wakeref;
> +	struct ref_tracker *init_wakeref;
> +	struct ref_tracker *disable_wakeref;
>  
>  	struct mutex lock;
>  	int domain_use_count[POWER_DOMAIN_NUM];
>  
>  	struct delayed_work async_put_work;
> -	intel_wakeref_t async_put_wakeref;
> +	struct ref_tracker *async_put_wakeref;
>  	struct intel_power_domain_mask async_put_domains[2];
>  	int async_put_next_delay;
>  
> @@ -159,7 +160,7 @@ struct i915_power_domains {
>  struct intel_display_power_domain_set {
>  	struct intel_power_domain_mask mask;
>  #ifdef CONFIG_DRM_I915_DEBUG_RUNTIME_PM
> -	intel_wakeref_t wakerefs[POWER_DOMAIN_NUM];
> +	struct ref_tracker *wakerefs[POWER_DOMAIN_NUM];
>  #endif
>  };
>  
> @@ -187,24 +188,24 @@ u32 intel_display_power_get_current_dc_state(struct intel_display *display);
>  
>  bool intel_display_power_is_enabled(struct intel_display *display,
>  				    enum intel_display_power_domain domain);
> -intel_wakeref_t intel_display_power_get(struct intel_display *display,
> -					enum intel_display_power_domain domain);
> -intel_wakeref_t
> +struct ref_tracker *intel_display_power_get(struct intel_display *display,
> +					    enum intel_display_power_domain domain);
> +struct ref_tracker *
>  intel_display_power_get_if_enabled(struct intel_display *display,
>  				   enum intel_display_power_domain domain);
>  void __intel_display_power_put_async(struct intel_display *display,
>  				     enum intel_display_power_domain domain,
> -				     intel_wakeref_t wakeref,
> +				     struct ref_tracker *wakeref,
>  				     int delay_ms);
>  void intel_display_power_flush_work(struct intel_display *display);
>  #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
>  void intel_display_power_put(struct intel_display *display,
>  			     enum intel_display_power_domain domain,
> -			     intel_wakeref_t wakeref);
> +			     struct ref_tracker *wakeref);
>  static inline void
>  intel_display_power_put_async(struct intel_display *display,
>  			      enum intel_display_power_domain domain,
> -			      intel_wakeref_t wakeref)
> +			      struct ref_tracker *wakeref)
>  {
>  	__intel_display_power_put_async(display, domain, wakeref, -1);
>  }
> @@ -212,7 +213,7 @@ intel_display_power_put_async(struct intel_display *display,
>  static inline void
>  intel_display_power_put_async_delay(struct intel_display *display,
>  				    enum intel_display_power_domain domain,
> -				    intel_wakeref_t wakeref,
> +				    struct ref_tracker *wakeref,
>  				    int delay_ms)
>  {
>  	__intel_display_power_put_async(display, domain, wakeref, delay_ms);
> @@ -224,7 +225,7 @@ void intel_display_power_put_unchecked(struct intel_display *display,
>  static inline void
>  intel_display_power_put(struct intel_display *display,
>  			enum intel_display_power_domain domain,
> -			intel_wakeref_t wakeref)
> +			struct ref_tracker *wakeref)
>  {
>  	intel_display_power_put_unchecked(display, domain);
>  }
> @@ -232,7 +233,7 @@ intel_display_power_put(struct intel_display *display,
>  static inline void
>  intel_display_power_put_async(struct intel_display *display,
>  			      enum intel_display_power_domain domain,
> -			      intel_wakeref_t wakeref)
> +			      struct ref_tracker *wakeref)
>  {
>  	__intel_display_power_put_async(display, domain, INTEL_WAKEREF_DEF, -1);
>  }
> @@ -240,7 +241,7 @@ intel_display_power_put_async(struct intel_display *display,
>  static inline void
>  intel_display_power_put_async_delay(struct intel_display *display,
>  				    enum intel_display_power_domain domain,
> -				    intel_wakeref_t wakeref,
> +				    struct ref_tracker *wakeref,
>  				    int delay_ms)
>  {
>  	__intel_display_power_put_async(display, domain, INTEL_WAKEREF_DEF, delay_ms);
> @@ -298,14 +299,14 @@ void gen9_dbuf_slices_update(struct intel_display *display,
>  			     u8 req_slices);
>  
>  #define __with_intel_display_power(display, domain, wf) \
> -	for (intel_wakeref_t (wf) = intel_display_power_get((display), (domain)); (wf); \
> +	for (struct ref_tracker *(wf) = intel_display_power_get((display), (domain)); (wf); \
>  	     intel_display_power_put_async((display), (domain), (wf)), (wf) = NULL)
>  
>  #define with_intel_display_power(display, domain) \
>  	__with_intel_display_power(display, domain, __UNIQUE_ID(wakeref))
>  
>  #define __with_intel_display_power_if_enabled(display, domain, wf) \
> -	for (intel_wakeref_t (wf) = intel_display_power_get_if_enabled((display), (domain)); (wf); \
> +	for (struct ref_tracker *(wf) = intel_display_power_get_if_enabled((display), (domain)); (wf); \
>  	     intel_display_power_put_async((display), (domain), (wf)), (wf) = NULL)
>  
>  #define with_intel_display_power_if_enabled(display, domain) \
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 38702a9e0f50..ed0f7448e6cd 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -1658,7 +1658,7 @@ struct intel_pps {
>  	unsigned long last_power_on;
>  	unsigned long last_backlight_off;
>  	ktime_t panel_power_off_time;
> -	intel_wakeref_t vdd_wakeref;
> +	struct ref_tracker *vdd_wakeref;
>  
>  	union {
>  		/*
> @@ -1940,8 +1940,8 @@ struct intel_digital_port {
>  	/* Used for DP and ICL+ TypeC/DP and TypeC/HDMI ports. */
>  	enum aux_ch aux_ch;
>  	enum intel_display_power_domain ddi_io_power_domain;
> -	intel_wakeref_t ddi_io_wakeref;
> -	intel_wakeref_t aux_wakeref;
> +	struct ref_tracker *ddi_io_wakeref;
> +	struct ref_tracker *aux_wakeref;
>  
>  	struct intel_tc_port *tc;
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
> index 6ebbd97e6351..2fb6fec6dc99 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -1322,7 +1322,7 @@ static void intel_dmc_runtime_pm_get(struct intel_display *display)
>  
>  static void intel_dmc_runtime_pm_put(struct intel_display *display)
>  {
> -	intel_wakeref_t wakeref __maybe_unused =
> +	struct ref_tracker *wakeref __maybe_unused =
>  		fetch_and_zero(&display->dmc.wakeref);
>  
>  	intel_display_power_put(display, POWER_DOMAIN_INIT, wakeref);
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux.c b/drivers/gpu/drm/i915/display/intel_dp_aux.c
> index 38e03f3efac5..51b3a168ec33 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_aux.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c
> @@ -245,7 +245,7 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
>  	i915_reg_t ch_ctl, ch_data[5];
>  	u32 aux_clock_divider;
>  	enum intel_display_power_domain aux_domain;
> -	intel_wakeref_t aux_wakeref;
> +	struct ref_tracker *aux_wakeref;
>  	struct ref_tracker *pps_wakeref = NULL;
>  	int i, ret, recv_bytes;
>  	int try, clock = 0;
> diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> index e0e5e5f65d19..9aa84a430f09 100644
> --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> @@ -547,7 +547,7 @@ static bool ibx_pch_dpll_get_hw_state(struct intel_display *display,
>  {
>  	struct i9xx_dpll_hw_state *hw_state = &dpll_hw_state->i9xx;
>  	const enum intel_dpll_id id = pll->info->id;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	u32 val;
>  
>  	wakeref = intel_display_power_get_if_enabled(display,
> @@ -768,7 +768,7 @@ static bool hsw_ddi_wrpll_get_hw_state(struct intel_display *display,
>  {
>  	struct hsw_dpll_hw_state *hw_state = &dpll_hw_state->hsw;
>  	const enum intel_dpll_id id = pll->info->id;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	u32 val;
>  
>  	wakeref = intel_display_power_get_if_enabled(display,
> @@ -789,7 +789,7 @@ static bool hsw_ddi_spll_get_hw_state(struct intel_display *display,
>  				      struct intel_dpll_hw_state *dpll_hw_state)
>  {
>  	struct hsw_dpll_hw_state *hw_state = &dpll_hw_state->hsw;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	u32 val;
>  
>  	wakeref = intel_display_power_get_if_enabled(display,
> @@ -1447,7 +1447,7 @@ static bool skl_ddi_pll_get_hw_state(struct intel_display *display,
>  	struct skl_dpll_hw_state *hw_state = &dpll_hw_state->skl;
>  	const struct skl_dpll_regs *regs = skl_dpll_regs;
>  	const enum intel_dpll_id id = pll->info->id;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret;
>  	u32 val;
>  
> @@ -1485,7 +1485,7 @@ static bool skl_ddi_dpll0_get_hw_state(struct intel_display *display,
>  	struct skl_dpll_hw_state *hw_state = &dpll_hw_state->skl;
>  	const struct skl_dpll_regs *regs = skl_dpll_regs;
>  	const enum intel_dpll_id id = pll->info->id;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	u32 val;
>  	bool ret;
>  
> @@ -2188,7 +2188,7 @@ static bool bxt_ddi_pll_get_hw_state(struct intel_display *display,
>  {
>  	struct bxt_dpll_hw_state *hw_state = &dpll_hw_state->bxt;
>  	enum port port = (enum port)pll->info->id; /* 1:1 port->PLL mapping */
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	enum dpio_phy phy;
>  	enum dpio_channel ch;
>  	u32 val;
> @@ -3598,7 +3598,7 @@ static bool mg_pll_get_hw_state(struct intel_display *display,
>  	struct icl_dpll_hw_state *hw_state = &dpll_hw_state->icl;
>  	const enum intel_dpll_id id = pll->info->id;
>  	enum tc_port tc_port = icl_pll_id_to_tc_port(id);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret = false;
>  	u32 val;
>  
> @@ -3665,7 +3665,7 @@ static bool dkl_pll_get_hw_state(struct intel_display *display,
>  	struct icl_dpll_hw_state *hw_state = &dpll_hw_state->icl;
>  	const enum intel_dpll_id id = pll->info->id;
>  	enum tc_port tc_port = icl_pll_id_to_tc_port(id);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret = false;
>  	u32 val;
>  
> @@ -3737,7 +3737,7 @@ static bool icl_pll_get_hw_state(struct intel_display *display,
>  {
>  	struct icl_dpll_hw_state *hw_state = &dpll_hw_state->icl;
>  	const enum intel_dpll_id id = pll->info->id;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret = false;
>  	u32 val;
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
> index 322af5c55d7c..5b71c860515f 100644
> --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
> +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
> @@ -28,7 +28,6 @@
>  #include <linux/types.h>
>  
>  #include "intel_display_power.h"
> -#include "intel_wakeref.h"
>  
>  #define for_each_dpll(__display, __pll, __i) \
>  	for ((__i) = 0; (__i) < (__display)->dpll.num_dpll && \
> @@ -42,6 +41,7 @@ struct intel_crtc_state;
>  struct intel_dpll_funcs;
>  struct intel_encoder;
>  struct intel_shared_dpll;
> +struct ref_tracker;
>  
>  /**
>   * enum intel_dpll_id - possible DPLL ids
> @@ -396,7 +396,7 @@ struct intel_dpll {
>  	 * @wakeref: In some platforms a device-level runtime pm reference may
>  	 * need to be grabbed to disable DC states while this DPLL is enabled
>  	 */
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  };
>  
>  #define SKL_DPLL0 0
> diff --git a/drivers/gpu/drm/i915/display/intel_dsi.h b/drivers/gpu/drm/i915/display/intel_dsi.h
> index 89c7166a3860..489d26ffd235 100644
> --- a/drivers/gpu/drm/i915/display/intel_dsi.h
> +++ b/drivers/gpu/drm/i915/display/intel_dsi.h
> @@ -29,6 +29,9 @@
>  
>  #include "intel_display_types.h"
>  
> +struct intel_dsi_host;
> +struct ref_tracker;
> +
>  #define INTEL_DSI_VIDEO_MODE	0
>  #define INTEL_DSI_COMMAND_MODE	1
>  
> @@ -37,13 +40,11 @@
>  #define DSI_DUAL_LINK_FRONT_BACK	1
>  #define DSI_DUAL_LINK_PIXEL_ALT		2
>  
> -struct intel_dsi_host;
> -
>  struct intel_dsi {
>  	struct intel_encoder base;
>  
>  	struct intel_dsi_host *dsi_hosts[I915_MAX_PORTS];
> -	intel_wakeref_t io_wakeref[I915_MAX_PORTS];
> +	struct ref_tracker *io_wakeref[I915_MAX_PORTS];
>  
>  	/* GPIO Desc for panel and backlight control */
>  	struct gpio_desc *gpio_panel;
> diff --git a/drivers/gpu/drm/i915/display/intel_gmbus.c b/drivers/gpu/drm/i915/display/intel_gmbus.c
> index acc85853b2a7..2caff677600c 100644
> --- a/drivers/gpu/drm/i915/display/intel_gmbus.c
> +++ b/drivers/gpu/drm/i915/display/intel_gmbus.c
> @@ -789,7 +789,7 @@ gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num)
>  {
>  	struct intel_gmbus *bus = to_intel_gmbus(adapter);
>  	struct intel_display *display = bus->display;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	int ret;
>  
>  	wakeref = intel_display_power_get(display, POWER_DOMAIN_GMBUS);
> @@ -829,7 +829,7 @@ int intel_gmbus_output_aksv(struct i2c_adapter *adapter)
>  			.buf = buf,
>  		}
>  	};
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	int ret;
>  
>  	wakeref = intel_display_power_get(display, POWER_DOMAIN_GMBUS);
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index 908faf17f93d..055e68810d0d 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -2518,7 +2518,7 @@ intel_hdmi_set_edid(struct drm_connector *_connector)
>  	struct intel_display *display = to_intel_display(connector);
>  	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
>  	struct i2c_adapter *ddc = connector->base.ddc;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	const struct drm_edid *drm_edid;
>  	bool connected = false;
>  
> @@ -2561,7 +2561,7 @@ intel_hdmi_detect(struct drm_connector *_connector, bool force)
>  	enum drm_connector_status status = connector_status_disconnected;
>  	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
>  	struct intel_encoder *encoder = &hdmi_to_dig_port(intel_hdmi)->base;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  
>  	drm_dbg_kms(display->drm, "[CONNECTOR:%d:%s]\n",
>  		    connector->base.base.id, connector->base.name);
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
> index 7575a063f7be..970aa95ee344 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
> @@ -785,7 +785,7 @@ static void i915_hpd_poll_init_work(struct work_struct *work)
>  		container_of(work, typeof(*display), hotplug.poll_init_work);
>  	struct drm_connector_list_iter conn_iter;
>  	struct intel_connector *connector;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool enabled;
>  
>  	mutex_lock(&display->drm->mode_config.mutex);
> diff --git a/drivers/gpu/drm/i915/display/intel_lt_phy.c b/drivers/gpu/drm/i915/display/intel_lt_phy.c
> index aaf5a2433690..939c8975fd4c 100644
> --- a/drivers/gpu/drm/i915/display/intel_lt_phy.c
> +++ b/drivers/gpu/drm/i915/display/intel_lt_phy.c
> @@ -1324,11 +1324,11 @@ intel_lt_phy_config_changed(struct intel_encoder *encoder,
>  	return true;
>  }
>  
> -static intel_wakeref_t intel_lt_phy_transaction_begin(struct intel_encoder *encoder)
> +static struct ref_tracker *intel_lt_phy_transaction_begin(struct intel_encoder *encoder)
>  {
>  	struct intel_display *display = to_intel_display(encoder);
>  	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  
>  	intel_psr_pause(intel_dp);
>  	wakeref = intel_display_power_get(display, POWER_DOMAIN_DC_OFF);
> @@ -1336,7 +1336,7 @@ static intel_wakeref_t intel_lt_phy_transaction_begin(struct intel_encoder *enco
>  	return wakeref;
>  }
>  
> -static void intel_lt_phy_transaction_end(struct intel_encoder *encoder, intel_wakeref_t wakeref)
> +static void intel_lt_phy_transaction_end(struct intel_encoder *encoder, struct ref_tracker *wakeref)
>  {
>  	struct intel_display *display = to_intel_display(encoder);
>  	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> @@ -1932,7 +1932,7 @@ void intel_lt_phy_pll_enable(struct intel_encoder *encoder,
>  	u8 owned_lane_mask = intel_lt_phy_get_owned_lane_mask(encoder);
>  	enum phy phy = intel_encoder_to_phy(encoder);
>  	enum port port = encoder->port;
> -	intel_wakeref_t wakeref = 0;
> +	struct ref_tracker *wakeref = 0;
>  	u32 lane_phy_pulse_status = owned_lane_mask == INTEL_LT_PHY_BOTH_LANES
>  					? (XE3PLPDP_LANE_PHY_PULSE_STATUS(0) |
>  					   XE3PLPDP_LANE_PHY_PULSE_STATUS(1))
> @@ -2060,7 +2060,7 @@ void intel_lt_phy_pll_disable(struct intel_encoder *encoder)
>  	struct intel_display *display = to_intel_display(encoder);
>  	enum phy phy = intel_encoder_to_phy(encoder);
>  	enum port port = encoder->port;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	u8 owned_lane_mask = intel_lt_phy_get_owned_lane_mask(encoder);
>  	u32 lane_pipe_reset = owned_lane_mask == INTEL_LT_PHY_BOTH_LANES
>  				? (XELPDP_LANE_PIPE_RESET(0) |
> @@ -2137,7 +2137,7 @@ void intel_lt_phy_set_signal_levels(struct intel_encoder *encoder,
>  	struct intel_display *display = to_intel_display(encoder);
>  	const struct intel_ddi_buf_trans *trans;
>  	u8 owned_lane_mask;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	int n_entries, ln;
>  	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
>  
> @@ -2222,7 +2222,7 @@ void intel_lt_phy_pll_readout_hw_state(struct intel_encoder *encoder,
>  {
>  	u8 owned_lane_mask;
>  	u8 lane;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	int i, j, k;
>  
>  	pll_state->tbt_mode = intel_tc_port_in_tbt_alt_mode(enc_to_dig_port(encoder));
> diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
> index 89aeb4fb340e..457d60863536 100644
> --- a/drivers/gpu/drm/i915/display/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/display/intel_lvds.c
> @@ -105,7 +105,7 @@ static bool intel_lvds_get_hw_state(struct intel_encoder *encoder,
>  {
>  	struct intel_display *display = to_intel_display(encoder);
>  	struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(encoder);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret;
>  
>  	wakeref = intel_display_power_get_if_enabled(display, encoder->power_domain);
> diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> index 0dcb0597879a..d10cbf69a5f8 100644
> --- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> +++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> @@ -940,7 +940,7 @@ void intel_modeset_setup_hw_state(struct intel_display *display,
>  {
>  	struct intel_encoder *encoder;
>  	struct intel_crtc *crtc;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  
>  	wakeref = intel_display_power_get(display, POWER_DOMAIN_INIT);
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_pipe_crc.c b/drivers/gpu/drm/i915/display/intel_pipe_crc.c
> index 71cb0178c8b1..57586c78582d 100644
> --- a/drivers/gpu/drm/i915/display/intel_pipe_crc.c
> +++ b/drivers/gpu/drm/i915/display/intel_pipe_crc.c
> @@ -588,7 +588,7 @@ int intel_crtc_set_crc_source(struct drm_crtc *_crtc, const char *source_name)
>  	enum intel_display_power_domain power_domain;
>  	enum intel_pipe_crc_source source;
>  	enum pipe pipe = crtc->pipe;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	u32 val = 0; /* shut up gcc */
>  	int ret = 0;
>  	bool enable;
> diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
> index 69b6873a6044..2d1c293aeff6 100644
> --- a/drivers/gpu/drm/i915/display/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/display/intel_sprite.c
> @@ -462,7 +462,7 @@ vlv_sprite_get_hw_state(struct intel_plane *plane,
>  	struct intel_display *display = to_intel_display(plane);
>  	enum intel_display_power_domain power_domain;
>  	enum plane_id plane_id = plane->id;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret;
>  
>  	power_domain = POWER_DOMAIN_PIPE(plane->pipe);
> @@ -893,7 +893,7 @@ ivb_sprite_get_hw_state(struct intel_plane *plane,
>  {
>  	struct intel_display *display = to_intel_display(plane);
>  	enum intel_display_power_domain power_domain;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret;
>  
>  	power_domain = POWER_DOMAIN_PIPE(plane->pipe);
> @@ -1233,7 +1233,7 @@ g4x_sprite_get_hw_state(struct intel_plane *plane,
>  {
>  	struct intel_display *display = to_intel_display(plane);
>  	enum intel_display_power_domain power_domain;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret;
>  
>  	power_domain = POWER_DOMAIN_PIPE(plane->pipe);
> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
> index c678216af352..064f572bbc85 100644
> --- a/drivers/gpu/drm/i915/display/intel_tc.c
> +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> @@ -51,7 +51,7 @@ struct intel_tc_port {
>  	const struct intel_tc_phy_ops *phy_ops;
>  
>  	struct mutex lock;	/* protects the TypeC port mode */
> -	intel_wakeref_t lock_wakeref;
> +	struct ref_tracker *lock_wakeref;
>  #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
>  	enum intel_display_power_domain lock_power_domain;
>  #endif
> @@ -182,7 +182,7 @@ bool intel_tc_cold_requires_aux_pw(struct intel_digital_port *dig_port)
>  	       intel_display_power_legacy_aux_domain(display, dig_port->aux_ch);
>  }
>  
> -static intel_wakeref_t
> +static struct ref_tracker *
>  __tc_cold_block(struct intel_tc_port *tc, enum intel_display_power_domain *domain)
>  {
>  	struct intel_display *display = to_intel_display(tc->dig_port);
> @@ -192,11 +192,11 @@ __tc_cold_block(struct intel_tc_port *tc, enum intel_display_power_domain *domai
>  	return intel_display_power_get(display, *domain);
>  }
>  
> -static intel_wakeref_t
> +static struct ref_tracker *
>  tc_cold_block(struct intel_tc_port *tc)
>  {
>  	enum intel_display_power_domain domain;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  
>  	wakeref = __tc_cold_block(tc, &domain);
>  #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)
> @@ -207,7 +207,7 @@ tc_cold_block(struct intel_tc_port *tc)
>  
>  static void
>  __tc_cold_unblock(struct intel_tc_port *tc, enum intel_display_power_domain domain,
> -		  intel_wakeref_t wakeref)
> +		  struct ref_tracker *wakeref)
>  {
>  	struct intel_display *display = to_intel_display(tc->dig_port);
>  
> @@ -215,7 +215,7 @@ __tc_cold_unblock(struct intel_tc_port *tc, enum intel_display_power_domain doma
>  }
>  
>  static void
> -tc_cold_unblock(struct intel_tc_port *tc, intel_wakeref_t wakeref)
> +tc_cold_unblock(struct intel_tc_port *tc, struct ref_tracker *wakeref)
>  {
>  	struct intel_display __maybe_unused *display = to_intel_display(tc->dig_port);
>  	enum intel_display_power_domain domain = tc_phy_cold_off_domain(tc);
> @@ -625,7 +625,7 @@ static bool icl_tc_phy_is_owned(struct intel_tc_port *tc)
>  static void icl_tc_phy_get_hw_state(struct intel_tc_port *tc)
>  {
>  	enum intel_display_power_domain domain;
> -	intel_wakeref_t tc_cold_wref;
> +	struct ref_tracker *tc_cold_wref;
>  
>  	tc_cold_wref = __tc_cold_block(tc, &domain);
>  
> @@ -892,7 +892,7 @@ static void adlp_tc_phy_get_hw_state(struct intel_tc_port *tc)
>  	struct intel_display *display = to_intel_display(tc->dig_port);
>  	enum intel_display_power_domain port_power_domain =
>  		tc_port_power_domain(tc);
> -	intel_wakeref_t port_wakeref;
> +	struct ref_tracker *port_wakeref;
>  
>  	port_wakeref = intel_display_power_get(display, port_power_domain);
>  
> @@ -911,7 +911,7 @@ static bool adlp_tc_phy_connect(struct intel_tc_port *tc, int required_lanes)
>  	struct intel_display *display = to_intel_display(tc->dig_port);
>  	enum intel_display_power_domain port_power_domain =
>  		tc_port_power_domain(tc);
> -	intel_wakeref_t port_wakeref;
> +	struct ref_tracker *port_wakeref;
>  
>  	if (tc->mode == TC_PORT_TBT_ALT) {
>  		tc->lock_wakeref = tc_cold_block(tc);
> @@ -963,7 +963,7 @@ static void adlp_tc_phy_disconnect(struct intel_tc_port *tc)
>  	struct intel_display *display = to_intel_display(tc->dig_port);
>  	enum intel_display_power_domain port_power_domain =
>  		tc_port_power_domain(tc);
> -	intel_wakeref_t port_wakeref;
> +	struct ref_tracker *port_wakeref;
>  
>  	port_wakeref = intel_display_power_get(display, port_power_domain);
>  
> @@ -1169,7 +1169,7 @@ static bool xelpdp_tc_phy_is_owned(struct intel_tc_port *tc)
>  static void xelpdp_tc_phy_get_hw_state(struct intel_tc_port *tc)
>  {
>  	struct intel_display *display = to_intel_display(tc->dig_port);
> -	intel_wakeref_t tc_cold_wref;
> +	struct ref_tracker *tc_cold_wref;
>  	enum intel_display_power_domain domain;
>  
>  	tc_cold_wref = __tc_cold_block(tc, &domain);
> diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c
> index 0e727fc5e80c..ad5fe841e4b3 100644
> --- a/drivers/gpu/drm/i915/display/intel_vdsc.c
> +++ b/drivers/gpu/drm/i915/display/intel_vdsc.c
> @@ -999,7 +999,7 @@ void intel_dsc_get_config(struct intel_crtc_state *crtc_state)
>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
>  	enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
>  	enum intel_display_power_domain power_domain;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	u32 dss_ctl1, dss_ctl2;
>  
>  	if (!intel_dsc_source_support(crtc_state))
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 89c8003ccfe7..0b5a1ec2f77a 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -939,7 +939,7 @@ skl_plane_get_hw_state(struct intel_plane *plane,
>  	struct intel_display *display = to_intel_display(plane);
>  	enum intel_display_power_domain power_domain;
>  	enum plane_id plane_id = plane->id;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	bool ret;
>  
>  	power_domain = POWER_DOMAIN_PIPE(plane->pipe);
> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
> index 7964cfffdaae..a6aab79812e5 100644
> --- a/drivers/gpu/drm/i915/display/skl_watermark.c
> +++ b/drivers/gpu/drm/i915/display/skl_watermark.c
> @@ -718,7 +718,7 @@ static void skl_pipe_ddb_get_hw_state(struct intel_crtc *crtc,
>  	struct intel_display *display = to_intel_display(crtc);
>  	enum intel_display_power_domain power_domain;
>  	enum pipe pipe = crtc->pipe;
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	enum plane_id plane_id;
>  
>  	power_domain = POWER_DOMAIN_PIPE(pipe);
> diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
> index 19bdd8662359..d705af3bf8ba 100644
> --- a/drivers/gpu/drm/i915/display/vlv_dsi.c
> +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
> @@ -936,7 +936,7 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
>  {
>  	struct intel_display *display = to_intel_display(encoder);
>  	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
> -	intel_wakeref_t wakeref;
> +	struct ref_tracker *wakeref;
>  	enum port port;
>  	bool active = false;
>  
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
> index 2a32faea9db5..910a8a60da64 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
> @@ -3,8 +3,4 @@
>   * Copyright © 2023 Intel Corporation
>   */
>  
> -#include <linux/types.h>
> -
> -typedef struct ref_tracker *intel_wakeref_t;
> -
>  #define INTEL_WAKEREF_DEF ERR_PTR(-ENOENT)
> diff --git a/drivers/gpu/drm/xe/display/xe_display_rpm.c b/drivers/gpu/drm/xe/display/xe_display_rpm.c
> index 340f65884812..9416ec784e39 100644
> --- a/drivers/gpu/drm/xe/display/xe_display_rpm.c
> +++ b/drivers/gpu/drm/xe/display/xe_display_rpm.c
> @@ -5,6 +5,7 @@
>  
>  #include "intel_display_core.h"
>  #include "intel_display_rpm.h"
> +#include "intel_wakeref.h"

Just to be sure this is not a stray change, why did you add it here?


>  #include "xe_device.h"
>  #include "xe_device_types.h"
>  #include "xe_pm.h"

Regardless:

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>

--
Cheers,
Luca.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v2 5/5] drm/{i915,xe}/display: drop intel_wakeref.h usage
  2025-11-25 13:24 ` [PATCH v2 5/5] drm/{i915,xe}/display: drop intel_wakeref.h usage Jani Nikula
@ 2025-12-01  8:17   ` Luca Coelho
  0 siblings, 0 replies; 16+ messages in thread
From: Luca Coelho @ 2025-12-01  8:17 UTC (permalink / raw)
  To: Jani Nikula, intel-gfx, intel-xe

On Tue, 2025-11-25 at 15:24 +0200, Jani Nikula wrote:
> Drop the display dependency on intel_wakeref.h header. The contract in
> the parent interface is that -ENOENT means there's no tracking. It
> doesn't actually require us to use a shared macro for it. Duplicate the
> macro in the few places that need this instead of inlining, primarily
> for documentation reasons.
> 
> This allows us to remove the xe compat intel_wakeref.h header.
> 
> v2: Define INTEL_WAKEREF_DEF in intel_display_power.h
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display_power.h     | 5 +++--
>  drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h | 6 ------
>  drivers/gpu/drm/xe/display/xe_display_rpm.c            | 4 +++-
>  3 files changed, 6 insertions(+), 9 deletions(-)
>  delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
> index 6f8d921b4482..d616d5d09cbe 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
> @@ -9,8 +9,6 @@
>  #include <linux/mutex.h>
>  #include <linux/workqueue.h>
>  
> -#include "intel_wakeref.h"
> -
>  enum aux_ch;
>  enum port;
>  struct i915_power_well;
> @@ -19,6 +17,9 @@ struct intel_encoder;
>  struct ref_tracker;
>  struct seq_file;
>  
> +/* -ENOENT means we got the ref, but there's no tracking */
> +#define INTEL_WAKEREF_DEF ERR_PTR(-ENOENT)
> +
>  /*
>   * Keep the pipe, transcoder, port (DDI_LANES,DDI_IO,AUX) domain instances
>   * consecutive, so that the pipe,transcoder,port -> power domain macros
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
> deleted file mode 100644
> index 910a8a60da64..000000000000
> --- a/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -/* SPDX-License-Identifier: MIT */
> -/*
> - * Copyright © 2023 Intel Corporation
> - */
> -
> -#define INTEL_WAKEREF_DEF ERR_PTR(-ENOENT)
> diff --git a/drivers/gpu/drm/xe/display/xe_display_rpm.c b/drivers/gpu/drm/xe/display/xe_display_rpm.c
> index 9416ec784e39..b3db40035499 100644
> --- a/drivers/gpu/drm/xe/display/xe_display_rpm.c
> +++ b/drivers/gpu/drm/xe/display/xe_display_rpm.c
> @@ -5,11 +5,13 @@
>  
>  #include "intel_display_core.h"
>  #include "intel_display_rpm.h"
> -#include "intel_wakeref.h"
>  #include "xe_device.h"
>  #include "xe_device_types.h"
>  #include "xe_pm.h"
>  
> +/* -ENOENT means we got the ref, but there's no tracking */
> +#define INTEL_WAKEREF_DEF ERR_PTR(-ENOENT)
> +
>  static struct ref_tracker *xe_display_rpm_get(const struct drm_device *drm)
>  {
>  	return xe_pm_runtime_resume_and_get(to_xe_device(drm)) ? INTEL_WAKEREF_DEF : NULL;

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>

--
Cheers,
Luca.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v2 4/5] drm/i915/power: convert intel_wakeref_t to struct ref_tracker *
  2025-12-01  8:15   ` Luca Coelho
@ 2025-12-01 12:25     ` Jani Nikula
  2025-12-01 12:28       ` Luca Coelho
  0 siblings, 1 reply; 16+ messages in thread
From: Jani Nikula @ 2025-12-01 12:25 UTC (permalink / raw)
  To: Luca Coelho, intel-gfx, intel-xe

On Mon, 01 Dec 2025, Luca Coelho <luca@coelho.fi> wrote:
> On Tue, 2025-11-25 at 15:24 +0200, Jani Nikula wrote:
>> diff --git a/drivers/gpu/drm/xe/display/xe_display_rpm.c b/drivers/gpu/drm/xe/display/xe_display_rpm.c
>> index 340f65884812..9416ec784e39 100644
>> --- a/drivers/gpu/drm/xe/display/xe_display_rpm.c
>> +++ b/drivers/gpu/drm/xe/display/xe_display_rpm.c
>> @@ -5,6 +5,7 @@
>>  
>>  #include "intel_display_core.h"
>>  #include "intel_display_rpm.h"
>> +#include "intel_wakeref.h"
>
> Just to be sure this is not a stray change, why did you add it here?

I was pretty sure it was required, maybe depending on some kconfig,
because the include is being removed in some other places, but I can't
reproduce the fail now.

I'd say not a huge problem because it's being removed in the next patch
no matter what.

BR,
Jani.


>
>
>>  #include "xe_device.h"
>>  #include "xe_device_types.h"
>>  #include "xe_pm.h"
>
> Regardless:
>
> Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
>
> --
> Cheers,
> Luca.

-- 
Jani Nikula, Intel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v2 4/5] drm/i915/power: convert intel_wakeref_t to struct ref_tracker *
  2025-12-01 12:25     ` Jani Nikula
@ 2025-12-01 12:28       ` Luca Coelho
  2025-12-01 13:38         ` Jani Nikula
  0 siblings, 1 reply; 16+ messages in thread
From: Luca Coelho @ 2025-12-01 12:28 UTC (permalink / raw)
  To: Jani Nikula, intel-gfx, intel-xe

On Mon, 2025-12-01 at 14:25 +0200, Jani Nikula wrote:
> On Mon, 01 Dec 2025, Luca Coelho <luca@coelho.fi> wrote:
> > On Tue, 2025-11-25 at 15:24 +0200, Jani Nikula wrote:
> > > diff --git a/drivers/gpu/drm/xe/display/xe_display_rpm.c b/drivers/gpu/drm/xe/display/xe_display_rpm.c
> > > index 340f65884812..9416ec784e39 100644
> > > --- a/drivers/gpu/drm/xe/display/xe_display_rpm.c
> > > +++ b/drivers/gpu/drm/xe/display/xe_display_rpm.c
> > > @@ -5,6 +5,7 @@
> > >  
> > >  #include "intel_display_core.h"
> > >  #include "intel_display_rpm.h"
> > > +#include "intel_wakeref.h"
> > 
> > Just to be sure this is not a stray change, why did you add it here?
> 
> I was pretty sure it was required, maybe depending on some kconfig,
> because the include is being removed in some other places, but I can't
> reproduce the fail now.
> 
> I'd say not a huge problem because it's being removed in the next patch
> no matter what.

Makes sense.  Thanks for the clarification. :)

--
Cheers,
Luca.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v2 4/5] drm/i915/power: convert intel_wakeref_t to struct ref_tracker *
  2025-12-01 12:28       ` Luca Coelho
@ 2025-12-01 13:38         ` Jani Nikula
  0 siblings, 0 replies; 16+ messages in thread
From: Jani Nikula @ 2025-12-01 13:38 UTC (permalink / raw)
  To: Luca Coelho, intel-gfx, intel-xe

On Mon, 01 Dec 2025, Luca Coelho <luca@coelho.fi> wrote:
> On Mon, 2025-12-01 at 14:25 +0200, Jani Nikula wrote:
>> On Mon, 01 Dec 2025, Luca Coelho <luca@coelho.fi> wrote:
>> > On Tue, 2025-11-25 at 15:24 +0200, Jani Nikula wrote:
>> > > diff --git a/drivers/gpu/drm/xe/display/xe_display_rpm.c b/drivers/gpu/drm/xe/display/xe_display_rpm.c
>> > > index 340f65884812..9416ec784e39 100644
>> > > --- a/drivers/gpu/drm/xe/display/xe_display_rpm.c
>> > > +++ b/drivers/gpu/drm/xe/display/xe_display_rpm.c
>> > > @@ -5,6 +5,7 @@
>> > >  
>> > >  #include "intel_display_core.h"
>> > >  #include "intel_display_rpm.h"
>> > > +#include "intel_wakeref.h"
>> > 
>> > Just to be sure this is not a stray change, why did you add it here?
>> 
>> I was pretty sure it was required, maybe depending on some kconfig,
>> because the include is being removed in some other places, but I can't
>> reproduce the fail now.
>> 
>> I'd say not a huge problem because it's being removed in the next patch
>> no matter what.
>
> Makes sense.  Thanks for the clarification. :)

Thanks for the review, pushed the series to din.

BR,
Jani.

-- 
Jani Nikula, Intel

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2025-12-01 13:38 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-25 13:24 [PATCH v2 0/5] drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * Jani Nikula
2025-11-25 13:24 ` [PATCH v2 1/5] drm/i915/pps: drop wakeref parameter from with_intel_pps_lock() Jani Nikula
2025-12-01  8:06   ` Luca Coelho
2025-11-25 13:24 ` [PATCH v2 2/5] drm/i915/pps: convert intel_wakeref_t to struct ref_tracker * Jani Nikula
2025-12-01  8:09   ` Luca Coelho
2025-11-25 13:24 ` [PATCH v2 3/5] drm/i915/power: drop wakeref parameter from with_intel_display_power*() Jani Nikula
2025-12-01  8:11   ` Luca Coelho
2025-11-25 13:24 ` [PATCH v2 4/5] drm/i915/power: convert intel_wakeref_t to struct ref_tracker * Jani Nikula
2025-12-01  8:15   ` Luca Coelho
2025-12-01 12:25     ` Jani Nikula
2025-12-01 12:28       ` Luca Coelho
2025-12-01 13:38         ` Jani Nikula
2025-11-25 13:24 ` [PATCH v2 5/5] drm/{i915,xe}/display: drop intel_wakeref.h usage Jani Nikula
2025-12-01  8:17   ` Luca Coelho
2025-11-25 14:18 ` ✓ i915.CI.BAT: success for drm/i915/display: switch from intel_wakeref_t to struct ref_tracker * (rev2) Patchwork
2025-11-26  2:30 ` ✗ i915.CI.Full: failure " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).