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 5/6] drm/i915/panic: Get the crtc from the correct place
Date: Wed, 19 Nov 2025 20:16:05 +0200	[thread overview]
Message-ID: <20251119181606.17129-6-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>

Use hw.crtc as opposed to uapi.crtc in the panic code. I suspect
this stuff doesn't handle joiner correctly in other ways either
but can't be bothered to dig deeper.

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

diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
index 870e6b896be6..6a3d4ddc52a1 100644
--- a/drivers/gpu/drm/i915/display/intel_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -1277,7 +1277,8 @@ static unsigned int intel_4tile_get_offset(unsigned int width, unsigned int x, u
 static void intel_panic_flush(struct drm_plane *plane)
 {
 	struct intel_plane_state *plane_state = to_intel_plane_state(plane->state);
-	struct intel_crtc_state *crtc_state = to_intel_crtc_state(plane->state->crtc->state);
+	struct intel_crtc *crtc = to_intel_crtc(plane_state->hw.crtc);
+	struct intel_crtc_state *crtc_state = to_intel_crtc_state(crtc->base.state);
 	struct intel_plane *iplane = to_intel_plane(plane);
 	struct intel_display *display = to_intel_display(iplane);
 	struct drm_framebuffer *fb = plane_state->hw.fb;
-- 
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 ` [PATCH 2/6] drm/i915/psr: Use hw.crtc instead of uapi.crtc Ville Syrjala
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 ` Ville Syrjala [this message]
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-6-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