Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org
Subject: [PATCH 2/6] drm/i915/psr: Use hw.crtc instead of uapi.crtc
Date: Wed, 19 Nov 2025 20:16:02 +0200	[thread overview]
Message-ID: <20251119181606.17129-3-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20251119181606.17129-1-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

uapi.crtc is not set for joiner secondary pipes, so generally
should not be used anywhere after the initial state copy. Switch
to hw.crtc which actually indicates that the plane is enabled.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 00ac652809cc..22549b46467b 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -2707,7 +2707,7 @@ intel_psr2_sel_fetch_et_alignment(struct intel_atomic_state *state,
 	for_each_new_intel_plane_in_state(state, plane, new_plane_state, i) {
 		struct drm_rect inter;
 
-		if (new_plane_state->uapi.crtc != crtc_state->uapi.crtc)
+		if (new_plane_state->hw.crtc != crtc_state->uapi.crtc)
 			continue;
 
 		if (plane->id != PLANE_CURSOR)
@@ -2844,7 +2844,7 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,
 		struct drm_rect src, damaged_area = { .x1 = 0, .y1 = -1,
 						      .x2 = INT_MAX };
 
-		if (new_plane_state->uapi.crtc != crtc_state->uapi.crtc)
+		if (new_plane_state->hw.crtc != crtc_state->uapi.crtc)
 			continue;
 
 		if (!new_plane_state->uapi.visible &&
@@ -2943,7 +2943,7 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,
 		struct drm_rect *sel_fetch_area, inter;
 		struct intel_plane *linked = new_plane_state->planar_linked_plane;
 
-		if (new_plane_state->uapi.crtc != crtc_state->uapi.crtc ||
+		if (new_plane_state->hw.crtc != crtc_state->uapi.crtc ||
 		    !new_plane_state->uapi.visible)
 			continue;
 
-- 
2.49.1


  parent reply	other threads:[~2025-11-19 18:16 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-11-19 18:16 [PATCH 0/6] drm/i915: uapi vs. hw state fixes Ville Syrjala
2025-11-19 18:16 ` [PATCH 1/6] drm/i915: Use the proper (hw.crtc) for the cursor unpin vblank worker Ville Syrjala
2025-11-19 18:16 ` Ville Syrjala [this message]
2025-11-19 18:16 ` [PATCH 3/6] drm/i915/psr: Use hw.rotation instead of uapi.rotation Ville Syrjala
2025-11-19 18:16 ` [PATCH 4/6] drm/i915: Use hw.active instead of uapi.active in the initial plane readout Ville Syrjala
2025-11-19 18:16 ` [PATCH 5/6] drm/i915/panic: Get the crtc from the correct place Ville Syrjala
2025-11-19 18:16 ` [PATCH 6/6] drm/i915/panic: Clean up the variables Ville Syrjala
2025-11-19 18:30 ` ✓ CI.KUnit: success for drm/i915: uapi vs. hw state fixes Patchwork
2025-11-19 19:30 ` ✓ Xe.CI.BAT: " Patchwork
2025-11-19 23:04 ` ✓ Xe.CI.Full: " Patchwork
2025-11-25 19:41 ` [PATCH 0/6] " Jani Nikula

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251119181606.17129-3-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox