Merge tag 'mediatek-drm-fixes-20240805' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-fixes

airlied · airlied · commit fee9d135e2fd · 2024-08-16T13:16:47.000+10:00
Mediatek DRM Fixes - 20240805 1. Set sensible cursor width/height values to fix crash Signed-off-by: Dave Airlie <airlied@redhat.com> From: Chun-Kuang Hu <chunkuang.hu@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/20240810084605.3435-1-chunkuang.hu@kernel.org
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -539,8 +539,8 @@ static int mtk_drm_kms_init(struct drm_device *drm)
 	}
 
 	/* IGT will check if the cursor size is configured */
-	drm->mode_config.cursor_width = drm->mode_config.max_width;
-	drm->mode_config.cursor_height = drm->mode_config.max_height;
+	drm->mode_config.cursor_width = 512;
+	drm->mode_config.cursor_height = 512;
 
 	/* Use OVL device for all DMA memory allocations */
 	crtc = drm_crtc_from_index(drm, 0);

Original file line number	Diff line number	Diff line change
`@@ -539,8 +539,8 @@ static int mtk_drm_kms_init(struct drm_device *drm)`
`539`	`539`	`}`
`540`	`540`
`541`	`541`	`/* IGT will check if the cursor size is configured */`
`542`		`- drm->mode_config.cursor_width = drm->mode_config.max_width;`
`543`		`- drm->mode_config.cursor_height = drm->mode_config.max_height;`
	`542`	`+ drm->mode_config.cursor_width = 512;`
	`543`	`+ drm->mode_config.cursor_height = 512;`
`544`	`544`
`545`	`545`	`/* Use OVL device for all DMA memory allocations */`
`546`	`546`	`crtc = drm_crtc_from_index(drm, 0);`