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 5/5] drm/i915: Add drm_panic support
Date: Tue, 3 Dec 2024 09:50:22 +0100 [thread overview]
Message-ID: <20241203092836.426422-6-jfalempe@redhat.com> (raw)
In-Reply-To: <20241203092836.426422-1-jfalempe@redhat.com>
This adds drm_panic support for a wide range of Intel GPU. I've
tested it only on 3 laptops, haswell (with 128MB of eDRAM),
cometlake and alderlake.
* DPT: if I disable tiling on a framebuffer using DPT, then it
displays some other memory location. As DPT is enabled only for
tiled framebuffer, there might be some hardware limitations.
* fbdev: On my haswell laptop, the fbdev framebuffer is configured
with tiling enabled, but really it's linear, because fbcon don't
know about tiling, and the panic screen is perfect when it's drawn
as linear.
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---
.../gpu/drm/i915/display/intel_atomic_plane.c | 85 ++++++++++++++++++-
1 file changed, 84 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index b7e462075ded3..58eb3b4c55fa5 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -33,16 +33,20 @@
#include <linux/dma-fence-chain.h>
#include <linux/dma-resv.h>
+#include <linux/iosys-map.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_blend.h>
+#include <drm/drm_cache.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_gem.h>
#include <drm/drm_gem_atomic_helper.h>
+#include <drm/drm_panic.h>
#include "i915_config.h"
#include "i9xx_plane_regs.h"
#include "intel_atomic_plane.h"
+#include "intel_bo.h"
#include "intel_cdclk.h"
#include "intel_cursor.h"
#include "intel_display_rps.h"
@@ -50,6 +54,7 @@
#include "intel_display_types.h"
#include "intel_fb.h"
#include "intel_fb_pin.h"
+#include "intel_fbdev.h"
#include "skl_scaler.h"
#include "skl_watermark.h"
@@ -1198,14 +1203,92 @@ intel_cleanup_plane_fb(struct drm_plane *plane,
intel_plane_unpin_fb(old_plane_state);
}
+/* Only used by drm_panic get_scanout_buffer() and panic_flush(), so it is
+ * protected by the drm panic spinlock
+ */
+static struct iosys_map panic_map;
+
+static void intel_panic_flush(struct drm_plane *plane)
+{
+ struct intel_plane_state *plane_state = to_intel_plane_state(plane->state);
+ struct drm_i915_private *dev_priv = to_i915(plane->dev);
+ struct drm_framebuffer *fb = plane_state->hw.fb;
+ struct intel_plane *iplane = to_intel_plane(plane);
+
+ /* Force a cache flush, otherwise the new pixels won't show up */
+ drm_clflush_virt_range(panic_map.vaddr, fb->height * fb->pitches[0]);
+
+ /* Don't disable tiling if it's the fbdev framebuffer.*/
+ if (to_intel_framebuffer(fb) == intel_fbdev_framebuffer(dev_priv->display.fbdev.fbdev))
+ return;
+
+ if (fb->modifier && iplane->disable_tiling)
+ iplane->disable_tiling(iplane);
+}
+
+static int intel_get_scanout_buffer(struct drm_plane *plane,
+ struct drm_scanout_buffer *sb)
+{
+ struct intel_plane_state *plane_state;
+ struct drm_gem_object *obj;
+ struct drm_framebuffer *fb;
+ struct drm_i915_private *dev_priv = to_i915(plane->dev);
+ void *ptr;
+
+ if (!plane->state || !plane->state->fb || !plane->state->visible)
+ return -ENODEV;
+
+ plane_state = to_intel_plane_state(plane->state);
+ fb = plane_state->hw.fb;
+ obj = intel_fb_bo(fb);
+ if (!obj)
+ return -ENODEV;
+
+ if (to_intel_framebuffer(fb) == intel_fbdev_framebuffer(dev_priv->display.fbdev.fbdev)) {
+ ptr = intel_fbdev_get_vaddr(dev_priv->display.fbdev.fbdev);
+ } else {
+ /* can't disable tiling if DPT is in use */
+ if (intel_bo_is_tiled(obj) && HAS_DPT(dev_priv))
+ return -EOPNOTSUPP;
+
+ ptr = intel_bo_panic_map(obj);
+ }
+
+ if (!ptr)
+ return -ENOMEM;
+
+ if (intel_bo_has_iomem(obj))
+ iosys_map_set_vaddr_iomem(&panic_map, ptr);
+ else
+ iosys_map_set_vaddr(&panic_map, ptr);
+
+ sb->map[0] = panic_map;
+ sb->width = fb->width;
+ sb->height = fb->height;
+ sb->format = fb->format;
+ sb->pitch[0] = fb->pitches[0];
+
+ return 0;
+}
+
static const struct drm_plane_helper_funcs intel_plane_helper_funcs = {
.prepare_fb = intel_prepare_plane_fb,
.cleanup_fb = intel_cleanup_plane_fb,
};
+static const struct drm_plane_helper_funcs intel_primary_plane_helper_funcs = {
+ .prepare_fb = intel_prepare_plane_fb,
+ .cleanup_fb = intel_cleanup_plane_fb,
+ .get_scanout_buffer = intel_get_scanout_buffer,
+ .panic_flush = intel_panic_flush,
+};
+
void intel_plane_helper_add(struct intel_plane *plane)
{
- drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);
+ if (plane->base.type == DRM_PLANE_TYPE_PRIMARY)
+ drm_plane_helper_add(&plane->base, &intel_primary_plane_helper_funcs);
+ else
+ drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);
}
void intel_plane_init_cursor_vblank_work(struct intel_plane_state *old_plane_state,
--
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 ` [PATCH v2 3/5] drm/i915/display: Add a disable_tiling() for skl planes Jocelyn Falempe
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 ` Jocelyn Falempe [this message]
2024-12-03 10:58 ` [PATCH v2 5/5] drm/i915: Add drm_panic support 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-6-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