Skip to content

Commit 6a7e0b0

Browse files
fabioestevamrobclark
authored andcommitted
drm/msm: Do not run snapshot on non-DPU devices
Since commit 9865948 ("drm/msm: add support to take dpu snapshot") the following NULL pointer dereference is seen on i.MX53: [ 3.275493] msm msm: bound 30000000.gpu (ops a3xx_ops) [ 3.287174] [drm] Initialized msm 1.8.0 20130625 for msm on minor 0 [ 3.293915] 8<--- cut here --- [ 3.297012] Unable to handle kernel NULL pointer dereference at virtual address 00000028 [ 3.305244] pgd = (ptrval) [ 3.307989] [00000028] *pgd=00000000 [ 3.311624] Internal error: Oops: 805 [#1] SMP ARM [ 3.316430] Modules linked in: [ 3.319503] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.14.0+g682d702b426b #1 [ 3.326652] Hardware name: Freescale i.MX53 (Device Tree Support) [ 3.332754] PC is at __mutex_init+0x14/0x54 [ 3.336969] LR is at msm_disp_snapshot_init+0x24/0xa0 i.MX53 does not use the DPU controller. Fix the problem by only calling msm_disp_snapshot_init() on platforms that use the DPU controller. Cc: [email protected] Fixes: 9865948 ("drm/msm: add support to take dpu snapshot") Signed-off-by: Fabio Estevam <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Rob Clark <[email protected]>
1 parent 3eda901 commit 6a7e0b0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/gpu/drm/msm/msm_drv.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -630,10 +630,11 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
630630
if (ret)
631631
goto err_msm_uninit;
632632

633-
ret = msm_disp_snapshot_init(ddev);
634-
if (ret)
635-
DRM_DEV_ERROR(dev, "msm_disp_snapshot_init failed ret = %d\n", ret);
636-
633+
if (kms) {
634+
ret = msm_disp_snapshot_init(ddev);
635+
if (ret)
636+
DRM_DEV_ERROR(dev, "msm_disp_snapshot_init failed ret = %d\n", ret);
637+
}
637638
drm_mode_config_reset(ddev);
638639

639640
#ifdef CONFIG_DRM_FBDEV_EMULATION

0 commit comments

Comments
 (0)