drm/msm/dpu: rearrange QoS setting code

Slightly rearrainge code in dpu_plane_sspp_update_pipe() to group
QoS/LUT related functions.

Reviewed-by: Jeykumar Sankaran <quic_jeykumar@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/537906/
Link: https://lore.kernel.org/r/20230518222238.3815293-5-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index b8ed7247a6af0bd20a35a51e5082620f56680706..586f089756fa153daf2ad03b4f40d01400c545b4 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -1079,10 +1079,10 @@ static void dpu_plane_sspp_update_pipe(struct drm_plane *plane,
                pipe->sspp->ops.setup_sourceaddress(pipe, layout);
        }
 
-       _dpu_plane_set_qos_ctrl(plane, pipe, false, DPU_PLANE_QOS_PANIC_CTRL);
-
        /* override for color fill */
        if (pdpu->color_fill & DPU_PLANE_COLOR_FILL_FLAG) {
+               _dpu_plane_set_qos_ctrl(plane, pipe, false, DPU_PLANE_QOS_PANIC_CTRL);
+
                /* skip remaining processing on color fill */
                return;
        }
@@ -1125,12 +1125,14 @@ static void dpu_plane_sspp_update_pipe(struct drm_plane *plane,
 
        _dpu_plane_set_qos_lut(plane, pipe, fmt, pipe_cfg);
        _dpu_plane_set_danger_lut(plane, pipe, fmt);
+       _dpu_plane_set_qos_ctrl(plane, pipe,
+                               pipe->sspp->idx != SSPP_CURSOR0 &&
+                               pipe->sspp->idx != SSPP_CURSOR1,
+                               DPU_PLANE_QOS_PANIC_CTRL);
 
        if (pipe->sspp->idx != SSPP_CURSOR0 &&
-           pipe->sspp->idx != SSPP_CURSOR1) {
-               _dpu_plane_set_qos_ctrl(plane, pipe, true, DPU_PLANE_QOS_PANIC_CTRL);
+           pipe->sspp->idx != SSPP_CURSOR1)
                _dpu_plane_set_ot_limit(plane, pipe, pipe_cfg, frame_rate);
-       }
 
        if (pstate->needs_qos_remap)
                _dpu_plane_set_qos_remap(plane, pipe);