drm/msm/dpu: Define names for unnamed sblks

Some sub-blocks in the hw catalog have not been given a name, so when the
registers from that block are dumped, there is no name to reference.
Define names for relevant sub-blocks to fix this.

Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Ryan McCann <quic_rmccann@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/546199/
Link: https://lore.kernel.org/r/20230622-devcoredump_patch-v5-3-67e8b66c4723@quicinc.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
index 95305e1..32ac754 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
@@ -417,12 +417,12 @@ static const struct dpu_lm_sub_blks qcm2290_lm_sblk = {
  * DSPP sub blocks config
  *************************************************************/
 static const struct dpu_dspp_sub_blks msm8998_dspp_sblk = {
-       .pcc = {.id = DPU_DSPP_PCC, .base = 0x1700,
+       .pcc = {.name = "pcc", .id = DPU_DSPP_PCC, .base = 0x1700,
                .len = 0x90, .version = 0x10007},
 };
 
 static const struct dpu_dspp_sub_blks sdm845_dspp_sblk = {
-       .pcc = {.id = DPU_DSPP_PCC, .base = 0x1700,
+       .pcc = {.name = "pcc", .id = DPU_DSPP_PCC, .base = 0x1700,
                .len = 0x90, .version = 0x40000},
 };
 
@@ -430,19 +430,19 @@ static const struct dpu_dspp_sub_blks sdm845_dspp_sblk = {
  * PINGPONG sub blocks config
  *************************************************************/
 static const struct dpu_pingpong_sub_blks sdm845_pp_sblk_te = {
-       .te2 = {.id = DPU_PINGPONG_TE2, .base = 0x2000, .len = 0x0,
+       .te2 = {.name = "te2", .id = DPU_PINGPONG_TE2, .base = 0x2000, .len = 0x0,
                .version = 0x1},
-       .dither = {.id = DPU_PINGPONG_DITHER, .base = 0x30e0,
+       .dither = {.name = "dither", .id = DPU_PINGPONG_DITHER, .base = 0x30e0,
                .len = 0x20, .version = 0x10000},
 };
 
 static const struct dpu_pingpong_sub_blks sdm845_pp_sblk = {
-       .dither = {.id = DPU_PINGPONG_DITHER, .base = 0x30e0,
+       .dither = {.name = "dither", .id = DPU_PINGPONG_DITHER, .base = 0x30e0,
                .len = 0x20, .version = 0x10000},
 };
 
 static const struct dpu_pingpong_sub_blks sc7280_pp_sblk = {
-       .dither = {.id = DPU_PINGPONG_DITHER, .base = 0xe0,
+       .dither = {.name = "dither", .id = DPU_PINGPONG_DITHER, .base = 0xe0,
        .len = 0x20, .version = 0x20000},
 };
 
@@ -450,13 +450,13 @@ static const struct dpu_pingpong_sub_blks sc7280_pp_sblk = {
  * DSC sub blocks config
  *************************************************************/
 static const struct dpu_dsc_sub_blks dsc_sblk_0 = {
-       .enc = {.base = 0x100, .len = 0x100},
-       .ctl = {.base = 0xF00, .len = 0x10},
+       .enc = {.name = "enc", .base = 0x100, .len = 0x100},
+       .ctl = {.name = "ctl", .base = 0xF00, .len = 0x10},
 };
 
 static const struct dpu_dsc_sub_blks dsc_sblk_1 = {
-       .enc = {.base = 0x200, .len = 0x100},
-       .ctl = {.base = 0xF80, .len = 0x10},
+       .enc = {.name = "enc", .base = 0x200, .len = 0x100},
+       .ctl = {.name = "ctl", .base = 0xF80, .len = 0x10},
 };
 
 /*************************************************************