From: Jocelyn Falempe <jfalempe@redhat.com>
To: Jani Nikula <jani.nikula@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Tvrtko Ursulin <tursulin@ursulin.net>,
David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>,
intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Cc: Jocelyn Falempe <jfalempe@redhat.com>
Subject: [PATCH v2 3/5] drm/i915/display: Add a disable_tiling() for skl planes
Date: Tue, 3 Dec 2024 09:50:20 +0100 [thread overview]
Message-ID: <20241203092836.426422-4-jfalempe@redhat.com> (raw)
In-Reply-To: <20241203092836.426422-1-jfalempe@redhat.com>
drm_panic draws in linear framebuffer, so it's easier to re-use the
current framebuffer, and disable tiling in the panic handler, to show
the panic screen.
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---
.../drm/i915/display/skl_universal_plane.c | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index a0a7ed01415a5..62aa40b6e2347 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -2560,6 +2560,25 @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
return caps;
}
+static void skl_disable_tiling(struct intel_plane *plane)
+{
+ u32 plane_ctl;
+ struct intel_plane_state *state = to_intel_plane_state(plane->base.state);
+ struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
+ u32 stride = state->view.color_plane[0].scanout_stride / 64;
+
+ plane_ctl = intel_de_read(dev_priv, PLANE_CTL(plane->pipe, plane->id));
+ plane_ctl &= ~PLANE_CTL_TILED_MASK;
+
+ intel_de_write_fw(dev_priv, PLANE_STRIDE(plane->pipe, plane->id),
+ PLANE_STRIDE_(stride));
+
+ intel_de_write_fw(dev_priv, PLANE_CTL(plane->pipe, plane->id), plane_ctl);
+
+ intel_de_write_fw(dev_priv, PLANE_SURF(plane->pipe, plane->id),
+ skl_plane_surf(state, 0));
+}
+
struct intel_plane *
skl_universal_plane_create(struct drm_i915_private *dev_priv,
enum pipe pipe, enum plane_id plane_id)
@@ -2601,6 +2620,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
plane->max_height = skl_plane_max_height;
plane->min_cdclk = skl_plane_min_cdclk;
}
+ plane->disable_tiling = skl_disable_tiling;
if (DISPLAY_VER(dev_priv) >= 13)
plane->max_stride = adl_plane_max_stride;
--
2.47.1
next prev parent reply other threads:[~2024-12-03 9:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-03 8:50 [RFC PATCH v2 0/5] drm/i915: Add drm_panic support Jocelyn Falempe
2024-12-03 8:50 ` [PATCH v2 1/5] drm/i915/fbdev: Add intel_fbdev_get_vaddr() Jocelyn Falempe
2024-12-04 14:03 ` kernel test robot
2024-12-03 8:50 ` [PATCH v2 2/5] drm/i915/display/i9xx: Add a disable_tiling() for i9xx planes Jocelyn Falempe
2024-12-03 8:50 ` Jocelyn Falempe [this message]
2024-12-03 8:50 ` [PATCH v2 4/5] drm/i915/gem: Add i915_gem_object_panic_map() Jocelyn Falempe
2024-12-03 8:50 ` [PATCH v2 5/5] drm/i915: Add drm_panic support Jocelyn Falempe
2024-12-03 10:58 ` Maarten Lankhorst
2024-12-03 14:49 ` Jocelyn Falempe
2024-12-03 9:42 ` ✓ CI.Patch_applied: success for drm/i915: Add drm_panic support (rev2) Patchwork
2024-12-03 9:42 ` ✓ CI.checkpatch: " Patchwork
2024-12-03 9:43 ` ✓ CI.KUnit: " Patchwork
2024-12-03 10:01 ` ✓ CI.Build: " Patchwork
2024-12-03 10:03 ` ✓ CI.Hooks: " Patchwork
2024-12-03 10:05 ` ✗ CI.checksparse: warning " Patchwork
2024-12-03 10:26 ` ✓ Xe.CI.BAT: success " Patchwork
2024-12-03 11:22 ` ✗ Xe.CI.Full: failure " Patchwork
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=20241203092836.426422-4-jfalempe@redhat.com \
--to=jfalempe@redhat.com \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=simona@ffwll.ch \
--cc=tursulin@ursulin.net \
/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