Patch "drm/msm/dpu: check dpu_plane_atomic_print_state() for valid sspp" has been added to the 6.13-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/msm/dpu: check dpu_plane_atomic_print_state() for valid sspp

to the 6.13-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-msm-dpu-check-dpu_plane_atomic_print_state-for-v.patch
and it can be found in the queue-6.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit e3583e90322a5d03ef0638bdec745e92d4625403
Author: Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx>
Date:   Wed Dec 11 11:50:26 2024 -0800

    drm/msm/dpu: check dpu_plane_atomic_print_state() for valid sspp
    
    [ Upstream commit 789384eb1437aed94155dc0eac8a8a6ba1baf578 ]
    
    Similar to the r_pipe sspp protect, add a check to protect
    the pipe state prints to avoid NULL ptr dereference for cases when
    the state is dumped without a corresponding atomic_check() where the
    pipe->sspp is assigned.
    
    Fixes: 31f7148fd370 ("drm/msm/dpu: move pstate->pipe initialization to dpu_plane_atomic_check")
    Reported-by: Stephen Boyd <swboyd@xxxxxxxxxxxx>
    Closes: https://gitlab.freedesktop.org/drm/msm/-/issues/67
    Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
    Tested-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
    Tested-by: Stephen Boyd <swboyd@xxxxxxxxxxxx> # sc7180-trogdor
    Patchwork: https://patchwork.freedesktop.org/patch/628404/
    Link: https://lore.kernel.org/r/20241211-check-state-before-dump-v2-1-62647a501e8c@xxxxxxxxxxx
    Signed-off-by: Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 3ffac24333a2a..703e58901d53f 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -1335,12 +1335,15 @@ static void dpu_plane_atomic_print_state(struct drm_printer *p,
 
 	drm_printf(p, "\tstage=%d\n", pstate->stage);
 
-	drm_printf(p, "\tsspp[0]=%s\n", pipe->sspp->cap->name);
-	drm_printf(p, "\tmultirect_mode[0]=%s\n", dpu_get_multirect_mode(pipe->multirect_mode));
-	drm_printf(p, "\tmultirect_index[0]=%s\n",
-		   dpu_get_multirect_index(pipe->multirect_index));
-	drm_printf(p, "\tsrc[0]=" DRM_RECT_FMT "\n", DRM_RECT_ARG(&pipe_cfg->src_rect));
-	drm_printf(p, "\tdst[0]=" DRM_RECT_FMT "\n", DRM_RECT_ARG(&pipe_cfg->dst_rect));
+	if (pipe->sspp) {
+		drm_printf(p, "\tsspp[0]=%s\n", pipe->sspp->cap->name);
+		drm_printf(p, "\tmultirect_mode[0]=%s\n",
+			   dpu_get_multirect_mode(pipe->multirect_mode));
+		drm_printf(p, "\tmultirect_index[0]=%s\n",
+			   dpu_get_multirect_index(pipe->multirect_index));
+		drm_printf(p, "\tsrc[0]=" DRM_RECT_FMT "\n", DRM_RECT_ARG(&pipe_cfg->src_rect));
+		drm_printf(p, "\tdst[0]=" DRM_RECT_FMT "\n", DRM_RECT_ARG(&pipe_cfg->dst_rect));
+	}
 
 	if (r_pipe->sspp) {
 		drm_printf(p, "\tsspp[1]=%s\n", r_pipe->sspp->cap->name);