Series comparison

-[RFC PATCH v4 0/8] drm/i915: Add drm_panic support
+[PATCH v6 0/8] drm/i915: Add drm_panic support
 This is a draft of drm_panic support for i915.
 I've tested it on the 4 intel laptops I have at my disposal.
  * Haswell with 128MB of eDRAM.
- * Comet Lake.
+ * Comet Lake  i7-10850H
- * Alder Lake (with DPT, and Y-tiling).
+ * Raptor Lake i7-1370P (with DPT, and Y-tiling).
- * Lunar Lake (with DPT, and 4-tiling, and using the Xe driver.
+ * 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.
 Best regards,
 ...
 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 git@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 git@gitlab.freedesktop.org:drm/i915/kernel.git drm-intel-next
+ * Use struct intel_display instead of drm_i915_private for intel_atomic_plane.c
 Jocelyn Falempe (8):
   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/i915/gem: Add i915_gem_object_panic_map()
   drm/i915/display: Add drm_panic support
   drm/i915/display: Flush the front buffer in panic handler
   drm/i915/display: Add drm_panic support for Y-tiling with DPT
-  drm/i915: Add drm_panic support for 4-tiling with DPT
+  drm/i915/display: Add drm_panic support for 4-tiling with DPT
  drivers/gpu/drm/i915/display/i9xx_plane.c     |  23 +++
- .../gpu/drm/i915/display/intel_atomic_plane.c | 177 +++++++++++++++++-
+ .../gpu/drm/i915/display/intel_atomic_plane.c | 169 +++++++++++++++++-
- drivers/gpu/drm/i915/display/intel_bo.c       |  10 +
+ drivers/gpu/drm/i915/display/intel_bo.c       |   5 +
- drivers/gpu/drm/i915/display/intel_bo.h       |   2 +
+ drivers/gpu/drm/i915/display/intel_bo.h       |   1 +
  .../drm/i915/display/intel_display_types.h    |   2 +
  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_fbdev.h    |   6 +-
  .../drm/i915/display/skl_universal_plane.c    |  27 +++
  drivers/gpu/drm/i915/gem/i915_gem_object.h    |   2 +
- drivers/gpu/drm/i915/gem/i915_gem_pages.c     |  25 +++
+ drivers/gpu/drm/i915/gem/i915_gem_pages.c     |  29 +++
  drivers/gpu/drm/i915/i915_vma.h               |   5 +
- drivers/gpu/drm/xe/display/intel_bo.c         |  17 ++
+ drivers/gpu/drm/xe/display/intel_bo.c         |  10 ++
  drivers/gpu/drm/xe/display/xe_fb_pin.c        |   5 +
-files changed, 312 insertions(+), 1 deletion(-)
+files changed, 294 insertions(+), 2 deletions(-)
-base-commit: ff3881cc6a588f8cd714c9ffbbcc9ef6b02c8d0f
+base-commit: 010363c4618920838ca8777fdabd46871d289bf9
 --
-.47.1
+.49.0

-[PATCH v4 1/8] drm/i915/fbdev: Add intel_fbdev_get_map()
+[PATCH v6 1/8] drm/i915/fbdev: Add intel_fbdev_get_map()
 ...
 requires a few functions to access fbdev->vma->iomap.
 Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
 ---
 v2:
  * Add intel_fb_get_vaddr() and i915_vma_get_iomap() to build with Xe driver.
 v4:
  * rename to get_map(), and return the struct iosys_map mapping.
  * implement the Xe variant.
  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_fbdev.h  | 6 +++++-
  drivers/gpu/drm/i915/i915_vma.h             | 5 +++++
  drivers/gpu/drm/xe/display/xe_fb_pin.c      | 5 +++++
-files changed, 28 insertions(+)
+files changed, 27 insertions(+), 1 deletion(-)
 diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
 +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
 ...
 +struct iosys_map;
  struct i915_vma *
  intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
 @@ -XXX,XX +XXX,XX @@ void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags);
+ int intel_plane_pin_fb(struct intel_plane_state *new_plane_state,
- int intel_plane_pin_fb(struct intel_plane_state *plane_state);
+                const struct intel_plane_state *old_plane_state);
  void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state);
 +void intel_fb_get_map(struct i915_vma *vma, struct iosys_map *map);
  #endif
 diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
 +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
-@@ -XXX,XX +XXX,XX @@ struct intel_framebuffer *intel_fbdev_framebuffer(struct intel_fbdev *fbdev)
+@@ -XXX,XX +XXX,XX @@ struct i915_vma *intel_fbdev_vma_pointer(struct intel_fbdev *fbdev)
+ {
-     return to_intel_framebuffer(fbdev->helper.fb);
+     return fbdev ? fbdev->vma : NULL;
  }
 +
 +void intel_fbdev_get_map(struct intel_fbdev *fbdev, struct iosys_map *map)
 +{
 +    intel_fb_get_map(fbdev->vma, map);
 +}
 diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.h b/drivers/gpu/drm/i915/display/intel_fbdev.h
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/gpu/drm/i915/display/intel_fbdev.h
 +++ b/drivers/gpu/drm/i915/display/intel_fbdev.h
-@@ -XXX,XX +XXX,XX @@ struct drm_device;
+@@ -XXX,XX +XXX,XX @@ struct drm_fb_helper_surface_size;
  struct drm_i915_private;
  struct intel_fbdev;
  struct intel_framebuffer;
 +struct iosys_map;
  #ifdef CONFIG_DRM_FBDEV_EMULATION
+ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
+@@ -XXX,XX +XXX,XX @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
  void intel_fbdev_setup(struct drm_i915_private *dev_priv);
- void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous);
  struct intel_framebuffer *intel_fbdev_framebuffer(struct intel_fbdev *fbdev);
+ struct i915_vma *intel_fbdev_vma_pointer(struct intel_fbdev *fbdev);
+-
 +void intel_fbdev_get_map(struct intel_fbdev *fbdev, struct iosys_map *map);
  #else
- static inline void intel_fbdev_setup(struct drm_i915_private *dev_priv)
+ #define INTEL_FBDEV_DRIVER_OPS \
- {
+     .fbdev_probe = NULL
-@@ -XXX,XX +XXX,XX @@ static inline struct intel_framebuffer *intel_fbdev_framebuffer(struct intel_fbd
+@@ -XXX,XX +XXX,XX @@ static inline struct i915_vma *intel_fbdev_vma_pointer(struct intel_fbdev *fbdev
  {
      return NULL;
  }
-+
 +static inline void intel_fbdev_get_map(struct intel_fbdev *fbdev, struct iosys_map *map)
 +{
 +}
  #endif
 ...
 +void intel_fb_get_map(struct i915_vma *vma, struct iosys_map *map)
 +{
 +    *map = vma->bo->vmap;
 +}
 --
-.47.1
+.49.0

-[PATCH v4 2/8] drm/i915/display/i9xx: Add a disable_tiling() for i9xx planes
+[PATCH v6 2/8] drm/i915/display/i9xx: Add a disable_tiling() for i9xx planes
 ...
      .format_mod_supported = i8xx_plane_format_mod_supported,
  };
 +static void i9xx_disable_tiling(struct intel_plane *plane)
 +{
-+    struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
++    struct intel_display *display = to_intel_display(plane);
 +    enum i9xx_plane_id i9xx_plane = plane->i9xx_plane;
 +    u32 dspcntr;
 +    u32 reg;
 +
-+    dspcntr = intel_de_read_fw(dev_priv, DSPCNTR(dev_priv, i9xx_plane));
++    dspcntr = intel_de_read_fw(display, DSPCNTR(display, i9xx_plane));
 +    dspcntr &= ~DISP_TILED;
-+    intel_de_write_fw(dev_priv, DSPCNTR(dev_priv, i9xx_plane), dspcntr);
++    intel_de_write_fw(display, DSPCNTR(display, i9xx_plane), dspcntr);
 +
-+    if (DISPLAY_VER(dev_priv) >= 4) {
++    if (DISPLAY_VER(display) >= 4) {
-+        reg = intel_de_read_fw(dev_priv, DSPSURF(dev_priv, i9xx_plane));
++        reg = intel_de_read_fw(display, DSPSURF(display, i9xx_plane));
-+        intel_de_write_fw(dev_priv, DSPSURF(dev_priv, i9xx_plane), reg);
++        intel_de_write_fw(display, DSPSURF(display, i9xx_plane), reg);
 +
 +    } else {
-+        reg = intel_de_read_fw(dev_priv, DSPADDR(dev_priv, i9xx_plane));
++        reg = intel_de_read_fw(display, DSPADDR(display, i9xx_plane));
-+        intel_de_write_fw(dev_priv, DSPADDR(dev_priv, i9xx_plane), reg);
++        intel_de_write_fw(display, DSPADDR(display, i9xx_plane), reg);
 +    }
 +}
 +
  struct intel_plane *
- intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
+ intel_primary_plane_create(struct intel_display *display, enum pipe pipe)
  {
-@@ -XXX,XX +XXX,XX @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
+@@ -XXX,XX +XXX,XX @@ intel_primary_plane_create(struct intel_display *display, enum pipe pipe)
-         plane->disable_flip_done = ilk_primary_disable_flip_done;
+         }
      }
 +    plane->disable_tiling = i9xx_disable_tiling;
 +
-     modifiers = intel_fb_plane_get_modifiers(dev_priv, INTEL_PLANE_CAP_TILING_X);
+     modifiers = intel_fb_plane_get_modifiers(display, INTEL_PLANE_CAP_TILING_X);
-     if (DISPLAY_VER(dev_priv) >= 5 || IS_G4X(dev_priv))
+     if (DISPLAY_VER(display) >= 5 || display->platform.g4x)
 diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/gpu/drm/i915/display/intel_display_types.h
 +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
 @@ -XXX,XX +XXX,XX @@ struct intel_plane {
 ...
 +    void (*disable_tiling)(struct intel_plane *plane);
  };
  #define to_intel_atomic_state(x) container_of(x, struct intel_atomic_state, base)
 --
-.47.1
+.49.0

-[PATCH v4 3/8] drm/i915/display: Add a disable_tiling() for skl planes
+[PATCH v6 3/8] drm/i915/display: Add a disable_tiling() for skl planes
 ...
 diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
 +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
-@@ -XXX,XX +XXX,XX @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
+@@ -XXX,XX +XXX,XX @@ static u8 tgl_plane_caps(struct intel_display *display,
      return caps;
  }
 +static void skl_disable_tiling(struct intel_plane *plane)
 +{
++    struct intel_plane_state *state = to_intel_plane_state(plane->base.state);
++    struct intel_display *display = to_intel_display(plane);
++    u32 stride = state->view.color_plane[0].scanout_stride / 64;
 +    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 = intel_de_read(display, PLANE_CTL(plane->pipe, plane->id));
 +    plane_ctl &= ~PLANE_CTL_TILED_MASK;
 +
-+    intel_de_write_fw(dev_priv, PLANE_STRIDE(plane->pipe, plane->id),
++    intel_de_write_fw(display, 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(display, PLANE_CTL(plane->pipe, plane->id), plane_ctl);
 +
-+    intel_de_write_fw(dev_priv, PLANE_SURF(plane->pipe, plane->id),
++    intel_de_write_fw(display, PLANE_SURF(plane->pipe, plane->id),
 +              skl_plane_surf(state, 0));
 +}
 +
  struct intel_plane *
- skl_universal_plane_create(struct drm_i915_private *dev_priv,
+ skl_universal_plane_create(struct intel_display *display,
                 enum pipe pipe, enum plane_id plane_id)
-@@ -XXX,XX +XXX,XX @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
+@@ -XXX,XX +XXX,XX @@ skl_universal_plane_create(struct intel_display *display,
          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)
+     if (DISPLAY_VER(display) >= 13)
          plane->max_stride = adl_plane_max_stride;
 --
-.47.1
+.49.0

-[PATCH v4 4/8] drm/i915/gem: Add i915_gem_object_panic_map()
+[PATCH v6 4/8] drm/i915/gem: Add i915_gem_object_panic_map()
 Prepare the work for drm_panic support. This is used to map the
 current framebuffer, so the CPU can overwrite it with the panic
 message.
 Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
 ---
- drivers/gpu/drm/i915/display/intel_bo.c    | 10 +++++++++
- drivers/gpu/drm/i915/display/intel_bo.h    |  2 ++
+v5:
  * Use iosys_map for intel_bo_panic_map().
  drivers/gpu/drm/i915/display/intel_bo.c    |  5 ++++
  drivers/gpu/drm/i915/display/intel_bo.h    |  1 +
  drivers/gpu/drm/i915/gem/i915_gem_object.h |  2 ++
- drivers/gpu/drm/i915/gem/i915_gem_pages.c  | 25 ++++++++++++++++++++++
+ drivers/gpu/drm/i915/gem/i915_gem_pages.c  | 29 ++++++++++++++++++++++
- drivers/gpu/drm/xe/display/intel_bo.c      | 17 +++++++++++++++
+ drivers/gpu/drm/xe/display/intel_bo.c      | 10 ++++++++
-files changed, 56 insertions(+)
+files changed, 47 insertions(+)
 diff --git a/drivers/gpu/drm/i915/display/intel_bo.c b/drivers/gpu/drm/i915/display/intel_bo.c
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/gpu/drm/i915/display/intel_bo.c
 +++ b/drivers/gpu/drm/i915/display/intel_bo.c
-@@ -XXX,XX +XXX,XX @@ bool intel_bo_is_shmem(struct drm_gem_object *obj)
-     return i915_gem_object_is_shmem(to_intel_bo(obj));
- }
-+bool intel_bo_has_iomem(struct drm_gem_object *obj)
-+{
-+    return i915_gem_object_has_iomem(to_intel_bo(obj));
-+}
-+
- bool intel_bo_is_protected(struct drm_gem_object *obj)
- {
-     return i915_gem_object_is_protected(to_intel_bo(obj));
 @@ -XXX,XX +XXX,XX @@ void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj)
  {
      i915_debugfs_describe_obj(m, to_intel_bo(obj));
  }
 +
-+void *intel_bo_panic_map(struct drm_gem_object *obj)
++void intel_bo_panic_map(struct drm_gem_object *obj, struct iosys_map *map)
 +{
-+    return i915_gem_object_panic_map(to_intel_bo(obj));
++    i915_gem_object_panic_map(to_intel_bo(obj), map);
 +}
 diff --git a/drivers/gpu/drm/i915/display/intel_bo.h b/drivers/gpu/drm/i915/display/intel_bo.h
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/gpu/drm/i915/display/intel_bo.h
 +++ b/drivers/gpu/drm/i915/display/intel_bo.h
-@@ -XXX,XX +XXX,XX @@ struct vm_area_struct;
- bool intel_bo_is_tiled(struct drm_gem_object *obj);
- bool intel_bo_is_userptr(struct drm_gem_object *obj);
- bool intel_bo_is_shmem(struct drm_gem_object *obj);
-+bool intel_bo_has_iomem(struct drm_gem_object *obj);
- bool intel_bo_is_protected(struct drm_gem_object *obj);
- void intel_bo_flush_if_display(struct drm_gem_object *obj);
- int intel_bo_fb_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
 @@ -XXX,XX +XXX,XX @@ 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);
-+void *intel_bo_panic_map(struct drm_gem_object *obj);
++void intel_bo_panic_map(struct drm_gem_object *obj, struct iosys_map *map);
  #endif /* __INTEL_BO__ */
 diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
 +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
 @@ -XXX,XX +XXX,XX @@ 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);
-+void *i915_gem_object_panic_map(struct drm_i915_gem_object *obj);
++void i915_gem_object_panic_map(struct drm_i915_gem_object *obj, struct iosys_map *map);
 +
  /**
   * 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
 ...
  }
 +/* Map the current framebuffer for CPU access. Called from panic handler, so no
 + * need to pin or cleanup.
 + */
-+void *i915_gem_object_panic_map(struct drm_i915_gem_object *obj)
++void i915_gem_object_panic_map(struct drm_i915_gem_object *obj, struct iosys_map *map)
 +{
 +    enum i915_map_type has_type;
 +    void *ptr;
 +
 +    ptr = page_unpack_bits(obj->mm.mapping, &has_type);
 +
-+    if (ptr)
-+        return ptr;
 +
-+    if (i915_gem_object_has_struct_page(obj))
++    if (!ptr) {
-+        ptr = i915_gem_object_map_page(obj, I915_MAP_WB);
++        if (i915_gem_object_has_struct_page(obj))
 +            ptr = i915_gem_object_map_page(obj, I915_MAP_WB);
 +        else
 +            ptr = i915_gem_object_map_pfn(obj, I915_MAP_WB);
 +
 +        if (IS_ERR(ptr))
 +            return;
 +
 +        obj->mm.mapping = page_pack_bits(ptr, I915_MAP_WB);
 +    }
 +
 +    if (i915_gem_object_has_iomem(obj))
 +        iosys_map_set_vaddr_iomem(map, (void __iomem *) ptr);
 +    else
-+        ptr = i915_gem_object_map_pfn(obj, I915_MAP_WB);
++        iosys_map_set_vaddr(map, ptr);
 +
 +    if (IS_ERR(ptr))
 +        return NULL;
 +
 +    obj->mm.mapping = page_pack_bits(ptr, I915_MAP_WB);
 +    return ptr;
 +}
 +
  /* 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 XXXXXXX..XXXXXXX 100644
 --- a/drivers/gpu/drm/xe/display/intel_bo.c
 +++ b/drivers/gpu/drm/xe/display/intel_bo.c
-@@ -XXX,XX +XXX,XX @@ bool intel_bo_is_shmem(struct drm_gem_object *obj)
-     return false;
- }
-+bool intel_bo_has_iomem(struct drm_gem_object *obj)
-+{
-+    return false;
-+}
-+
- bool intel_bo_is_protected(struct drm_gem_object *obj)
- {
-     return false;
 @@ -XXX,XX +XXX,XX @@ void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj)
  {
      /* FIXME */
  }
 +
-+void *intel_bo_panic_map(struct drm_gem_object *obj)
++void intel_bo_panic_map(struct drm_gem_object *obj, struct iosys_map *map)
 +{
 +    struct xe_bo *bo = gem_to_xe_bo(obj);
-+    struct iosys_map map;
 +    int ret;
 +
-+    ret = ttm_bo_vmap(&bo->ttm, &map);
++    ret = ttm_bo_vmap(&bo->ttm, map);
 +    if (ret)
-+        return NULL;
++        iosys_map_clear(map);
 +    return map.vaddr;
 +}
 --
-.47.1
+.49.0

-[PATCH v4 5/8] drm/i915/display: Add drm_panic support
+[PATCH v6 5/8] drm/i915/display: Add drm_panic support
 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),
+tested it only on 4 laptops, Haswell (with 128MB of eDRAM),
-Comet Lake, and Lunar Lake.
+Comet Lake, Raptor Lake, and Lunar Lake.
 For hardware using DPT, it's not possible to disable tiling, as you
 will need to reconfigure the way the GPU is accessing the
 framebuffer.
 Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
 ---
 v4:
  * Add support for Xe driver.
+v6:
+ * Use struct intel_display instead of drm_i915_private for intel_atomic_plane.c
- .../gpu/drm/i915/display/intel_atomic_plane.c | 88 ++++++++++++++++++-
+ .../gpu/drm/i915/display/intel_atomic_plane.c | 79 ++++++++++++++++++-
-file changed, 87 insertions(+), 1 deletion(-)
+file changed, 78 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 XXXXXXX..XXXXXXX 100644
 --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
 +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
 ...
  #include <linux/dma-resv.h>
 +#include <linux/iosys-map.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_blend.h>
+ #include <drm/drm_damage_helper.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_drv.h"
+ #include "gem/i915_gem_object.h"
  #include "i915_config.h"
+@@ -XXX,XX +XXX,XX @@
+ #include "i915_vma.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_types.h"
  #include "intel_fb.h"
  #include "intel_fb_pin.h"
 +#include "intel_fbdev.h"
  #include "skl_scaler.h"
+ #include "skl_universal_plane.h"
  #include "skl_watermark.h"
 @@ -XXX,XX +XXX,XX @@ 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
 ...
 +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 intel_plane *iplane = to_intel_plane(plane);
 +    struct intel_display *display = to_intel_display(iplane);
 +    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))
++    if (to_intel_framebuffer(fb) == intel_fbdev_framebuffer(display->fbdev.fbdev)) {
 +        return;
 +
 +    if (fb->modifier && iplane->disable_tiling)
 +        iplane->disable_tiling(iplane);
 +}
 ...
 +                    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);
++    struct intel_display *display = to_intel_display(plane->dev);
 +
 +    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;
 +
 +    iosys_map_clear(&panic_map);
-+    if (to_intel_framebuffer(fb) == intel_fbdev_framebuffer(dev_priv->display.fbdev.fbdev)) {
++    if (to_intel_framebuffer(fb) == intel_fbdev_framebuffer(display->fbdev.fbdev)) {
-+        intel_fbdev_get_map(dev_priv->display.fbdev.fbdev, &panic_map);
++        intel_fbdev_get_map(display->fbdev.fbdev, &panic_map);
 +        if (iosys_map_is_null(&panic_map))
 +            return -ENOMEM;
 +    } else {
-+        void *ptr;
 +        /* Can't disable tiling if DPT is in use */
 +        if (intel_fb_uses_dpt(fb))
 +            return -EOPNOTSUPP;
 +
-+        ptr = intel_bo_panic_map(obj);
++        intel_bo_panic_map(obj, &panic_map);
 +        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);
 +
 +    }
++    if (iosys_map_is_null(&panic_map))
++        return -ENOMEM;
 +
 +    sb->map[0] = panic_map;
 +    sb->width = fb->width;
 +    sb->height = fb->height;
 +    sb->format = fb->format;
 ...
 +        drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);
  }
  void intel_plane_init_cursor_vblank_work(struct intel_plane_state *old_plane_state,
 --
-.47.1
+.49.0

-[PATCH v4 6/8] drm/i915/display: Flush the front buffer in panic handler
+[PATCH v6 6/8] drm/i915/display: Flush the front buffer in panic handler
 ...
 It's probably not safe to do that in the panic handler, but that's
 still better than nothing.
 Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
 ---
- drivers/gpu/drm/i915/display/intel_atomic_plane.c | 9 ++++++++-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 7 +++++++
-file changed, 8 insertions(+), 1 deletion(-)
+file changed, 7 insertions(+)
 diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
 +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
 @@ -XXX,XX +XXX,XX @@
  #include "intel_fb.h"
  #include "intel_fb_pin.h"
  #include "intel_fbdev.h"
 +#include "intel_frontbuffer.h"
  #include "skl_scaler.h"
+ #include "skl_universal_plane.h"
  #include "skl_watermark.h"
 @@ -XXX,XX +XXX,XX @@ static void intel_panic_flush(struct drm_plane *plane)
-     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))
+     if (to_intel_framebuffer(fb) == intel_fbdev_framebuffer(display->fbdev.fbdev)) {
 +    if (to_intel_framebuffer(fb) == intel_fbdev_framebuffer(dev_priv->display.fbdev.fbdev)) {
 +        struct intel_frontbuffer *front = to_intel_frontbuffer(fb);
 +        struct drm_gem_object *obj = intel_fb_bo(fb);
 +
 +        intel_bo_flush_if_display(obj);
 +        intel_frontbuffer_flush(front, ORIGIN_DIRTYFB);
          return;
 +    }
      if (fb->modifier && iplane->disable_tiling)
          iplane->disable_tiling(iplane);
 --
-.47.1
+.49.0

-[PATCH v4 7/8] drm/i915/display: Add drm_panic support for Y-tiling with DPT
+[PATCH v6 7/8] drm/i915/display: Add drm_panic support for Y-tiling with DPT
-On Alderlake and later, it's not possible to disable tiling when DPT
+On Alder Lake and later, it's not possible to disable tiling when DPT
 is enabled.
 So this commit implements Y-Tiling support, to still be able to draw
 the panic screen.
 Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
 ---
- .../gpu/drm/i915/display/intel_atomic_plane.c | 70 +++++++++++++++++--
+ .../gpu/drm/i915/display/intel_atomic_plane.c | 69 ++++++++++++++++++-
- .../drm/i915/display/skl_universal_plane.c    | 17 +++--
+ .../drm/i915/display/skl_universal_plane.c    | 15 ++--
-files changed, 78 insertions(+), 9 deletions(-)
+files changed, 77 insertions(+), 7 deletions(-)
 diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
 +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
 ...
 +
  static int intel_get_scanout_buffer(struct drm_plane *plane,
                      struct drm_scanout_buffer *sb)
  {
 @@ -XXX,XX +XXX,XX @@ static int intel_get_scanout_buffer(struct drm_plane *plane,
+         intel_fbdev_get_map(display->fbdev.fbdev, &panic_map);
      } else {
-         void *ptr;
          /* Can't disable tiling if DPT is in use */
 -        if (intel_fb_uses_dpt(fb))
 -            return -EOPNOTSUPP;
--
 +        if (intel_fb_uses_dpt(fb)) {
 +            if (fb->format->cpp[0] != 4)
 +                return -EOPNOTSUPP;
 +            sb->set_pixel = intel_get_tiling_func(fb->modifier);
 +            if (!sb->set_pixel)
 +                return -EOPNOTSUPP;
 +        }
-         ptr = intel_bo_panic_map(obj);
-         if (!ptr)
+         intel_bo_panic_map(obj, &panic_map);
-             return -ENOMEM;
+     }
 @@ -XXX,XX +XXX,XX @@ static int intel_get_scanout_buffer(struct drm_plane *plane,
      sb->map[0] = panic_map;
      sb->width = fb->width;
      sb->height = fb->height;
 -    sb->format = fb->format;
 ...
      return 0;
 diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
 +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
-@@ -XXX,XX +XXX,XX @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
+@@ -XXX,XX +XXX,XX @@ static void skl_disable_tiling(struct intel_plane *plane)
  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);
+     struct intel_display *display = to_intel_display(plane);
 -    u32 stride = state->view.color_plane[0].scanout_stride / 64;
 +    const struct drm_framebuffer *fb = state->hw.fb;
-+    u32 plane_ctl;
+     u32 plane_ctl;
-     plane_ctl = intel_de_read(dev_priv, PLANE_CTL(plane->pipe, plane->id));
+     plane_ctl = intel_de_read(display, PLANE_CTL(plane->pipe, plane->id));
 -    plane_ctl &= ~PLANE_CTL_TILED_MASK;
--    intel_de_write_fw(dev_priv, PLANE_STRIDE(plane->pipe, plane->id),
+-    intel_de_write_fw(display, PLANE_STRIDE(plane->pipe, plane->id),
 -              PLANE_STRIDE_(stride));
 +    if (intel_fb_uses_dpt(fb)) {
 +        /* if DPT is enabled, keep tiling, but disable compression */
 +        plane_ctl &= ~PLANE_CTL_RENDER_DECOMPRESSION_ENABLE;
 +    } else {
 +        /* if DPT is not supported, disable tiling, and update stride */
 +        u32 stride = state->view.color_plane[0].scanout_stride / 64;
 +        plane_ctl &= ~PLANE_CTL_TILED_MASK;
-+        intel_de_write_fw(dev_priv, PLANE_STRIDE(plane->pipe, plane->id),
++        intel_de_write_fw(display, 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(display, PLANE_CTL(plane->pipe, plane->id), plane_ctl);
-     intel_de_write_fw(dev_priv, PLANE_SURF(plane->pipe, plane->id),
+     intel_de_write_fw(display, PLANE_SURF(plane->pipe, plane->id),
 --
-.47.1
+.49.0

-[PATCH v4 8/8] drm/i915: Add drm_panic support for 4-tiling with DPT
+[PATCH v6 8/8] drm/i915/display: Add drm_panic support for 4-tiling with DPT
-On Alderlake and later, it's not possible to disable tiling when DPT
+On Alder Lake and later, it's not possible to disable tiling when DPT
 is enabled.
 So this commit implements 4-Tiling support, to still be able to draw
 the panic screen.
 Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
 ...
 +    case I915_FORMAT_MOD_X_TILED:
      case I915_FORMAT_MOD_Yf_TILED:
      case I915_FORMAT_MOD_Yf_TILED_CCS:
      default:
 --
-.47.1
+.49.0

This is a draft of drm_panic support for i915.

I've tested it on the 4 intel laptops I have at my disposal.
 * Haswell with 128MB of eDRAM.
 * Comet Lake.
 * Alder Lake (with DPT, and Y-tiling).
 * Lunar Lake (with DPT, and 4-tiling, and using the Xe driver.

I tested panic in both fbdev console and gnome desktop.

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.

Jocelyn Falempe (8):
  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/i915/gem: Add i915_gem_object_panic_map()
  drm/i915/display: Add drm_panic support
  drm/i915/display: Flush the front buffer in panic handler
  drm/i915/display: Add drm_panic support for Y-tiling with DPT
  drm/i915: Add drm_panic support for 4-tiling with DPT

drivers/gpu/drm/i915/display/i9xx_plane.c     |  23 +++
 .../gpu/drm/i915/display/intel_atomic_plane.c | 177 +++++++++++++++++-
 drivers/gpu/drm/i915/display/intel_bo.c       |  10 +
 drivers/gpu/drm/i915/display/intel_bo.h       |   2 +
 .../drm/i915/display/intel_display_types.h    |   2 +
 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 +
 .../drm/i915/display/skl_universal_plane.c    |  27 +++
 drivers/gpu/drm/i915/gem/i915_gem_object.h    |   2 +
 drivers/gpu/drm/i915/gem/i915_gem_pages.c     |  25 +++
 drivers/gpu/drm/i915/i915_vma.h               |   5 +
 drivers/gpu/drm/xe/display/intel_bo.c         |  17 ++
 drivers/gpu/drm/xe/display/xe_fb_pin.c        |   5 +
 15 files changed, 312 insertions(+), 1 deletion(-)

base-commit: ff3881cc6a588f8cd714c9ffbbcc9ef6b02c8d0f
-- 
2.47.1

The vaddr of the fbdev framebuffer is private to the struct
intel_fbdev, so this function is needed to access it for drm_panic.
Also the struct i915_vma is different between i915 and xe, so it
requires a few functions to access fbdev->vma->iomap.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---

v2:
 * Add intel_fb_get_vaddr() and i915_vma_get_iomap() to build with Xe driver.
 
v4:
 * rename to get_map(), and return the struct iosys_map mapping.
 * implement the Xe variant.
 
 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/i915_vma.h             | 5 +++++
 drivers/gpu/drm/xe/display/xe_fb_pin.c      | 5 +++++
 6 files changed, 28 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
@@ -XXX,XX +XXX,XX @@ void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state)
 			intel_dpt_unpin_from_ggtt(fb->dpt_vm);
 	}
 }
+
+void intel_fb_get_map(struct i915_vma *vma, struct iosys_map *map)
+{
+	iosys_map_set_vaddr_iomem(map, i915_vma_get_iomap(vma));
+}
diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.h b/drivers/gpu/drm/i915/display/intel_fb_pin.h
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.h
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.h
@@ -XXX,XX +XXX,XX @@ struct drm_framebuffer;
 struct i915_vma;
 struct intel_plane_state;
 struct i915_gtt_view;
+struct iosys_map;
 
 struct i915_vma *
 intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
@@ -XXX,XX +XXX,XX @@ void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags);
 
 int intel_plane_pin_fb(struct intel_plane_state *plane_state);
 void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state);
+void intel_fb_get_map(struct i915_vma *vma, struct iosys_map *map);
 
 #endif
diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -XXX,XX +XXX,XX @@ struct intel_framebuffer *intel_fbdev_framebuffer(struct intel_fbdev *fbdev)
 
 	return to_intel_framebuffer(fbdev->helper.fb);
 }
+
+void intel_fbdev_get_map(struct intel_fbdev *fbdev, struct iosys_map *map)
+{
+	intel_fb_get_map(fbdev->vma, map);
+}
diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.h b/drivers/gpu/drm/i915/display/intel_fbdev.h
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_fbdev.h
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.h
@@ -XXX,XX +XXX,XX @@ struct drm_device;
 struct drm_i915_private;
 struct intel_fbdev;
 struct intel_framebuffer;
+struct iosys_map;
 
 #ifdef CONFIG_DRM_FBDEV_EMULATION
 void intel_fbdev_setup(struct drm_i915_private *dev_priv);
 void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous);
 struct intel_framebuffer *intel_fbdev_framebuffer(struct intel_fbdev *fbdev);
+void intel_fbdev_get_map(struct intel_fbdev *fbdev, struct iosys_map *map);
 #else
 static inline void intel_fbdev_setup(struct drm_i915_private *dev_priv)
 {
@@ -XXX,XX +XXX,XX @@ static inline struct intel_framebuffer *intel_fbdev_framebuffer(struct intel_fbd
 {
 	return NULL;
 }
+
+static inline void intel_fbdev_get_map(struct intel_fbdev *fbdev, struct iosys_map *map)
+{
+}
 #endif
 
 #endif /* __INTEL_FBDEV_H__ */
diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/i915_vma.h
+++ b/drivers/gpu/drm/i915/i915_vma.h
@@ -XXX,XX +XXX,XX @@ static inline bool i915_node_color_differs(const struct drm_mm_node *node,
 	return drm_mm_node_allocated(node) && node->color != color;
 }
 
+static inline void __iomem *i915_vma_get_iomap(struct i915_vma *vma)
+{
+	return READ_ONCE(vma->iomap);
+}
+
 /**
  * i915_vma_pin_iomap - calls ioremap_wc to map the GGTT VMA via the aperture
  * @vma: VMA to iomap
diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
+++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
@@ -XXX,XX +XXX,XX @@ u64 intel_dpt_offset(struct i915_vma *dpt_vma)
 {
 	return 0;
 }
+
+void intel_fb_get_map(struct i915_vma *vma, struct iosys_map *map)
+{
+	*map = vma->bo->vmap;
+}
-- 
2.47.1

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>
---
 drivers/gpu/drm/i915/display/i9xx_plane.c     | 23 +++++++++++++++++++
 .../drm/i915/display/intel_display_types.h    |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -XXX,XX +XXX,XX @@ static const struct drm_plane_funcs i8xx_plane_funcs = {
 	.format_mod_supported = i8xx_plane_format_mod_supported,
 };
 
+static void i9xx_disable_tiling(struct intel_plane *plane)
+{
+	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
+	enum i9xx_plane_id i9xx_plane = plane->i9xx_plane;
+	u32 dspcntr;
+	u32 reg;
+
+	dspcntr = intel_de_read_fw(dev_priv, DSPCNTR(dev_priv, i9xx_plane));
+	dspcntr &= ~DISP_TILED;
+	intel_de_write_fw(dev_priv, DSPCNTR(dev_priv, i9xx_plane), dspcntr);
+
+	if (DISPLAY_VER(dev_priv) >= 4) {
+		reg = intel_de_read_fw(dev_priv, DSPSURF(dev_priv, i9xx_plane));
+		intel_de_write_fw(dev_priv, DSPSURF(dev_priv, i9xx_plane), reg);
+
+	} else {
+		reg = intel_de_read_fw(dev_priv, DSPADDR(dev_priv, i9xx_plane));
+		intel_de_write_fw(dev_priv, DSPADDR(dev_priv, i9xx_plane), reg);
+	}
+}
+
 struct intel_plane *
 intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
 {
@@ -XXX,XX +XXX,XX @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
 		plane->disable_flip_done = ilk_primary_disable_flip_done;
 	}
 
+	plane->disable_tiling = i9xx_disable_tiling;
+
 	modifiers = intel_fb_plane_get_modifiers(dev_priv, INTEL_PLANE_CAP_TILING_X);
 
 	if (DISPLAY_VER(dev_priv) >= 5 || IS_G4X(dev_priv))
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -XXX,XX +XXX,XX @@ struct intel_plane {
 			   bool async_flip);
 	void (*enable_flip_done)(struct intel_plane *plane);
 	void (*disable_flip_done)(struct intel_plane *plane);
+	/* For drm_panic */
+	void (*disable_tiling)(struct intel_plane *plane);
 };
 
 #define to_intel_atomic_state(x) container_of(x, struct intel_atomic_state, base)
-- 
2.47.1

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 XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -XXX,XX +XXX,XX @@ 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)
@@ -XXX,XX +XXX,XX @@ 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

Prepare the work for drm_panic support. This is used to map the
current framebuffer, so the CPU can overwrite it with the panic
message.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---
 drivers/gpu/drm/i915/display/intel_bo.c    | 10 +++++++++
 drivers/gpu/drm/i915/display/intel_bo.h    |  2 ++
 drivers/gpu/drm/i915/gem/i915_gem_object.h |  2 ++
 drivers/gpu/drm/i915/gem/i915_gem_pages.c  | 25 ++++++++++++++++++++++
 drivers/gpu/drm/xe/display/intel_bo.c      | 17 +++++++++++++++
 5 files changed, 56 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_bo.c b/drivers/gpu/drm/i915/display/intel_bo.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_bo.c
+++ b/drivers/gpu/drm/i915/display/intel_bo.c
@@ -XXX,XX +XXX,XX @@ bool intel_bo_is_shmem(struct drm_gem_object *obj)
 	return i915_gem_object_is_shmem(to_intel_bo(obj));
 }
 
+bool intel_bo_has_iomem(struct drm_gem_object *obj)
+{
+	return i915_gem_object_has_iomem(to_intel_bo(obj));
+}
+
 bool intel_bo_is_protected(struct drm_gem_object *obj)
 {
 	return i915_gem_object_is_protected(to_intel_bo(obj));
@@ -XXX,XX +XXX,XX @@ void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj)
 {
 	i915_debugfs_describe_obj(m, to_intel_bo(obj));
 }
+
+void *intel_bo_panic_map(struct drm_gem_object *obj)
+{
+	return i915_gem_object_panic_map(to_intel_bo(obj));
+}
diff --git a/drivers/gpu/drm/i915/display/intel_bo.h b/drivers/gpu/drm/i915/display/intel_bo.h
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_bo.h
+++ b/drivers/gpu/drm/i915/display/intel_bo.h
@@ -XXX,XX +XXX,XX @@ struct vm_area_struct;
 bool intel_bo_is_tiled(struct drm_gem_object *obj);
 bool intel_bo_is_userptr(struct drm_gem_object *obj);
 bool intel_bo_is_shmem(struct drm_gem_object *obj);
+bool intel_bo_has_iomem(struct drm_gem_object *obj);
 bool intel_bo_is_protected(struct drm_gem_object *obj);
 void intel_bo_flush_if_display(struct drm_gem_object *obj);
 int intel_bo_fb_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
@@ -XXX,XX +XXX,XX @@ 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);
+void *intel_bo_panic_map(struct drm_gem_object *obj);
 
 #endif /* __INTEL_BO__ */
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
@@ -XXX,XX +XXX,XX @@ 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);
 
+void *i915_gem_object_panic_map(struct drm_i915_gem_object *obj);
+
 /**
  * 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 XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
@@ -XXX,XX +XXX,XX @@ static void *i915_gem_object_map_pfn(struct drm_i915_gem_object *obj,
 	return vaddr ?: ERR_PTR(-ENOMEM);
 }
 
+/* Map the current framebuffer for CPU access. Called from panic handler, so no
+ * need to pin or cleanup.
+ */
+void *i915_gem_object_panic_map(struct drm_i915_gem_object *obj)
+{
+	enum i915_map_type has_type;
+	void *ptr;
+
+	ptr = page_unpack_bits(obj->mm.mapping, &has_type);
+
+	if (ptr)
+		return ptr;
+
+	if (i915_gem_object_has_struct_page(obj))
+		ptr = i915_gem_object_map_page(obj, I915_MAP_WB);
+	else
+		ptr = i915_gem_object_map_pfn(obj, I915_MAP_WB);
+
+	if (IS_ERR(ptr))
+		return NULL;
+
+	obj->mm.mapping = page_pack_bits(ptr, I915_MAP_WB);
+	return ptr;
+}
+
 /* 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 XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/xe/display/intel_bo.c
+++ b/drivers/gpu/drm/xe/display/intel_bo.c
@@ -XXX,XX +XXX,XX @@ bool intel_bo_is_shmem(struct drm_gem_object *obj)
 	return false;
 }
 
+bool intel_bo_has_iomem(struct drm_gem_object *obj)
+{
+	return false;
+}
+
 bool intel_bo_is_protected(struct drm_gem_object *obj)
 {
 	return false;
@@ -XXX,XX +XXX,XX @@ void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj)
 {
 	/* FIXME */
 }
+
+void *intel_bo_panic_map(struct drm_gem_object *obj)
+{
+	struct xe_bo *bo = gem_to_xe_bo(obj);
+	struct iosys_map map;
+	int ret;
+
+	ret = ttm_bo_vmap(&bo->ttm, &map);
+	if (ret)
+		return NULL;
+	return map.vaddr;
+}
-- 
2.47.1

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),
Comet Lake, and Lunar Lake.
For hardware using DPT, it's not possible to disable tiling, as you
will need to reconfigure the way the GPU is accessing the
framebuffer.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---

v4:
 * Add support for Xe driver.

.../gpu/drm/i915/display/intel_atomic_plane.c | 88 ++++++++++++++++++-
 1 file changed, 87 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 XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -XXX,XX +XXX,XX @@
 
 #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_drv.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"
@@ -XXX,XX +XXX,XX @@
 #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"
 
@@ -XXX,XX +XXX,XX @@ 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);
+
+	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;
+
+	iosys_map_clear(&panic_map);
+	if (to_intel_framebuffer(fb) == intel_fbdev_framebuffer(dev_priv->display.fbdev.fbdev)) {
+		intel_fbdev_get_map(dev_priv->display.fbdev.fbdev, &panic_map);
+		if (iosys_map_is_null(&panic_map))
+			return -ENOMEM;
+	} else {
+		void *ptr;
+		/* Can't disable tiling if DPT is in use */
+		if (intel_fb_uses_dpt(fb))
+			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

On Lunar Lake, if the panic occurs when fbcon is active, the panic
screen is only partially visible on the screen. Adding this
intel_frontbuffer_flush() call solves the issue.
It's probably not safe to do that in the panic handler, but that's
still better than nothing.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---
 drivers/gpu/drm/i915/display/intel_atomic_plane.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

On Alderlake and later, it's not possible to disable tiling when DPT
is enabled.
So this commit implements Y-Tiling support, to still be able to draw
the panic screen.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---
 .../gpu/drm/i915/display/intel_atomic_plane.c | 70 +++++++++++++++++--
 .../drm/i915/display/skl_universal_plane.c    | 17 +++--
 2 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -XXX,XX +XXX,XX @@ intel_cleanup_plane_fb(struct drm_plane *plane,
  */
 static struct iosys_map panic_map;
 
+/* Handle Y-tiling, only if DPT is enabled (otherwise disabling tiling is easier)
+ * All DPT hardware have 128-bytes width tiling, so Y-tile dimension is 32x32
+ * pixels for 32bits pixels.
+ */
+#define YTILE_WIDTH	32
+#define YTILE_HEIGHT	32
+#define YTILE_SIZE (YTILE_WIDTH * YTILE_HEIGHT * 4)
+
+static void intel_ytile_set_pixel(struct drm_scanout_buffer *sb, unsigned int x, unsigned int y,
+				  u32 color)
+{
+	u32 offset;
+	unsigned int swizzle;
+	unsigned int width_in_blocks = DIV_ROUND_UP(sb->width, 32);
+
+	/* Block offset */
+	offset = ((y / YTILE_HEIGHT) * width_in_blocks + (x / YTILE_WIDTH)) * YTILE_SIZE;
+
+	x = x % YTILE_WIDTH;
+	y = y % YTILE_HEIGHT;
+
+	/* bit order inside a block is x4 x3 x2 y4 y3 y2 y1 y0 x1 x0 */
+	swizzle = (x & 3) | ((y & 0x1f) << 2) | ((x & 0x1c) << 5);
+	offset += swizzle * 4;
+	iosys_map_wr(&sb->map[0], offset, u32, color);
+}
+
 static void intel_panic_flush(struct drm_plane *plane)
 {
 	struct intel_plane_state *plane_state = to_intel_plane_state(plane->state);
@@ -XXX,XX +XXX,XX @@ static void intel_panic_flush(struct drm_plane *plane)
 		iplane->disable_tiling(iplane);
 }
 
+static void (*intel_get_tiling_func(u64 fb_modifier))(struct drm_scanout_buffer *sb, unsigned int x,
+						      unsigned int y, u32 color)
+{
+	switch (fb_modifier) {
+	case I915_FORMAT_MOD_Y_TILED:
+	case I915_FORMAT_MOD_Y_TILED_CCS:
+	case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
+	case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS:
+	case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS:
+		return intel_ytile_set_pixel;
+	case I915_FORMAT_MOD_X_TILED:
+	case I915_FORMAT_MOD_4_TILED:
+	case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS:
+	case I915_FORMAT_MOD_4_TILED_DG2_MC_CCS:
+	case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC:
+	case I915_FORMAT_MOD_4_TILED_MTL_RC_CCS:
+	case I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC:
+	case I915_FORMAT_MOD_4_TILED_MTL_MC_CCS:
+	case I915_FORMAT_MOD_4_TILED_BMG_CCS:
+	case I915_FORMAT_MOD_4_TILED_LNL_CCS:
+	case I915_FORMAT_MOD_Yf_TILED:
+	case I915_FORMAT_MOD_Yf_TILED_CCS:
+	default:
+	/* Not supported yet */
+		return NULL;
+	}
+}
+
 static int intel_get_scanout_buffer(struct drm_plane *plane,
 				    struct drm_scanout_buffer *sb)
 {
@@ -XXX,XX +XXX,XX @@ static int intel_get_scanout_buffer(struct drm_plane *plane,
 	} else {
 		void *ptr;
 		/* Can't disable tiling if DPT is in use */
-		if (intel_fb_uses_dpt(fb))
-			return -EOPNOTSUPP;
-
+		if (intel_fb_uses_dpt(fb)) {
+			if (fb->format->cpp[0] != 4)
+				return -EOPNOTSUPP;
+			sb->set_pixel = intel_get_tiling_func(fb->modifier);
+			if (!sb->set_pixel)
+				return -EOPNOTSUPP;
+		}
 		ptr = intel_bo_panic_map(obj);
 		if (!ptr)
 			return -ENOMEM;
@@ -XXX,XX +XXX,XX @@ static int intel_get_scanout_buffer(struct drm_plane *plane,
 	sb->map[0] = panic_map;
 	sb->width = fb->width;
 	sb->height = fb->height;
-	sb->format = fb->format;
+	/* Use the generic linear format, because tiling, RC, CCS, CC
+	 * will be disabled in disable_tiling()
+	 */
+	sb->format = drm_format_info(fb->format->format);
 	sb->pitch[0] = fb->pitches[0];
 
 	return 0;
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -XXX,XX +XXX,XX @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
 
 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;
+	const struct drm_framebuffer *fb = state->hw.fb;
+	u32 plane_ctl;
 
 	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));
+	if (intel_fb_uses_dpt(fb)) {
+		/* if DPT is enabled, keep tiling, but disable compression */
+		plane_ctl &= ~PLANE_CTL_RENDER_DECOMPRESSION_ENABLE;
+	} else {
+		/* if DPT is not supported, disable tiling, and update stride */
+		u32 stride = state->view.color_plane[0].scanout_stride / 64;
 
+		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),
-- 
2.47.1

On Alderlake and later, it's not possible to disable tiling when DPT
is enabled.
So this commit implements 4-Tiling support, to still be able to draw
the panic screen.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---
 .../gpu/drm/i915/display/intel_atomic_plane.c | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

This is a draft of drm_panic support for i915.

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.

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 git@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 git@gitlab.freedesktop.org:drm/i915/kernel.git drm-intel-next
 * Use struct intel_display instead of drm_i915_private for intel_atomic_plane.c

drivers/gpu/drm/i915/display/i9xx_plane.c     |  23 +++
 .../gpu/drm/i915/display/intel_atomic_plane.c | 169 +++++++++++++++++-
 drivers/gpu/drm/i915/display/intel_bo.c       |   5 +
 drivers/gpu/drm/i915/display/intel_bo.h       |   1 +
 .../drm/i915/display/intel_display_types.h    |   2 +
 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 +-
 .../drm/i915/display/skl_universal_plane.c    |  27 +++
 drivers/gpu/drm/i915/gem/i915_gem_object.h    |   2 +
 drivers/gpu/drm/i915/gem/i915_gem_pages.c     |  29 +++
 drivers/gpu/drm/i915/i915_vma.h               |   5 +
 drivers/gpu/drm/xe/display/intel_bo.c         |  10 ++
 drivers/gpu/drm/xe/display/xe_fb_pin.c        |   5 +
 15 files changed, 294 insertions(+), 2 deletions(-)

base-commit: 010363c4618920838ca8777fdabd46871d289bf9
-- 
2.49.0

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---

v2:
 * Add intel_fb_get_vaddr() and i915_vma_get_iomap() to build with Xe driver.
 
v4:
 * rename to get_map(), and return the struct iosys_map mapping.
 * implement the Xe variant.

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/i915_vma.h             | 5 +++++
 drivers/gpu/drm/xe/display/xe_fb_pin.c      | 5 +++++
 6 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
@@ -XXX,XX +XXX,XX @@ void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state)
 			intel_dpt_unpin_from_ggtt(fb->dpt_vm);
 	}
 }
+
+void intel_fb_get_map(struct i915_vma *vma, struct iosys_map *map)
+{
+	iosys_map_set_vaddr_iomem(map, i915_vma_get_iomap(vma));
+}
diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.h b/drivers/gpu/drm/i915/display/intel_fb_pin.h
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.h
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.h
@@ -XXX,XX +XXX,XX @@ struct drm_framebuffer;
 struct i915_vma;
 struct intel_plane_state;
 struct i915_gtt_view;
+struct iosys_map;
 
 struct i915_vma *
 intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
@@ -XXX,XX +XXX,XX @@ void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags);
 int intel_plane_pin_fb(struct intel_plane_state *new_plane_state,
 		       const struct intel_plane_state *old_plane_state);
 void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state);
+void intel_fb_get_map(struct i915_vma *vma, struct iosys_map *map);
 
 #endif
diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -XXX,XX +XXX,XX @@ struct i915_vma *intel_fbdev_vma_pointer(struct intel_fbdev *fbdev)
 {
 	return fbdev ? fbdev->vma : NULL;
 }
+
+void intel_fbdev_get_map(struct intel_fbdev *fbdev, struct iosys_map *map)
+{
+	intel_fb_get_map(fbdev->vma, map);
+}
diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.h b/drivers/gpu/drm/i915/display/intel_fbdev.h
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_fbdev.h
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.h
@@ -XXX,XX +XXX,XX @@ struct drm_fb_helper_surface_size;
 struct drm_i915_private;
 struct intel_fbdev;
 struct intel_framebuffer;
+struct iosys_map;
 
 #ifdef CONFIG_DRM_FBDEV_EMULATION
 int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
@@ -XXX,XX +XXX,XX @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
 void intel_fbdev_setup(struct drm_i915_private *dev_priv);
 struct intel_framebuffer *intel_fbdev_framebuffer(struct intel_fbdev *fbdev);
 struct i915_vma *intel_fbdev_vma_pointer(struct intel_fbdev *fbdev);
-
+void intel_fbdev_get_map(struct intel_fbdev *fbdev, struct iosys_map *map);
 #else
 #define INTEL_FBDEV_DRIVER_OPS \
 	.fbdev_probe = NULL
@@ -XXX,XX +XXX,XX @@ static inline struct i915_vma *intel_fbdev_vma_pointer(struct intel_fbdev *fbdev
 	return NULL;
 }
 
+static inline void intel_fbdev_get_map(struct intel_fbdev *fbdev, struct iosys_map *map)
+{
+}
 #endif
 
 #endif /* __INTEL_FBDEV_H__ */
diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/i915_vma.h
+++ b/drivers/gpu/drm/i915/i915_vma.h
@@ -XXX,XX +XXX,XX @@ static inline bool i915_node_color_differs(const struct drm_mm_node *node,
 	return drm_mm_node_allocated(node) && node->color != color;
 }
 
+static inline void __iomem *i915_vma_get_iomap(struct i915_vma *vma)
+{
+	return READ_ONCE(vma->iomap);
+}
+
 /**
  * i915_vma_pin_iomap - calls ioremap_wc to map the GGTT VMA via the aperture
  * @vma: VMA to iomap
diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
+++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
@@ -XXX,XX +XXX,XX @@ u64 intel_dpt_offset(struct i915_vma *dpt_vma)
 {
 	return 0;
 }
+
+void intel_fb_get_map(struct i915_vma *vma, struct iosys_map *map)
+{
+	*map = vma->bo->vmap;
+}
-- 
2.49.0

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.

diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -XXX,XX +XXX,XX @@ static const struct drm_plane_funcs i8xx_plane_funcs = {
 	.format_mod_supported = i8xx_plane_format_mod_supported,
 };
 
+static void i9xx_disable_tiling(struct intel_plane *plane)
+{
+	struct intel_display *display = to_intel_display(plane);
+	enum i9xx_plane_id i9xx_plane = plane->i9xx_plane;
+	u32 dspcntr;
+	u32 reg;
+
+	dspcntr = intel_de_read_fw(display, DSPCNTR(display, i9xx_plane));
+	dspcntr &= ~DISP_TILED;
+	intel_de_write_fw(display, DSPCNTR(display, i9xx_plane), dspcntr);
+
+	if (DISPLAY_VER(display) >= 4) {
+		reg = intel_de_read_fw(display, DSPSURF(display, i9xx_plane));
+		intel_de_write_fw(display, DSPSURF(display, i9xx_plane), reg);
+
+	} else {
+		reg = intel_de_read_fw(display, DSPADDR(display, i9xx_plane));
+		intel_de_write_fw(display, DSPADDR(display, i9xx_plane), reg);
+	}
+}
+
 struct intel_plane *
 intel_primary_plane_create(struct intel_display *display, enum pipe pipe)
 {
@@ -XXX,XX +XXX,XX @@ intel_primary_plane_create(struct intel_display *display, enum pipe pipe)
 		}
 	}
 
+	plane->disable_tiling = i9xx_disable_tiling;
+
 	modifiers = intel_fb_plane_get_modifiers(display, INTEL_PLANE_CAP_TILING_X);
 
 	if (DISPLAY_VER(display) >= 5 || display->platform.g4x)
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -XXX,XX +XXX,XX @@ struct intel_plane {
 			   bool async_flip);
 	void (*enable_flip_done)(struct intel_plane *plane);
 	void (*disable_flip_done)(struct intel_plane *plane);
+	/* For drm_panic */
+	void (*disable_tiling)(struct intel_plane *plane);
 };
 
 #define to_intel_atomic_state(x) container_of(x, struct intel_atomic_state, base)
-- 
2.49.0

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 XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -XXX,XX +XXX,XX @@ static u8 tgl_plane_caps(struct intel_display *display,
 	return caps;
 }
 
+static void skl_disable_tiling(struct intel_plane *plane)
+{
+	struct intel_plane_state *state = to_intel_plane_state(plane->base.state);
+	struct intel_display *display = to_intel_display(plane);
+	u32 stride = state->view.color_plane[0].scanout_stride / 64;
+	u32 plane_ctl;
+
+	plane_ctl = intel_de_read(display, PLANE_CTL(plane->pipe, plane->id));
+	plane_ctl &= ~PLANE_CTL_TILED_MASK;
+
+	intel_de_write_fw(display, PLANE_STRIDE(plane->pipe, plane->id),
+			  PLANE_STRIDE_(stride));
+
+	intel_de_write_fw(display, PLANE_CTL(plane->pipe, plane->id), plane_ctl);
+
+	intel_de_write_fw(display, PLANE_SURF(plane->pipe, plane->id),
+			  skl_plane_surf(state, 0));
+}
+
 struct intel_plane *
 skl_universal_plane_create(struct intel_display *display,
 			   enum pipe pipe, enum plane_id plane_id)
@@ -XXX,XX +XXX,XX @@ skl_universal_plane_create(struct intel_display *display,
 		plane->max_height = skl_plane_max_height;
 		plane->min_cdclk = skl_plane_min_cdclk;
 	}
+	plane->disable_tiling = skl_disable_tiling;
 
 	if (DISPLAY_VER(display) >= 13)
 		plane->max_stride = adl_plane_max_stride;
-- 
2.49.0

Prepare the work for drm_panic support. This is used to map the
current framebuffer, so the CPU can overwrite it with the panic
message.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---

v5:
 * Use iosys_map for intel_bo_panic_map().

drivers/gpu/drm/i915/display/intel_bo.c    |  5 ++++
 drivers/gpu/drm/i915/display/intel_bo.h    |  1 +
 drivers/gpu/drm/i915/gem/i915_gem_object.h |  2 ++
 drivers/gpu/drm/i915/gem/i915_gem_pages.c  | 29 ++++++++++++++++++++++
 drivers/gpu/drm/xe/display/intel_bo.c      | 10 ++++++++
 5 files changed, 47 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_bo.c b/drivers/gpu/drm/i915/display/intel_bo.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_bo.c
+++ b/drivers/gpu/drm/i915/display/intel_bo.c
@@ -XXX,XX +XXX,XX @@ void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj)
 {
 	i915_debugfs_describe_obj(m, to_intel_bo(obj));
 }
+
+void intel_bo_panic_map(struct drm_gem_object *obj, struct iosys_map *map)
+{
+	i915_gem_object_panic_map(to_intel_bo(obj), map);
+}
diff --git a/drivers/gpu/drm/i915/display/intel_bo.h b/drivers/gpu/drm/i915/display/intel_bo.h
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_bo.h
+++ b/drivers/gpu/drm/i915/display/intel_bo.h
@@ -XXX,XX +XXX,XX @@ 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);
+void intel_bo_panic_map(struct drm_gem_object *obj, struct iosys_map *map);
 
 #endif /* __INTEL_BO__ */
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
@@ -XXX,XX +XXX,XX @@ 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);
 
+void i915_gem_object_panic_map(struct drm_i915_gem_object *obj, struct iosys_map *map);
+
 /**
  * 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 XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
@@ -XXX,XX +XXX,XX @@ static void *i915_gem_object_map_pfn(struct drm_i915_gem_object *obj,
 	return vaddr ?: ERR_PTR(-ENOMEM);
 }
 
+/* Map the current framebuffer for CPU access. Called from panic handler, so no
+ * need to pin or cleanup.
+ */
+void i915_gem_object_panic_map(struct drm_i915_gem_object *obj, struct iosys_map *map)
+{
+	enum i915_map_type has_type;
+	void *ptr;
+
+	ptr = page_unpack_bits(obj->mm.mapping, &has_type);
+
+
+	if (!ptr) {
+		if (i915_gem_object_has_struct_page(obj))
+			ptr = i915_gem_object_map_page(obj, I915_MAP_WB);
+		else
+			ptr = i915_gem_object_map_pfn(obj, I915_MAP_WB);
+
+		if (IS_ERR(ptr))
+			return;
+
+		obj->mm.mapping = page_pack_bits(ptr, I915_MAP_WB);
+	}
+
+	if (i915_gem_object_has_iomem(obj))
+		iosys_map_set_vaddr_iomem(map, (void __iomem *) ptr);
+	else
+		iosys_map_set_vaddr(map, ptr);
+}
+
 /* 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 XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/xe/display/intel_bo.c
+++ b/drivers/gpu/drm/xe/display/intel_bo.c
@@ -XXX,XX +XXX,XX @@ void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj)
 {
 	/* FIXME */
 }
+
+void intel_bo_panic_map(struct drm_gem_object *obj, struct iosys_map *map)
+{
+	struct xe_bo *bo = gem_to_xe_bo(obj);
+	int ret;
+
+	ret = ttm_bo_vmap(&bo->ttm, map);
+	if (ret)
+		iosys_map_clear(map);
+}
-- 
2.49.0

This adds drm_panic support for a wide range of Intel GPU. I've
tested it only on 4 laptops, Haswell (with 128MB of eDRAM),
Comet Lake, Raptor Lake, and Lunar Lake.
For hardware using DPT, it's not possible to disable tiling, as you
will need to reconfigure the way the GPU is accessing the
framebuffer.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---

v4:
 * Add support for Xe driver.
 
v6:
 * Use struct intel_display instead of drm_i915_private for intel_atomic_plane.c

.../gpu/drm/i915/display/intel_atomic_plane.c | 79 ++++++++++++++++++-
 1 file changed, 78 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 XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -XXX,XX +XXX,XX @@
 
 #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_damage_helper.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 "gem/i915_gem_object.h"
 #include "i915_config.h"
@@ -XXX,XX +XXX,XX @@
 #include "i915_vma.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"
@@ -XXX,XX +XXX,XX @@
 #include "intel_display_types.h"
 #include "intel_fb.h"
 #include "intel_fb_pin.h"
+#include "intel_fbdev.h"
 #include "skl_scaler.h"
 #include "skl_universal_plane.h"
 #include "skl_watermark.h"
@@ -XXX,XX +XXX,XX @@ 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 intel_plane *iplane = to_intel_plane(plane);
+	struct intel_display *display = to_intel_display(iplane);
+	struct drm_framebuffer *fb = plane_state->hw.fb;
+
+	/* 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(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 intel_display *display = to_intel_display(plane->dev);
+
+	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;
+
+	iosys_map_clear(&panic_map);
+	if (to_intel_framebuffer(fb) == intel_fbdev_framebuffer(display->fbdev.fbdev)) {
+		intel_fbdev_get_map(display->fbdev.fbdev, &panic_map);
+	} else {
+		/* Can't disable tiling if DPT is in use */
+		if (intel_fb_uses_dpt(fb))
+			return -EOPNOTSUPP;
+
+		intel_bo_panic_map(obj, &panic_map);
+	}
+	if (iosys_map_is_null(&panic_map))
+		return -ENOMEM;
+
+	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.49.0

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---
 drivers/gpu/drm/i915/display/intel_atomic_plane.c | 7 +++++++
 1 file changed, 7 insertions(+)

On Alder Lake and later, it's not possible to disable tiling when DPT
is enabled.
So this commit implements Y-Tiling support, to still be able to draw
the panic screen.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---
 .../gpu/drm/i915/display/intel_atomic_plane.c | 69 ++++++++++++++++++-
 .../drm/i915/display/skl_universal_plane.c    | 15 ++--
 2 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -XXX,XX +XXX,XX @@ intel_cleanup_plane_fb(struct drm_plane *plane,
  */
 static struct iosys_map panic_map;
 
+/* Handle Y-tiling, only if DPT is enabled (otherwise disabling tiling is easier)
+ * All DPT hardware have 128-bytes width tiling, so Y-tile dimension is 32x32
+ * pixels for 32bits pixels.
+ */
+#define YTILE_WIDTH	32
+#define YTILE_HEIGHT	32
+#define YTILE_SIZE (YTILE_WIDTH * YTILE_HEIGHT * 4)
+
+static void intel_ytile_set_pixel(struct drm_scanout_buffer *sb, unsigned int x, unsigned int y,
+				  u32 color)
+{
+	u32 offset;
+	unsigned int swizzle;
+	unsigned int width_in_blocks = DIV_ROUND_UP(sb->width, 32);
+
+	/* Block offset */
+	offset = ((y / YTILE_HEIGHT) * width_in_blocks + (x / YTILE_WIDTH)) * YTILE_SIZE;
+
+	x = x % YTILE_WIDTH;
+	y = y % YTILE_HEIGHT;
+
+	/* bit order inside a block is x4 x3 x2 y4 y3 y2 y1 y0 x1 x0 */
+	swizzle = (x & 3) | ((y & 0x1f) << 2) | ((x & 0x1c) << 5);
+	offset += swizzle * 4;
+	iosys_map_wr(&sb->map[0], offset, u32, color);
+}
+
 static void intel_panic_flush(struct drm_plane *plane)
 {
 	struct intel_plane_state *plane_state = to_intel_plane_state(plane->state);
@@ -XXX,XX +XXX,XX @@ static void intel_panic_flush(struct drm_plane *plane)
 		iplane->disable_tiling(iplane);
 }
 
+static void (*intel_get_tiling_func(u64 fb_modifier))(struct drm_scanout_buffer *sb, unsigned int x,
+						      unsigned int y, u32 color)
+{
+	switch (fb_modifier) {
+	case I915_FORMAT_MOD_Y_TILED:
+	case I915_FORMAT_MOD_Y_TILED_CCS:
+	case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
+	case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS:
+	case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS:
+		return intel_ytile_set_pixel;
+	case I915_FORMAT_MOD_X_TILED:
+	case I915_FORMAT_MOD_4_TILED:
+	case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS:
+	case I915_FORMAT_MOD_4_TILED_DG2_MC_CCS:
+	case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC:
+	case I915_FORMAT_MOD_4_TILED_MTL_RC_CCS:
+	case I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC:
+	case I915_FORMAT_MOD_4_TILED_MTL_MC_CCS:
+	case I915_FORMAT_MOD_4_TILED_BMG_CCS:
+	case I915_FORMAT_MOD_4_TILED_LNL_CCS:
+	case I915_FORMAT_MOD_Yf_TILED:
+	case I915_FORMAT_MOD_Yf_TILED_CCS:
+	default:
+	/* Not supported yet */
+		return NULL;
+	}
+}
+
 static int intel_get_scanout_buffer(struct drm_plane *plane,
 				    struct drm_scanout_buffer *sb)
 {
@@ -XXX,XX +XXX,XX @@ static int intel_get_scanout_buffer(struct drm_plane *plane,
 		intel_fbdev_get_map(display->fbdev.fbdev, &panic_map);
 	} else {
 		/* Can't disable tiling if DPT is in use */
-		if (intel_fb_uses_dpt(fb))
-			return -EOPNOTSUPP;
+		if (intel_fb_uses_dpt(fb)) {
+			if (fb->format->cpp[0] != 4)
+				return -EOPNOTSUPP;
+			sb->set_pixel = intel_get_tiling_func(fb->modifier);
+			if (!sb->set_pixel)
+				return -EOPNOTSUPP;
+		}
 
 		intel_bo_panic_map(obj, &panic_map);
 	}
@@ -XXX,XX +XXX,XX @@ static int intel_get_scanout_buffer(struct drm_plane *plane,
 	sb->map[0] = panic_map;
 	sb->width = fb->width;
 	sb->height = fb->height;
-	sb->format = fb->format;
+	/* Use the generic linear format, because tiling, RC, CCS, CC
+	 * will be disabled in disable_tiling()
+	 */
+	sb->format = drm_format_info(fb->format->format);
 	sb->pitch[0] = fb->pitches[0];
 
 	return 0;
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -XXX,XX +XXX,XX @@ static void skl_disable_tiling(struct intel_plane *plane)
 {
 	struct intel_plane_state *state = to_intel_plane_state(plane->base.state);
 	struct intel_display *display = to_intel_display(plane);
-	u32 stride = state->view.color_plane[0].scanout_stride / 64;
+	const struct drm_framebuffer *fb = state->hw.fb;
 	u32 plane_ctl;
 
 	plane_ctl = intel_de_read(display, PLANE_CTL(plane->pipe, plane->id));
-	plane_ctl &= ~PLANE_CTL_TILED_MASK;
 
-	intel_de_write_fw(display, PLANE_STRIDE(plane->pipe, plane->id),
-			  PLANE_STRIDE_(stride));
+	if (intel_fb_uses_dpt(fb)) {
+		/* if DPT is enabled, keep tiling, but disable compression */
+		plane_ctl &= ~PLANE_CTL_RENDER_DECOMPRESSION_ENABLE;
+	} else {
+		/* if DPT is not supported, disable tiling, and update stride */
+		u32 stride = state->view.color_plane[0].scanout_stride / 64;
 
+		plane_ctl &= ~PLANE_CTL_TILED_MASK;
+		intel_de_write_fw(display, PLANE_STRIDE(plane->pipe, plane->id),
+				  PLANE_STRIDE_(stride));
+	}
 	intel_de_write_fw(display, PLANE_CTL(plane->pipe, plane->id), plane_ctl);
 
 	intel_de_write_fw(display, PLANE_SURF(plane->pipe, plane->id),
-- 
2.49.0

On Alder Lake and later, it's not possible to disable tiling when DPT
is enabled.
So this commit implements 4-Tiling support, to still be able to draw
the panic screen.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---
 .../gpu/drm/i915/display/intel_atomic_plane.c | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)