Skip to content

Commit 686eb89

Browse files
rawoulAbhinav Kumar
authored andcommitted
drm/msm/dpu: tweak lm pairings in msm8998 hw catalog
Change lm blocks pairs so that lm blocks with the same features are paired together: LM_0 and LM_1 with PP and DSPP LM_2 and LM_5 with PP LM_3 and LM_4 This matches the sdm845 configuration and allows using pp or dspp when 2 lm blocks are needed in the topology. In the previous config the reservation code could never find an lm pair without a matching feature set. Signed-off-by: Arnaud Vrac <[email protected]> Fixes: 94391a1 ("drm/msm/dpu1: Add MSM8998 to hw catalog") Reviewed-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/532905/ Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Abhinav Kumar <[email protected]>
1 parent 3f23a52 commit 686eb89

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,17 @@ static const struct dpu_sspp_cfg msm8998_sspp[] = {
9898

9999
static const struct dpu_lm_cfg msm8998_lm[] = {
100100
LM_BLK("lm_0", LM_0, 0x44000, MIXER_MSM8998_MASK,
101-
&msm8998_lm_sblk, PINGPONG_0, LM_2, DSPP_0),
101+
&msm8998_lm_sblk, PINGPONG_0, LM_1, DSPP_0),
102102
LM_BLK("lm_1", LM_1, 0x45000, MIXER_MSM8998_MASK,
103-
&msm8998_lm_sblk, PINGPONG_1, LM_5, DSPP_1),
103+
&msm8998_lm_sblk, PINGPONG_1, LM_0, DSPP_1),
104104
LM_BLK("lm_2", LM_2, 0x46000, MIXER_MSM8998_MASK,
105-
&msm8998_lm_sblk, PINGPONG_2, LM_0, 0),
105+
&msm8998_lm_sblk, PINGPONG_2, LM_5, 0),
106106
LM_BLK("lm_3", LM_3, 0x47000, MIXER_MSM8998_MASK,
107107
&msm8998_lm_sblk, PINGPONG_MAX, 0, 0),
108108
LM_BLK("lm_4", LM_4, 0x48000, MIXER_MSM8998_MASK,
109109
&msm8998_lm_sblk, PINGPONG_MAX, 0, 0),
110110
LM_BLK("lm_5", LM_5, 0x49000, MIXER_MSM8998_MASK,
111-
&msm8998_lm_sblk, PINGPONG_3, LM_1, 0),
111+
&msm8998_lm_sblk, PINGPONG_3, LM_2, 0),
112112
};
113113

114114
static const struct dpu_pingpong_cfg msm8998_pp[] = {

0 commit comments

Comments
 (0)