drm/i915: Add intel_bo_alloc_framebuffer()

Encapsulate the struct intel_framebuffer into an xe_framebuffer
or i915_framebuffer, and allow to add specific fields for each
variant for the panic use-case.
This is particularly needed to have a struct xe_res_cursor available
to support drm panic on discrete GPU.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://lore.kernel.org/r/20250624091501.257661-7-jfalempe@redhat.com
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>

diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
index e7e35fd4bdc375020d7d012d5bb04444f0044741..f291ced989dc197add3c2707864d0451cb041aca 100644 (file)
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -15,6 +15,7 @@
 #include "i9xx_plane.h"
 #include "i9xx_plane_regs.h"
 #include "intel_atomic.h"
+#include "intel_bo.h"
 #include "intel_de.h"
 #include "intel_display_irq.h"
 #include "intel_display_regs.h"
@@ -1174,7 +1175,7 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc,
 
        drm_WARN_ON(display->drm, pipe != crtc->pipe);
 
-       intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL);
+       intel_fb = intel_bo_alloc_framebuffer();
        if (!intel_fb) {
                drm_dbg_kms(display->drm, "failed to alloc fb\n");
                return;

diff --git a/drivers/gpu/drm/i915/display/intel_bo.c b/drivers/gpu/drm/i915/display/intel_bo.c
index fbd16d7b58d954b08a691b4391f5ffa759445cf8..bcf2eded7469fc411e3e66fd313cfa80ec3cf85e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bo.c
+++ b/drivers/gpu/drm/i915/display/intel_bo.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 /* Copyright © 2024 Intel Corporation */
 
+#include "display/intel_display_types.h"
 #include "gem/i915_gem_mman.h"
 #include "gem/i915_gem_object.h"
 #include "gem/i915_gem_object_frontbuffer.h"
@@ -57,3 +58,8 @@ void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj)
 {
        i915_debugfs_describe_obj(m, to_intel_bo(obj));
 }
+
+struct intel_framebuffer *intel_bo_alloc_framebuffer(void)
+{
+       return i915_gem_object_alloc_framebuffer();
+}

diff --git a/drivers/gpu/drm/i915/display/intel_bo.h b/drivers/gpu/drm/i915/display/intel_bo.h
index ea7a2253aaa57f85d393ff910339c1d4182272ff..315a81768c73dba49e615e868765c9601f150aa8 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bo.h
+++ b/drivers/gpu/drm/i915/display/intel_bo.h
@@ -7,6 +7,7 @@
 #include <linux/types.h>
 
 struct drm_gem_object;
+struct intel_framebuffer;
 struct seq_file;
 struct vm_area_struct;
 
@@ -23,5 +24,6 @@ struct intel_frontbuffer *intel_bo_set_frontbuffer(struct drm_gem_object *obj,
                                                   struct intel_frontbuffer *front);
 
 void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj);
+struct intel_framebuffer *intel_bo_alloc_framebuffer(void);
 
 #endif /* __INTEL_BO__ */

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 763b36c4de1055f76f93d20d618444f24dbe0dfc..6158031821fd64aea01a81852b60a14bd1797f27 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -2346,7 +2346,7 @@ intel_framebuffer_create(struct drm_gem_object *obj,
        struct intel_framebuffer *intel_fb;
        int ret;
 
-       intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL);
+       intel_fb = intel_bo_alloc_framebuffer();
        if (!intel_fb)
                return ERR_PTR(-ENOMEM);
 

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 1ba04f1b3ec05a685000c9de47bf4e4abe8ca373..cbd0521a201c7d3405a01f782e5c65920481538e 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -3029,7 +3029,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
                return;
        }
 
-       intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL);
+       intel_fb = intel_bo_alloc_framebuffer();
        if (!intel_fb) {
                drm_dbg_kms(display->drm, "failed to alloc fb\n");
                return;

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
index c34f41605b46b1282a1687a3ff81f9828aaffcd3..364941444a0a9e095c8e940912f1288630a9c7bc 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
@@ -17,6 +17,7 @@
 #include "i915_vma_types.h"
 
 enum intel_region_id;
+struct intel_framebuffer;
 
 #define obj_to_i915(obj__) to_i915((obj__)->base.dev)
 
@@ -691,6 +692,7 @@ i915_gem_object_unpin_pages(struct drm_i915_gem_object *obj)
 int __i915_gem_object_put_pages(struct drm_i915_gem_object *obj);
 int i915_gem_object_truncate(struct drm_i915_gem_object *obj);
 
+struct intel_framebuffer *i915_gem_object_alloc_framebuffer(void);
 /**
  * i915_gem_object_pin_map - return a contiguous mapping of the entire object
  * @obj: the object to map into kernel address space

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
index 7f83f8bdc8fbb62298d309b7c2640b7872c2e3c4..10b84970f17ffe78068f3029847f4efe2826437c 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
@@ -6,6 +6,7 @@
 #include <drm/drm_cache.h>
 #include <linux/vmalloc.h>
 
+#include "display/intel_display_types.h"
 #include "gt/intel_gt.h"
 #include "gt/intel_tlb.h"
 
@@ -354,6 +355,27 @@ static void *i915_gem_object_map_pfn(struct drm_i915_gem_object *obj,
        return vaddr ?: ERR_PTR(-ENOMEM);
 }
 
+struct i915_panic_data {
+       struct page **pages;
+       int page;
+       void *vaddr;
+};
+
+struct i915_framebuffer {
+       struct intel_framebuffer base;
+       struct i915_panic_data panic;
+};
+
+struct intel_framebuffer *i915_gem_object_alloc_framebuffer(void)
+{
+       struct i915_framebuffer *i915_fb;
+
+       i915_fb = kzalloc(sizeof(*i915_fb), GFP_KERNEL);
+       if (i915_fb)
+               return &i915_fb->base;
+       return NULL;
+}
+
 /* get, pin, and map the pages of the object into kernel space */
 void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj,
                              enum i915_map_type type)

diff --git a/drivers/gpu/drm/xe/display/intel_bo.c b/drivers/gpu/drm/xe/display/intel_bo.c
index 27437c22bd703a46f86c578e846b7cdcda7b32a5..926fcd9c86e1dcc4c830bb501cad2942ec52644d 100644 (file)
--- a/drivers/gpu/drm/xe/display/intel_bo.c
+++ b/drivers/gpu/drm/xe/display/intel_bo.c
@@ -3,6 +3,8 @@
 
 #include <drm/drm_gem.h>
 
+#include "intel_display_types.h"
+
 #include "xe_bo.h"
 #include "intel_bo.h"
 
@@ -59,3 +61,25 @@ void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj)
 {
        /* FIXME */
 }
+
+struct xe_panic_data {
+       struct page **pages;
+       int page;
+       void *vaddr;
+};
+
+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 = kzalloc(sizeof(*xe_fb), GFP_KERNEL);
+       if (xe_fb)
+               return &xe_fb->base;
+       return NULL;
+}
+