drm/msm/disp: Use plane debug print helper

Use the DPU_DEBUG_PLANE() helper to print the plane number instead of
open coding it.

Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Abhinav Kumar <abhinavk@codeaurora.org>
Cc: Kuogee Hsieh <khsieh@codeaurora.org>
Cc: aravindh@codeaurora.org
Cc: Sean Paul <sean@poorly.run>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20210430193104.1770538-6-swboyd@chromium.org
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 7a99354..4863b37 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -284,8 +284,8 @@ static int _dpu_plane_calc_fill_level(struct drm_plane *plane,
                }
        }
 
-       DPU_DEBUG("plane%u: pnum:%d fmt: %4.4s w:%u fl:%u\n",
-                       plane->base.id, pdpu->pipe - SSPP_VIG0,
+       DPU_DEBUG_PLANE(pdpu, "pnum:%d fmt: %4.4s w:%u fl:%u\n",
+                       pdpu->pipe - SSPP_VIG0,
                        (char *)&fmt->base.pixel_format,
                        src_width, total_fl);
 
@@ -354,8 +354,7 @@ static void _dpu_plane_set_qos_lut(struct drm_plane *plane,
                        (fmt) ? fmt->base.pixel_format : 0,
                        pdpu->is_rt_pipe, total_fl, qos_lut, lut_usage);
 
-       DPU_DEBUG("plane%u: pnum:%d fmt: %4.4s rt:%d fl:%u lut:0x%llx\n",
-                       plane->base.id,
+       DPU_DEBUG_PLANE(pdpu, "pnum:%d fmt: %4.4s rt:%d fl:%u lut:0x%llx\n",
                        pdpu->pipe - SSPP_VIG0,
                        fmt ? (char *)&fmt->base.pixel_format : NULL,
                        pdpu->is_rt_pipe, total_fl, qos_lut);
@@ -407,8 +406,7 @@ static void _dpu_plane_set_danger_lut(struct drm_plane *plane,
                        pdpu->pipe_qos_cfg.danger_lut,
                        pdpu->pipe_qos_cfg.safe_lut);
 
-       DPU_DEBUG("plane%u: pnum:%d fmt: %4.4s mode:%d luts[0x%x, 0x%x]\n",
-               plane->base.id,
+       DPU_DEBUG_PLANE(pdpu, "pnum:%d fmt: %4.4s mode:%d luts[0x%x, 0x%x]\n",
                pdpu->pipe - SSPP_VIG0,
                fmt ? (char *)&fmt->base.pixel_format : NULL,
                fmt ? fmt->fetch_mode : -1,
@@ -451,8 +449,7 @@ static void _dpu_plane_set_qos_ctrl(struct drm_plane *plane,
                pdpu->pipe_qos_cfg.danger_safe_en = false;
        }
 
-       DPU_DEBUG("plane%u: pnum:%d ds:%d vb:%d pri[0x%x, 0x%x] is_rt:%d\n",
-               plane->base.id,
+       DPU_DEBUG_PLANE(pdpu, "pnum:%d ds:%d vb:%d pri[0x%x, 0x%x] is_rt:%d\n",
                pdpu->pipe - SSPP_VIG0,
                pdpu->pipe_qos_cfg.danger_safe_en,
                pdpu->pipe_qos_cfg.vblank_en,
@@ -507,8 +504,8 @@ static void _dpu_plane_set_qos_remap(struct drm_plane *plane)
        qos_params.num = pdpu->pipe_hw->idx - SSPP_VIG0;
        qos_params.is_rt = pdpu->is_rt_pipe;
 
-       DPU_DEBUG("plane%d pipe:%d vbif:%d xin:%d rt:%d, clk_ctrl:%d\n",
-                       plane->base.id, qos_params.num,
+       DPU_DEBUG_PLANE(pdpu, "pipe:%d vbif:%d xin:%d rt:%d, clk_ctrl:%d\n",
+                       qos_params.num,
                        qos_params.vbif_idx,
                        qos_params.xin_id, qos_params.is_rt,
                        qos_params.clk_ctrl);