Jocelyn Falempe
2024-May-23 13:10 UTC
[PATCH 0/5] drm/nouveau: Add drm_panic support for nv50+
This series adds basic drm_panic support for nouveau. Patches 1-4 Add missing bits in drm_panic (ABGR2101010, set_pixel() for tiling, ...) Patch 5 registers nouveau to drm_panic, and handle tiling. I've tested on a GTX1650, while running Gnome/Wayland desktop. I didn't find documentation about nVidia tiling, so it may not work on other GPU than GTX1650. To test it, you need to build your kernel with CONFIG_DRM_PANIC=y, and run echo c > /proc/sysrq-trigger or you can enable CONFIG_DRM_PANIC_DEBUG and run echo 1 > /sys/kernel/debug/dri/0/drm_panic_plane_0 Best regards, -- Jocelyn Jocelyn Falempe (5): drm/panic: Add ABGR2101010 support drm/panic: only draw the foreground color in drm_panic_blit() drm/panic: Add a set_pixel() callback to drm_scanout_buffer drm/panic: add a private pointer to drm_scanout_buffer drm/nouveau: Add drm_panic support for nv50+ drivers/gpu/drm/drm_panic.c | 183 ++++++++++++++---------- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 127 +++++++++++++++- include/drm/drm_panic.h | 15 ++ 3 files changed, 247 insertions(+), 78 deletions(-) base-commit: 484436ec5c2bffe8f346a09ae1cbc4cbf5e50005 -- 2.45.0
Add support for ABGR2101010, used by the nouveau driver.
Signed-off-by: Jocelyn Falempe <jfalempe at redhat.com>
---
drivers/gpu/drm/drm_panic.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c
index 7ece67086cec..78fdecfede84 100644
--- a/drivers/gpu/drm/drm_panic.c
+++ b/drivers/gpu/drm/drm_panic.c
@@ -152,6 +152,14 @@ static u32 convert_xrgb8888_to_argb2101010(u32 pix)
return GENMASK(31, 30) /* set alpha bits */ | pix | ((pix >> 8) &
0x00300C03);
}
+static u32 convert_xrgb8888_to_abgr2101010(u32 pix)
+{
+ pix = ((pix & 0x00FF0000) >> 14) |
+ ((pix & 0x0000FF00) << 4) |
+ ((pix & 0x000000FF) << 22);
+ return GENMASK(31, 30) /* set alpha bits */ | pix | ((pix >> 8) &
0x00300C03);
+}
+
/*
* convert_from_xrgb8888 - convert one pixel from xrgb8888 to the desired
format
* @color: input color, in xrgb8888 format
@@ -185,6 +193,8 @@ static u32 convert_from_xrgb8888(u32 color, u32 format)
return convert_xrgb8888_to_xrgb2101010(color);
case DRM_FORMAT_ARGB2101010:
return convert_xrgb8888_to_argb2101010(color);
+ case DRM_FORMAT_ABGR2101010:
+ return convert_xrgb8888_to_abgr2101010(color);
default:
WARN_ONCE(1, "Can't convert to %p4cc\n", &format);
return 0;
--
2.45.0
Jocelyn Falempe
2024-May-23 13:10 UTC
[PATCH 2/5] drm/panic: only draw the foreground color in drm_panic_blit()
The whole framebuffer is cleared, so it's useless to rewrite the
background colored pixels. It allows to simplify the drawing
functions, and prepare the work for the set_pixel() callback.
Signed-off-by: Jocelyn Falempe <jfalempe at redhat.com>
---
drivers/gpu/drm/drm_panic.c | 63 +++++++++++++++----------------------
1 file changed, 26 insertions(+), 37 deletions(-)
diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c
index 78fdecfede84..09d7d45f80c2 100644
--- a/drivers/gpu/drm/drm_panic.c
+++ b/drivers/gpu/drm/drm_panic.c
@@ -207,37 +207,33 @@ static u32 convert_from_xrgb8888(u32 color, u32 format)
static void drm_panic_blit16(struct iosys_map *dmap, unsigned int dpitch,
const u8 *sbuf8, unsigned int spitch,
unsigned int height, unsigned int width,
- u16 fg16, u16 bg16)
+ u16 color)
{
unsigned int y, x;
- u16 val16;
- for (y = 0; y < height; y++) {
- for (x = 0; x < width; x++) {
- val16 = (sbuf8[(y * spitch) + x / 8] & (0x80 >> (x % 8))) ? fg16 :
bg16;
- iosys_map_wr(dmap, y * dpitch + x * sizeof(u16), u16, val16);
- }
- }
+ for (y = 0; y < height; y++)
+ for (x = 0; x < width; x++)
+ if (sbuf8[(y * spitch) + x / 8] & (0x80 >> (x % 8)))
+ iosys_map_wr(dmap, y * dpitch + x * sizeof(u16), u16, color);
}
static void drm_panic_blit24(struct iosys_map *dmap, unsigned int dpitch,
const u8 *sbuf8, unsigned int spitch,
unsigned int height, unsigned int width,
- u32 fg32, u32 bg32)
+ u32 color)
{
unsigned int y, x;
- u32 val32;
for (y = 0; y < height; y++) {
for (x = 0; x < width; x++) {
u32 off = y * dpitch + x * 3;
- val32 = (sbuf8[(y * spitch) + x / 8] & (0x80 >> (x % 8))) ? fg32 :
bg32;
-
- /* write blue-green-red to output in little endianness */
- iosys_map_wr(dmap, off, u8, (val32 & 0x000000FF) >> 0);
- iosys_map_wr(dmap, off + 1, u8, (val32 & 0x0000FF00) >> 8);
- iosys_map_wr(dmap, off + 2, u8, (val32 & 0x00FF0000) >> 16);
+ if (sbuf8[(y * spitch) + x / 8] & (0x80 >> (x % 8))) {
+ /* write blue-green-red to output in little endianness */
+ iosys_map_wr(dmap, off, u8, (color & 0x000000FF) >> 0);
+ iosys_map_wr(dmap, off + 1, u8, (color & 0x0000FF00) >> 8);
+ iosys_map_wr(dmap, off + 2, u8, (color & 0x00FF0000) >> 16);
+ }
}
}
}
@@ -245,17 +241,14 @@ static void drm_panic_blit24(struct iosys_map *dmap,
unsigned int dpitch,
static void drm_panic_blit32(struct iosys_map *dmap, unsigned int dpitch,
const u8 *sbuf8, unsigned int spitch,
unsigned int height, unsigned int width,
- u32 fg32, u32 bg32)
+ u32 color)
{
unsigned int y, x;
- u32 val32;
- for (y = 0; y < height; y++) {
- for (x = 0; x < width; x++) {
- val32 = (sbuf8[(y * spitch) + x / 8] & (0x80 >> (x % 8))) ? fg32 :
bg32;
- iosys_map_wr(dmap, y * dpitch + x * sizeof(u32), u32, val32);
- }
- }
+ for (y = 0; y < height; y++)
+ for (x = 0; x < width; x++)
+ if (sbuf8[(y * spitch) + x / 8] & (0x80 >> (x % 8)))
+ iosys_map_wr(dmap, y * dpitch + x * sizeof(u32), u32, color);
}
/*
@@ -266,8 +259,7 @@ static void drm_panic_blit32(struct iosys_map *dmap,
unsigned int dpitch,
* @spitch: source pitch in bytes
* @height: height of the image to copy, in pixels
* @width: width of the image to copy, in pixels
- * @fg_color: foreground color, in destination format
- * @bg_color: background color, in destination format
+ * @color: foreground color, in destination format
* @pixel_width: pixel width in bytes.
*
* This can be used to draw a font character, which is a monochrome image, to a
@@ -276,21 +268,20 @@ static void drm_panic_blit32(struct iosys_map *dmap,
unsigned int dpitch,
static void drm_panic_blit(struct iosys_map *dmap, unsigned int dpitch,
const u8 *sbuf8, unsigned int spitch,
unsigned int height, unsigned int width,
- u32 fg_color, u32 bg_color,
- unsigned int pixel_width)
+ u32 color, unsigned int pixel_width)
{
switch (pixel_width) {
case 2:
drm_panic_blit16(dmap, dpitch, sbuf8, spitch,
- height, width, fg_color, bg_color);
+ height, width, color);
break;
case 3:
drm_panic_blit24(dmap, dpitch, sbuf8, spitch,
- height, width, fg_color, bg_color);
+ height, width, color);
break;
case 4:
drm_panic_blit32(dmap, dpitch, sbuf8, spitch,
- height, width, fg_color, bg_color);
+ height, width, color);
break;
default:
WARN_ONCE(1, "Can't blit with pixel width %d\n", pixel_width);
@@ -391,8 +382,7 @@ static void draw_txt_rectangle(struct drm_scanout_buffer
*sb,
unsigned int msg_lines,
bool centered,
struct drm_rect *clip,
- u32 fg_color,
- u32 bg_color)
+ u32 color)
{
int i, j;
const u8 *src;
@@ -414,8 +404,7 @@ static void draw_txt_rectangle(struct drm_scanout_buffer
*sb,
for (j = 0; j < line_len; j++) {
src = get_char_bitmap(font, msg[i].txt[j], font_pitch);
drm_panic_blit(&dst, sb->pitch[0], src, font_pitch,
- font->height, font->width,
- fg_color, bg_color, px_width);
+ font->height, font->width, color, px_width);
iosys_map_incr(&dst, font->width * px_width);
}
}
@@ -455,9 +444,9 @@ static void draw_panic_static(struct drm_scanout_buffer *sb)
if ((r_msg.x1 >= drm_rect_width(&r_logo) || r_msg.y1 >=
drm_rect_height(&r_logo)) &&
drm_rect_width(&r_logo) < sb->width &&
drm_rect_height(&r_logo) < sb->height) {
- draw_txt_rectangle(sb, font, logo, logo_lines, false, &r_logo, fg_color,
bg_color);
+ draw_txt_rectangle(sb, font, logo, logo_lines, false, &r_logo, fg_color);
}
- draw_txt_rectangle(sb, font, panic_msg, msg_lines, true, &r_msg, fg_color,
bg_color);
+ draw_txt_rectangle(sb, font, panic_msg, msg_lines, true, &r_msg,
fg_color);
}
/*
--
2.45.0
Jocelyn Falempe
2024-May-23 13:10 UTC
[PATCH 3/5] drm/panic: Add a set_pixel() callback to drm_scanout_buffer
This allows drivers to draw the pixel, and handle tiling, or specific
color formats.
Signed-off-by: Jocelyn Falempe <jfalempe at redhat.com>
---
drivers/gpu/drm/drm_panic.c | 120 +++++++++++++++++++++++-------------
include/drm/drm_panic.h | 9 +++
2 files changed, 85 insertions(+), 44 deletions(-)
diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c
index 09d7d45f80c2..94558087bba3 100644
--- a/drivers/gpu/drm/drm_panic.c
+++ b/drivers/gpu/drm/drm_panic.c
@@ -251,40 +251,54 @@ static void drm_panic_blit32(struct iosys_map *dmap,
unsigned int dpitch,
iosys_map_wr(dmap, y * dpitch + x * sizeof(u32), u32, color);
}
+static void drm_panic_blit_pixel(struct drm_scanout_buffer *sb, struct drm_rect
*clip,
+ const u8 *sbuf8, unsigned int spitch, u32 color)
+{
+ unsigned int y, x;
+
+ for (y = 0; y < drm_rect_height(clip); y++)
+ for (x = 0; x < drm_rect_width(clip); x++)
+ if (sbuf8[(y * spitch) + x / 8] & (0x80 >> (x % 8)))
+ sb->set_pixel(sb, clip->x1 + x, clip->y1 + y, color);
+}
+
/*
* drm_panic_blit - convert a monochrome image to a linear framebuffer
- * @dmap: destination iosys_map
- * @dpitch: destination pitch in bytes
+ * @sb: destination scanout buffer
+ * @clip: destination rectangle
* @sbuf8: source buffer, in monochrome format, 8 pixels per byte.
* @spitch: source pitch in bytes
- * @height: height of the image to copy, in pixels
- * @width: width of the image to copy, in pixels
* @color: foreground color, in destination format
- * @pixel_width: pixel width in bytes.
*
* This can be used to draw a font character, which is a monochrome image, to a
* framebuffer in other supported format.
*/
-static void drm_panic_blit(struct iosys_map *dmap, unsigned int dpitch,
- const u8 *sbuf8, unsigned int spitch,
- unsigned int height, unsigned int width,
- u32 color, unsigned int pixel_width)
+static void drm_panic_blit(struct drm_scanout_buffer *sb, struct drm_rect
*clip,
+ const u8 *sbuf8, unsigned int spitch, u32 color)
{
- switch (pixel_width) {
+ struct iosys_map map;
+
+ if (sb->set_pixel)
+ return drm_panic_blit_pixel(sb, clip, sbuf8, spitch, color);
+
+ map = sb->map[0];
+ iosys_map_incr(&map, clip->y1 * sb->pitch[0] + clip->x1 *
sb->format->cpp[0]);
+
+ switch (sb->format->cpp[0]) {
case 2:
- drm_panic_blit16(dmap, dpitch, sbuf8, spitch,
- height, width, color);
+ drm_panic_blit16(&map, sb->pitch[0], sbuf8, spitch,
+ drm_rect_height(clip), drm_rect_width(clip), color);
break;
case 3:
- drm_panic_blit24(dmap, dpitch, sbuf8, spitch,
- height, width, color);
+ drm_panic_blit24(&map, sb->pitch[0], sbuf8, spitch,
+ drm_rect_height(clip), drm_rect_width(clip), color);
break;
case 4:
- drm_panic_blit32(dmap, dpitch, sbuf8, spitch,
- height, width, color);
+ drm_panic_blit32(&map, sb->pitch[0], sbuf8, spitch,
+ drm_rect_height(clip), drm_rect_width(clip), color);
break;
default:
- WARN_ONCE(1, "Can't blit with pixel width %d\n", pixel_width);
+ WARN_ONCE(1, "Can't blit with pixel width %d\n",
sb->format->cpp[0]);
}
}
@@ -328,33 +342,51 @@ static void drm_panic_fill32(struct iosys_map *dmap,
unsigned int dpitch,
iosys_map_wr(dmap, y * dpitch + x * sizeof(u32), u32, color);
}
+static void drm_panic_fill_pixel(struct drm_scanout_buffer *sb,
+ struct drm_rect *clip,
+ u32 color)
+{
+ unsigned int y, x;
+
+ for (y = 0; y < drm_rect_height(clip); y++)
+ for (x = 0; x < drm_rect_width(clip); x++)
+ sb->set_pixel(sb, clip->x1 + x, clip->y1 + y, color);
+}
+
/*
* drm_panic_fill - Fill a rectangle with a color
- * @dmap: destination iosys_map, pointing to the top left corner of the
rectangle
- * @dpitch: destination pitch in bytes
- * @height: height of the rectangle, in pixels
- * @width: width of the rectangle, in pixels
- * @color: color to fill the rectangle.
- * @pixel_width: pixel width in bytes
+ * @sb: destination scanout buffer
+ * @clip: destination rectangle
+ * @color: foreground color, in destination format
*
* Fill a rectangle with a color, in a linear framebuffer.
*/
-static void drm_panic_fill(struct iosys_map *dmap, unsigned int dpitch,
- unsigned int height, unsigned int width,
- u32 color, unsigned int pixel_width)
+static void drm_panic_fill(struct drm_scanout_buffer *sb, struct drm_rect
*clip,
+ u32 color)
{
- switch (pixel_width) {
+ struct iosys_map map;
+
+ if (sb->set_pixel)
+ return drm_panic_fill_pixel(sb, clip, color);
+
+ map = sb->map[0];
+ iosys_map_incr(&map, clip->y1 * sb->pitch[0] + clip->x1 *
sb->format->cpp[0]);
+
+ switch (sb->format->cpp[0]) {
case 2:
- drm_panic_fill16(dmap, dpitch, height, width, color);
+ drm_panic_fill16(&map, sb->pitch[0], drm_rect_height(clip),
+ drm_rect_width(clip), color);
break;
case 3:
- drm_panic_fill24(dmap, dpitch, height, width, color);
+ drm_panic_fill24(&map, sb->pitch[0], drm_rect_height(clip),
+ drm_rect_width(clip), color);
break;
case 4:
- drm_panic_fill32(dmap, dpitch, height, width, color);
+ drm_panic_fill32(&map, sb->pitch[0], drm_rect_height(clip),
+ drm_rect_width(clip), color);
break;
default:
- WARN_ONCE(1, "Can't fill with pixel width %d\n", pixel_width);
+ WARN_ONCE(1, "Can't fill with pixel width %d\n",
sb->format->cpp[0]);
}
}
@@ -387,25 +419,24 @@ static void draw_txt_rectangle(struct drm_scanout_buffer
*sb,
int i, j;
const u8 *src;
size_t font_pitch = DIV_ROUND_UP(font->width, 8);
- struct iosys_map dst;
- unsigned int px_width = sb->format->cpp[0];
- int left = 0;
+ struct drm_rect rec;
msg_lines = min(msg_lines, drm_rect_height(clip) / font->height);
for (i = 0; i < msg_lines; i++) {
size_t line_len = min(msg[i].len, drm_rect_width(clip) / font->width);
+ rec.y1 = clip->y1 + i * font->height;
+ rec.y2 = rec.y1 + font->height;
+ rec.x1 = clip->x1;
+
if (centered)
- left = (drm_rect_width(clip) - (line_len * font->width)) / 2;
+ rec.x1 += (drm_rect_width(clip) - (line_len * font->width)) / 2;
- dst = sb->map[0];
- iosys_map_incr(&dst, (clip->y1 + i * font->height) *
sb->pitch[0] +
- (clip->x1 + left) * px_width);
for (j = 0; j < line_len; j++) {
src = get_char_bitmap(font, msg[i].txt[j], font_pitch);
- drm_panic_blit(&dst, sb->pitch[0], src, font_pitch,
- font->height, font->width, color, px_width);
- iosys_map_incr(&dst, font->width * px_width);
+ rec.x2 = rec.x1 + font->width;
+ drm_panic_blit(sb, &rec, src, font_pitch, color);
+ rec.x1 += font->width;
}
}
}
@@ -420,7 +451,7 @@ static void draw_panic_static(struct drm_scanout_buffer *sb)
u32 fg_color = CONFIG_DRM_PANIC_FOREGROUND_COLOR;
u32 bg_color = CONFIG_DRM_PANIC_BACKGROUND_COLOR;
const struct font_desc *font = get_default_font(sb->width, sb->height,
NULL, NULL);
- struct drm_rect r_logo, r_msg;
+ struct drm_rect r_screen, r_logo, r_msg;
if (!font)
return;
@@ -428,6 +459,8 @@ static void draw_panic_static(struct drm_scanout_buffer *sb)
fg_color = convert_from_xrgb8888(fg_color, sb->format->format);
bg_color = convert_from_xrgb8888(bg_color, sb->format->format);
+ r_screen = DRM_RECT_INIT(0, 0, sb->width, sb->height);
+
r_logo = DRM_RECT_INIT(0, 0,
get_max_line_len(logo, logo_lines) * font->width,
logo_lines * font->height);
@@ -439,8 +472,7 @@ static void draw_panic_static(struct drm_scanout_buffer *sb)
drm_rect_translate(&r_msg, (sb->width - r_msg.x2) / 2, (sb->height -
r_msg.y2) / 2);
/* Fill with the background color, and draw text on top */
- drm_panic_fill(&sb->map[0], sb->pitch[0], sb->height,
sb->width,
- bg_color, sb->format->cpp[0]);
+ drm_panic_fill(sb, &r_screen, bg_color);
if ((r_msg.x1 >= drm_rect_width(&r_logo) || r_msg.y1 >=
drm_rect_height(&r_logo)) &&
drm_rect_width(&r_logo) < sb->width &&
drm_rect_height(&r_logo) < sb->height) {
diff --git a/include/drm/drm_panic.h b/include/drm/drm_panic.h
index 822dbb1aa9d6..73bb3f3d9ed9 100644
--- a/include/drm/drm_panic.h
+++ b/include/drm/drm_panic.h
@@ -50,6 +50,15 @@ struct drm_scanout_buffer {
* @pitch: Length in bytes between the start of two consecutive lines.
*/
unsigned int pitch[DRM_FORMAT_MAX_PLANES];
+
+ /**
+ * @set_pixel: Optional function, to set a pixel color on the
+ * framebuffer. It allows to handle special tiling format inside the
+ * driver.
+ */
+ void (*set_pixel)(struct drm_scanout_buffer *sb, unsigned int x,
+ unsigned int y, u32 color);
+
};
/**
--
2.45.0
Jocelyn Falempe
2024-May-23 13:10 UTC
[PATCH 4/5] drm/panic: add a private pointer to drm_scanout_buffer
So you can pass a parameter to the set_pixel() callback.
Signed-off-by: Jocelyn Falempe <jfalempe at redhat.com>
---
include/drm/drm_panic.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/drm/drm_panic.h b/include/drm/drm_panic.h
index 73bb3f3d9ed9..f7c32d64af5f 100644
--- a/include/drm/drm_panic.h
+++ b/include/drm/drm_panic.h
@@ -51,6 +51,12 @@ struct drm_scanout_buffer {
*/
unsigned int pitch[DRM_FORMAT_MAX_PLANES];
+ /**
+ * @private: Optional pointer to some private data you want to pass to
+ * the set_pixel() function.
+ */
+ void *private;
+
/**
* @set_pixel: Optional function, to set a pixel color on the
* framebuffer. It allows to handle special tiling format inside the
--
2.45.0
Jocelyn Falempe
2024-May-23 13:10 UTC
[PATCH 5/5] drm/nouveau: Add drm_panic support for nv50+
Add drm_panic support, for nv50+ cards.
It's enough to get the panic screen while running Gnome/Wayland on a
GTX 1650.
It doesn't support multi-plane or compressed format.
Support for other formats and older cards will come later.
Tiling is only tested on GTX1650, and might be wrong for other cards.
Signed-off-by: Jocelyn Falempe <jfalempe at redhat.com>
---
drivers/gpu/drm/nouveau/dispnv50/wndw.c | 127 +++++++++++++++++++++++-
1 file changed, 125 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
index 7a2cceaee6e9..dd7aafb9198a 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
@@ -30,11 +30,16 @@
#include <nvhw/class/cl507e.h>
#include <nvhw/class/clc37e.h>
+#include <linux/iosys-map.h>
+
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_blend.h>
-#include <drm/drm_gem_atomic_helper.h>
#include <drm/drm_fourcc.h>
+#include <drm/drm_framebuffer.h>
+#include <drm/drm_gem_atomic_helper.h>
+#include <drm/drm_panic.h>
+#include <drm/ttm/ttm_bo.h>
#include "nouveau_bo.h"
#include "nouveau_gem.h"
@@ -577,6 +582,113 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct
drm_plane_state *state)
return 0;
}
+/* Values found on GTX1650 */
+/* blocks level 0, 4x4 pixels */
+#define BL0_W 4
+/* blocks level 1, 8x8 pixels */
+#define BL1_W 8
+/* blocks level 2, Group of Bytes? 16x128 pixels */
+#define BL2_W 16
+
+/* get the offset in bytes inside the framebuffer, after taking tiling into
account */
+static unsigned int nv50_get_tiled_offset(struct drm_scanout_buffer *sb,
unsigned int gobs,
+ unsigned int x, unsigned int y, unsigned int px_width)
+{
+ u32 blk2_x, blk2_y, bl2sz;
+ u32 blk1_x, blk1_y, bl1sz;
+ u32 blk0_x, blk0_y, bl0sz;
+ u32 nblk2w, bl2_h, off;
+
+ /* fixme - block2 height depends of the "Group of Bytes" value */
+ bl2_h = BL1_W * gobs;
+
+ bl0sz = BL0_W * BL0_W * px_width;
+ bl1sz = BL1_W * BL1_W * px_width;
+ bl2sz = BL2_W * bl2_h * px_width;
+
+ /* block level 2 coordinate */
+ blk2_x = x / BL2_W;
+ blk2_y = y / bl2_h;
+
+ x = x % BL2_W;
+ y = y % bl2_h;
+
+ /* block level 1 coordinate */
+ blk1_x = x / BL1_W;
+ blk1_y = y / BL1_W;
+
+ x = x % BL1_W;
+ y = y % BL1_W;
+
+ /* block level 0 coordinate */
+ blk0_x = x / BL0_W;
+ blk0_y = y / BL0_W;
+
+ x = x % BL0_W;
+ y = y % BL0_W;
+
+ nblk2w = DIV_ROUND_UP(sb->width, BL2_W);
+
+ off = ((blk2_y * nblk2w) + blk2_x) * bl2sz;
+ off += ((blk1_y * 2) + blk1_x) * bl1sz;
+ off += (blk0_y * 2 + blk0_x) * bl0sz;
+ off += (x + y * BL0_W) * px_width;
+
+ return off;
+}
+
+static void nv50_set_pixel(struct drm_scanout_buffer *sb, unsigned int x,
unsigned int y, u32 color)
+{
+ struct drm_framebuffer *fb = sb->private;
+ unsigned int off;
+ /* According to DRM_FORMAT_MOD_NVIDIA_BLOCK_LINEAR_2D documentation,
+ * the last 4 bits of modifier is log2(height) of each block, in GOBs
+ */
+ unsigned int gobs = 1 << (fb->modifier & 0xf);
+
+ off = nv50_get_tiled_offset(sb, gobs, x, y, sb->format->cpp[0]);
+ iosys_map_wr(&sb->map[0], off, u32, color);
+}
+
+static int
+nv50_wndw_get_scanout_buffer(struct drm_plane *plane, struct drm_scanout_buffer
*sb)
+{
+ struct drm_framebuffer *fb;
+ struct nouveau_bo *nvbo;
+
+ if (!plane->state || !plane->state->fb)
+ return -EINVAL;
+
+ fb = plane->state->fb;
+ nvbo = nouveau_gem_object(fb->obj[0]);
+
+ /* Don't support compressed format, or multiplane yet */
+ if (nvbo->comp || fb->format->num_planes != 1)
+ return -EOPNOTSUPP;
+
+ if (nouveau_bo_map(nvbo)) {
+ pr_warn("nouveau bo map failed, panic won't be displayed\n");
+ return -ENOMEM;
+ }
+
+ if (nvbo->kmap.bo_kmap_type & TTM_BO_MAP_IOMEM_MASK)
+ iosys_map_set_vaddr_iomem(&sb->map[0], nvbo->kmap.virtual);
+ else
+ iosys_map_set_vaddr(&sb->map[0], nvbo->kmap.virtual);
+
+ sb->height = fb->height;
+ sb->width = fb->width;
+ sb->pitch[0] = fb->pitches[0];
+ sb->format = fb->format;
+
+ /* If tiling is enabled, use the set_pixel() to display correctly */
+ if (fb->modifier & 0xf) {
+ sb->private = (void *) fb;
+ sb->set_pixel = nv50_set_pixel;
+ }
+ return 0;
+}
+
static const struct drm_plane_helper_funcs
nv50_wndw_helper = {
.prepare_fb = nv50_wndw_prepare_fb,
@@ -584,6 +696,14 @@ nv50_wndw_helper = {
.atomic_check = nv50_wndw_atomic_check,
};
+static const struct drm_plane_helper_funcs
+nv50_wndw_primary_helper = {
+ .prepare_fb = nv50_wndw_prepare_fb,
+ .cleanup_fb = nv50_wndw_cleanup_fb,
+ .atomic_check = nv50_wndw_atomic_check,
+ .get_scanout_buffer = nv50_wndw_get_scanout_buffer,
+};
+
static void
nv50_wndw_atomic_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state)
@@ -732,7 +852,10 @@ nv50_wndw_new_(const struct nv50_wndw_func *func, struct
drm_device *dev,
return ret;
}
- drm_plane_helper_add(&wndw->plane, &nv50_wndw_helper);
+ if (type == DRM_PLANE_TYPE_PRIMARY)
+ drm_plane_helper_add(&wndw->plane, &nv50_wndw_primary_helper);
+ else
+ drm_plane_helper_add(&wndw->plane, &nv50_wndw_helper);
if (wndw->func->ilut) {
ret = nv50_lut_init(disp, mmu, &wndw->ilut);
--
2.45.0
kernel test robot
2024-May-24 10:53 UTC
[PATCH 5/5] drm/nouveau: Add drm_panic support for nv50+
Hi Jocelyn, kernel test robot noticed the following build warnings: [auto build test WARNING on 484436ec5c2bffe8f346a09ae1cbc4cbf5e50005] url: https://github.com/intel-lab-lkp/linux/commits/Jocelyn-Falempe/drm-panic-Add-ABGR2101010-support/20240523-211335 base: 484436ec5c2bffe8f346a09ae1cbc4cbf5e50005 patch link: https://lore.kernel.org/r/20240523130955.428233-6-jfalempe%40redhat.com patch subject: [PATCH 5/5] drm/nouveau: Add drm_panic support for nv50+ config: x86_64-randconfig-r113-20240524 (https://download.01.org/0day-ci/archive/20240524/202405241832.ETpErbon-lkp at intel.com/config) compiler: clang version 18.1.5 (https://github.com/llvm/llvm-project 617a15a9eac96088ae5e9134248d8236e34b91b1) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240524/202405241832.ETpErbon-lkp at intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp at intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202405241832.ETpErbon-lkp at intel.com/ sparse warnings: (new ones prefixed by >>)>> drivers/gpu/drm/nouveau/dispnv50/wndw.c:675:66: sparse: sparse: incorrect type in argument 2 (different address spaces) @@ expected void [noderef] __iomem *vaddr_iomem @@ got void *virtual @@drivers/gpu/drm/nouveau/dispnv50/wndw.c:675:66: sparse: expected void [noderef] __iomem *vaddr_iomem drivers/gpu/drm/nouveau/dispnv50/wndw.c:675:66: sparse: got void *virtual drivers/gpu/drm/nouveau/dispnv50/wndw.c: note: in included file (through include/linux/timer.h, include/linux/workqueue.h, drivers/gpu/drm/nouveau/dispnv50/disp.h, ...): include/linux/list.h:83:21: sparse: sparse: self-comparison always evaluates to true vim +675 drivers/gpu/drm/nouveau/dispnv50/wndw.c 652 653 static int 654 nv50_wndw_get_scanout_buffer(struct drm_plane *plane, struct drm_scanout_buffer *sb) 655 { 656 struct drm_framebuffer *fb; 657 struct nouveau_bo *nvbo; 658 659 if (!plane->state || !plane->state->fb) 660 return -EINVAL; 661 662 fb = plane->state->fb; 663 nvbo = nouveau_gem_object(fb->obj[0]); 664 665 /* Don't support compressed format, or multiplane yet */ 666 if (nvbo->comp || fb->format->num_planes != 1) 667 return -EOPNOTSUPP; 668 669 if (nouveau_bo_map(nvbo)) { 670 pr_warn("nouveau bo map failed, panic won't be displayed\n"); 671 return -ENOMEM; 672 } 673 674 if (nvbo->kmap.bo_kmap_type & TTM_BO_MAP_IOMEM_MASK) > 675 iosys_map_set_vaddr_iomem(&sb->map[0], nvbo->kmap.virtual); 676 else 677 iosys_map_set_vaddr(&sb->map[0], nvbo->kmap.virtual); 678 679 sb->height = fb->height; 680 sb->width = fb->width; 681 sb->pitch[0] = fb->pitches[0]; 682 sb->format = fb->format; 683 684 /* If tiling is enabled, use the set_pixel() to display correctly */ 685 if (fb->modifier & 0xf) { 686 sb->private = (void *) fb; 687 sb->set_pixel = nv50_set_pixel; 688 } 689 return 0; 690 } 691 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki