Commit 0cdf7f6f authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge tag 'drm-misc-fixes-2025-10-23' of... 

Merge tag 'drm-misc-fixes-2025-10-23' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

Short summary of fixes pull:

panic:
- Fix several issues in size calculations

panthor:
- Fix kernel panic on partial unmap of GPU VA region

rockchip:
- hdmi: Fix HDP setup

Signed-off-by: default avatarSimona Vetter <simona.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20251023083449.GA13190@linux-2.fritz.box
parents 6ced1061 23437509

drivers/gpu/drm/drm_panic.c

+54 −6
Original line number Diff line number Diff line
@@ -174,6 +174,33 @@ static void drm_panic_write_pixel24(void *vaddr, unsigned int offset, u32 color) 
	*p = color & 0xff;

}



/*

 * Special case if the pixel crosses page boundaries

 */

static void drm_panic_write_pixel24_xpage(void *vaddr, struct page *next_page,

					  unsigned int offset, u32 color)

{

	u8 *vaddr2;

	u8 *p = vaddr + offset;



	vaddr2 = kmap_local_page_try_from_panic(next_page);



	*p++ = color & 0xff;

	color >>= 8;



	if (offset == PAGE_SIZE - 1)

		p = vaddr2;



	*p++ = color & 0xff;

	color >>= 8;



	if (offset == PAGE_SIZE - 2)

		p = vaddr2;



	*p = color & 0xff;

	kunmap_local(vaddr2);

}



static void drm_panic_write_pixel32(void *vaddr, unsigned int offset, u32 color)

{

	u32 *p = vaddr + offset;
@@ -231,7 +258,14 @@ static void drm_panic_blit_page(struct page **pages, unsigned int dpitch, 
					page = new_page;

					vaddr = kmap_local_page_try_from_panic(pages[page]);

				}

				if (vaddr)

				if (!vaddr)

					continue;



				// Special case for 24bit, as a pixel might cross page boundaries

				if (cpp == 3 && offset + 3 > PAGE_SIZE)

					drm_panic_write_pixel24_xpage(vaddr, pages[page + 1],

								      offset, fg32);

				else

					drm_panic_write_pixel(vaddr, offset, fg32, cpp);

			}

		}
@@ -321,6 +355,14 @@ static void drm_panic_fill_page(struct page **pages, unsigned int dpitch, 
				page = new_page;

				vaddr = kmap_local_page_try_from_panic(pages[page]);

			}

			if (!vaddr)

				continue;



			// Special case for 24bit, as a pixel might cross page boundaries

			if (cpp == 3 && offset + 3 > PAGE_SIZE)

				drm_panic_write_pixel24_xpage(vaddr, pages[page + 1],

							      offset, color);

			else

				drm_panic_write_pixel(vaddr, offset, color, cpp);

		}

	}
@@ -429,6 +471,9 @@ static void drm_panic_logo_rect(struct drm_rect *rect, const struct font_desc *f 
static void drm_panic_logo_draw(struct drm_scanout_buffer *sb, struct drm_rect *rect,

				const struct font_desc *font, u32 fg_color)

{

	if (rect->x2 > sb->width || rect->y2 > sb->height)

		return;



	if (logo_mono)

		drm_panic_blit(sb, rect, logo_mono->data,

			       DIV_ROUND_UP(drm_rect_width(rect), 8), 1, fg_color);
@@ -477,7 +522,7 @@ static int draw_line_with_wrap(struct drm_scanout_buffer *sb, const struct font_ 
			       struct drm_panic_line *line, int yoffset, u32 fg_color)

{

	int chars_per_row = sb->width / font->width;

	struct drm_rect r_txt = DRM_RECT_INIT(0, yoffset, sb->width, sb->height);

	struct drm_rect r_txt = DRM_RECT_INIT(0, yoffset, sb->width, font->height);

	struct drm_panic_line line_wrap;



	if (line->len > chars_per_row) {
@@ -520,7 +565,7 @@ static void draw_panic_static_kmsg(struct drm_scanout_buffer *sb) 
	struct drm_panic_line line;

	int yoffset;



	if (!font)

	if (!font || font->width > sb->width)

		return;



	yoffset = sb->height - font->height - (sb->height % font->height) / 2;
@@ -733,7 +778,10 @@ static int _draw_panic_static_qr_code(struct drm_scanout_buffer *sb) 
	pr_debug("QR width %d and scale %d\n", qr_width, scale);

	r_qr_canvas = DRM_RECT_INIT(0, 0, qr_canvas_width * scale, qr_canvas_width * scale);



	v_margin = (sb->height - drm_rect_height(&r_qr_canvas) - drm_rect_height(&r_msg)) / 5;

	v_margin = sb->height - drm_rect_height(&r_qr_canvas) - drm_rect_height(&r_msg);

	if (v_margin < 0)

		return -ENOSPC;

	v_margin /= 5;



	drm_rect_translate(&r_qr_canvas, (sb->width - r_qr_canvas.x2) / 2, 2 * v_margin);

	r_qr = DRM_RECT_INIT(r_qr_canvas.x1 + QR_MARGIN * scale, r_qr_canvas.y1 + QR_MARGIN * scale,
@@ -746,7 +794,7 @@ static int _draw_panic_static_qr_code(struct drm_scanout_buffer *sb) 
	/* Fill with the background color, and draw text on top */

	drm_panic_fill(sb, &r_screen, bg_color);



	if (!drm_rect_overlap(&r_logo, &r_msg) && !drm_rect_overlap(&r_logo, &r_qr))

	if (!drm_rect_overlap(&r_logo, &r_msg) && !drm_rect_overlap(&r_logo, &r_qr_canvas))

		drm_panic_logo_draw(sb, &r_logo, font, fg_color);



	draw_txt_rectangle(sb, font, panic_msg, panic_msg_lines, true, &r_msg, fg_color);

drivers/gpu/drm/panthor/panthor_mmu.c

+7 −3
Original line number Diff line number Diff line
@@ -1175,10 +1175,14 @@ panthor_vm_op_ctx_prealloc_vmas(struct panthor_vm_op_ctx *op_ctx) 
		break;



	case DRM_PANTHOR_VM_BIND_OP_TYPE_UNMAP:

		/* Partial unmaps might trigger a remap with either a prev or a next VA,

		 * but not both.

		 */

		vma_count = 1;

		/* Two VMAs can be needed for an unmap, as an unmap can happen

		 * in the middle of a drm_gpuva, requiring a remap with both

		 * prev & next VA. Or an unmap can span more than one drm_gpuva

		 * where the first and last ones are covered partially, requring

		 * a remap for the first with a prev VA and remap for the last

		 * with a next VA.

		 */

		vma_count = 2;

		break;



	default:

drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static void dw_hdmi_rk3228_setup_hpd(struct dw_hdmi *dw_hdmi, void *data) 


	regmap_write(hdmi->regmap, RK3228_GRF_SOC_CON2,

		     FIELD_PREP_WM16(RK3228_HDMI_SDAIN_MSK, 1) |

		     FIELD_PREP_WM16(RK3328_HDMI_SCLIN_MSK, 1));

		     FIELD_PREP_WM16(RK3228_HDMI_SCLIN_MSK, 1));

}



static enum drm_connector_status