tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/mxsfb: Disable overlay plane in mxsfb_plane_overlay_atomic_disable()

When disabling overlay plane in mxsfb_plane_overlay_atomic_update(),
overlay plane's framebuffer pointer is NULL. So, dereferencing it would
cause a kernel Oops(NULL pointer dereferencing). Fix the issue by
disabling overlay plane in mxsfb_plane_overlay_atomic_disable() instead.

Fixes: cb285a5348e7 ("drm: mxsfb: Replace mxsfb_get_fb_paddr() with drm_fb_cma_get_gem_addr()")
Cc: stable@vger.kernel.org # 5.19+
Signed-off-by: Liu Ying <victor.liu@nxp.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Signed-off-by: Marek Vasut <marex@denx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230612092359.784115-1-victor.liu@nxp.com

authored by

Liu Ying and committed by
Marek Vasut aa656d48 cc4fd293

+9
+9
drivers/gpu/drm/mxsfb/mxsfb_kms.c
··· 611 611 writel(ctrl, mxsfb->base + LCDC_AS_CTRL); 612 612 } 613 613 614 + static void mxsfb_plane_overlay_atomic_disable(struct drm_plane *plane, 615 + struct drm_atomic_state *state) 616 + { 617 + struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(plane->dev); 618 + 619 + writel(0, mxsfb->base + LCDC_AS_CTRL); 620 + } 621 + 614 622 static bool mxsfb_format_mod_supported(struct drm_plane *plane, 615 623 uint32_t format, 616 624 uint64_t modifier) ··· 634 626 static const struct drm_plane_helper_funcs mxsfb_plane_overlay_helper_funcs = { 635 627 .atomic_check = mxsfb_plane_atomic_check, 636 628 .atomic_update = mxsfb_plane_overlay_atomic_update, 629 + .atomic_disable = mxsfb_plane_overlay_atomic_disable, 637 630 }; 638 631 639 632 static const struct drm_plane_funcs mxsfb_plane_funcs = {