On 23/06/2025 09:40, Maarten Lankhorst wrote:
Hey,
Thanks for the series. I didn't see you on irc so I wanted to ask if you are
planning to send a v11 with
the changes from void * to struct intel_panic_data and adding the VRAM support?
Yes, I'm preparing a v11, and I'm considering to do something like this,
to allocate the panic data with the struct intel_framebuffer:
struct xe_framebuffer {
struct intel_framebuffer base;
struct xe_panic_data panic;
};
struct intel_framebuffer *intel_bo_alloc_framebuffer(void)
{
struct xe_framebuffer *xe_fb;
xe_fb = kmalloc(sizeof(struct xe_framebuffer), GFP_KERNEL);
return &xe_fb->base;
}
(And the same for i915).
That should allow you to add battlemage support.
Other than that, I think the series looks good and I'll be able to test it on
my battlemage.
Thanks
Best regards,
--
Jocelyn
Best regards,
~Maarten
On 2025-06-18 11:31, Jocelyn Falempe wrote:
This adds drm_panic support for i915 and xe driver.
I've tested it on the 4 intel laptops I have at my disposal.
* Haswell with 128MB of eDRAM.
* Comet Lake i7-10850H
* Raptor Lake i7-1370P (with DPT, and Y-tiling).
* Lunar Lake Ultra 5 228V (with DPT, and 4-tiling, and using the Xe driver.
I tested panic in both fbdev console and gnome desktop.
I think it won't work yet on discrete GPU, but that can be added later.
Best regards,
v2:
* Add the proper abstractions to build also for Xe.
* Fix dim checkpatch issues.
v3:
* Add support for Y-tiled framebuffer when DPT is enabled.
v4:
* Add support for Xe driver, which shares most of the code.
* Add support for 4-tiled framebuffer found in newest GPU.
v5:
* Rebase on top of g...@gitlab.freedesktop.org:drm/i915/kernel.git
drm-intel-next
* Use struct intel_display instead of drm_i915_private.
* Use iosys_map for intel_bo_panic_map().
v6:
* Rebase on top of g...@gitlab.freedesktop.org:drm/i915/kernel.git
drm-intel-next
* Use struct intel_display instead of drm_i915_private for
intel_atomic_plane.c
v7:
* Fix mismatch {} in intel_panic_flush() (Jani Nikula)
* Return int for i915_gem_object_panic_map() (Ville Syrjälä)
* Reword commit message about alignment/size when disabling tiling (Ville
Syrjälä)
v8:
* Use kmap_try_from_panic() instead of vmap, to access the framebuffer.
* Add ttm_bo_kmap_try_from_panic() for the xe driver, that uses ttm.
* Replace intel_bo_panic_map() with a setup() and finish() function,
to allow mapping only one page of teh framebuffer at a time.
* Configure psr to send the full framebuffer update.
v9:
* Fix comment in ttm_bo_kmap_try_from_panic(), this can *only* be called
from the panic handler (Christian König)
* Fix missing kfree() for i915_panic_pages in i915_gem_object_panic_finish()
Also change i915_panic_pages allocation to kmalloc, as kvmalloc is not
safe to call from the panic handler.
* Fix dim checkpatch warnings.
v10:
* Add a private field to struct drm_scanout_buffer
* Replace static variables with new fields in struct intel_framebuffer
(Maarten Lankhorst)
* Add error handling if i915_gem_object_panic_pages() returns NULL
* Declare struct drm_scanout_buffer instead of including <drm/drm_panic.h>
in intel_bo.h
Jocelyn Falempe (10):
drm/panic: Add a private field to struct drm_scanout_buffer
drm/i915/fbdev: Add intel_fbdev_get_map()
drm/i915/display/i9xx: Add a disable_tiling() for i9xx planes
drm/i915/display: Add a disable_tiling() for skl planes
drm/ttm: Add ttm_bo_kmap_try_from_panic()
drm/i915: Add intel_bo_panic_setup and intel_bo_panic_finish
drm/i915/display: Add drm_panic support
drm/i915/display: Add drm_panic support for Y-tiling with DPT
drm/i915/display: Add drm_panic support for 4-tiling with DPT
drm/i915/psr: Add intel_psr2_panic_force_full_update
drivers/gpu/drm/i915/display/i9xx_plane.c | 23 +++
.../gpu/drm/i915/display/intel_atomic_plane.c | 170 +++++++++++++++++-
drivers/gpu/drm/i915/display/intel_bo.c | 12 ++
drivers/gpu/drm/i915/display/intel_bo.h | 4 +
.../drm/i915/display/intel_display_types.h | 11 ++
drivers/gpu/drm/i915/display/intel_fb_pin.c | 5 +
drivers/gpu/drm/i915/display/intel_fb_pin.h | 2 +
drivers/gpu/drm/i915/display/intel_fbdev.c | 5 +
drivers/gpu/drm/i915/display/intel_fbdev.h | 6 +-
drivers/gpu/drm/i915/display/intel_psr.c | 20 +++
drivers/gpu/drm/i915/display/intel_psr.h | 2 +
.../drm/i915/display/skl_universal_plane.c | 27 +++
drivers/gpu/drm/i915/gem/i915_gem_object.h | 5 +
drivers/gpu/drm/i915/gem/i915_gem_pages.c | 112 ++++++++++++
drivers/gpu/drm/i915/i915_vma.h | 5 +
drivers/gpu/drm/ttm/ttm_bo_util.c | 27 +++
drivers/gpu/drm/xe/display/intel_bo.c | 61 +++++++
drivers/gpu/drm/xe/display/xe_fb_pin.c | 5 +
include/drm/drm_panic.h | 6 +
include/drm/ttm/ttm_bo.h | 1 +
20 files changed, 507 insertions(+), 2 deletions(-)
base-commit: b2f7e30d2e4a34fcee8111d713bef4f29dc23c77
