Commit f7bf1319 authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Dmitry Baryshkov
Browse files

drm/msm/dpu: Fix LM size on a number of platforms 



The register space has grown with what seems to be DPU8.
Bump up the .len to match.

Fixes: e3b1f369 ("drm/msm/dpu: Add X1E80100 support")
Fixes: 4a352c2f ("drm/msm/dpu: Introduce SC8280XP")
Fixes: efcd0107 ("drm/msm/dpu: add support for SM8550")
Fixes: 100d7ef6 ("drm/msm/dpu: add support for SM8450")
Fixes: 17857517 ("drm/msm/dpu: add catalog entry for SAR2130P")
Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: default avatarAbel Vesa <abel.vesa@oss.qualcomm.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/701063/
Link: https://lore.kernel.org/r/20260127-topic-lm_size_fix-v1-1-25f88d014dfd@oss.qualcomm.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
parent a9dece60

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

+6 −6
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static const struct dpu_sspp_cfg sc8280xp_sspp[] = { 
static const struct dpu_lm_cfg sc8280xp_lm[] = {

	{

		.name = "lm_0", .id = LM_0,

		.base = 0x44000, .len = 0x320,

		.base = 0x44000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_1,
@@ -141,7 +141,7 @@ static const struct dpu_lm_cfg sc8280xp_lm[] = { 
		.dspp = DSPP_0,

	}, {

		.name = "lm_1", .id = LM_1,

		.base = 0x45000, .len = 0x320,

		.base = 0x45000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_0,
@@ -149,7 +149,7 @@ static const struct dpu_lm_cfg sc8280xp_lm[] = { 
		.dspp = DSPP_1,

	}, {

		.name = "lm_2", .id = LM_2,

		.base = 0x46000, .len = 0x320,

		.base = 0x46000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_3,
@@ -157,7 +157,7 @@ static const struct dpu_lm_cfg sc8280xp_lm[] = { 
		.dspp = DSPP_2,

	}, {

		.name = "lm_3", .id = LM_3,

		.base = 0x47000, .len = 0x320,

		.base = 0x47000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_2,
@@ -165,14 +165,14 @@ static const struct dpu_lm_cfg sc8280xp_lm[] = { 
		.dspp = DSPP_3,

	}, {

		.name = "lm_4", .id = LM_4,

		.base = 0x48000, .len = 0x320,

		.base = 0x48000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_5,

		.pingpong = PINGPONG_4,

	}, {

		.name = "lm_5", .id = LM_5,

		.base = 0x49000, .len = 0x320,

		.base = 0x49000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_4,

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

+6 −6
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static const struct dpu_sspp_cfg sm8450_sspp[] = { 
static const struct dpu_lm_cfg sm8450_lm[] = {

	{

		.name = "lm_0", .id = LM_0,

		.base = 0x44000, .len = 0x320,

		.base = 0x44000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_1,
@@ -142,7 +142,7 @@ static const struct dpu_lm_cfg sm8450_lm[] = { 
		.dspp = DSPP_0,

	}, {

		.name = "lm_1", .id = LM_1,

		.base = 0x45000, .len = 0x320,

		.base = 0x45000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_0,
@@ -150,7 +150,7 @@ static const struct dpu_lm_cfg sm8450_lm[] = { 
		.dspp = DSPP_1,

	}, {

		.name = "lm_2", .id = LM_2,

		.base = 0x46000, .len = 0x320,

		.base = 0x46000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_3,
@@ -158,7 +158,7 @@ static const struct dpu_lm_cfg sm8450_lm[] = { 
		.dspp = DSPP_2,

	}, {

		.name = "lm_3", .id = LM_3,

		.base = 0x47000, .len = 0x320,

		.base = 0x47000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_2,
@@ -166,14 +166,14 @@ static const struct dpu_lm_cfg sm8450_lm[] = { 
		.dspp = DSPP_3,

	}, {

		.name = "lm_4", .id = LM_4,

		.base = 0x48000, .len = 0x320,

		.base = 0x48000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_5,

		.pingpong = PINGPONG_4,

	}, {

		.name = "lm_5", .id = LM_5,

		.base = 0x49000, .len = 0x320,

		.base = 0x49000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_4,

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

+6 −6
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static const struct dpu_sspp_cfg sm8550_sspp[] = { 
static const struct dpu_lm_cfg sm8550_lm[] = {

	{

		.name = "lm_0", .id = LM_0,

		.base = 0x44000, .len = 0x320,

		.base = 0x44000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_1,
@@ -139,7 +139,7 @@ static const struct dpu_lm_cfg sm8550_lm[] = { 
		.dspp = DSPP_0,

	}, {

		.name = "lm_1", .id = LM_1,

		.base = 0x45000, .len = 0x320,

		.base = 0x45000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_0,
@@ -147,7 +147,7 @@ static const struct dpu_lm_cfg sm8550_lm[] = { 
		.dspp = DSPP_1,

	}, {

		.name = "lm_2", .id = LM_2,

		.base = 0x46000, .len = 0x320,

		.base = 0x46000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_3,
@@ -155,7 +155,7 @@ static const struct dpu_lm_cfg sm8550_lm[] = { 
		.dspp = DSPP_2,

	}, {

		.name = "lm_3", .id = LM_3,

		.base = 0x47000, .len = 0x320,

		.base = 0x47000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_2,
@@ -163,14 +163,14 @@ static const struct dpu_lm_cfg sm8550_lm[] = { 
		.dspp = DSPP_3,

	}, {

		.name = "lm_4", .id = LM_4,

		.base = 0x48000, .len = 0x320,

		.base = 0x48000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_5,

		.pingpong = PINGPONG_4,

	}, {

		.name = "lm_5", .id = LM_5,

		.base = 0x49000, .len = 0x320,

		.base = 0x49000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_4,

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

+6 −6
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static const struct dpu_sspp_cfg sar2130p_sspp[] = { 
static const struct dpu_lm_cfg sar2130p_lm[] = {

	{

		.name = "lm_0", .id = LM_0,

		.base = 0x44000, .len = 0x320,

		.base = 0x44000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_1,
@@ -139,7 +139,7 @@ static const struct dpu_lm_cfg sar2130p_lm[] = { 
		.dspp = DSPP_0,

	}, {

		.name = "lm_1", .id = LM_1,

		.base = 0x45000, .len = 0x320,

		.base = 0x45000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_0,
@@ -147,7 +147,7 @@ static const struct dpu_lm_cfg sar2130p_lm[] = { 
		.dspp = DSPP_1,

	}, {

		.name = "lm_2", .id = LM_2,

		.base = 0x46000, .len = 0x320,

		.base = 0x46000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_3,
@@ -155,7 +155,7 @@ static const struct dpu_lm_cfg sar2130p_lm[] = { 
		.dspp = DSPP_2,

	}, {

		.name = "lm_3", .id = LM_3,

		.base = 0x47000, .len = 0x320,

		.base = 0x47000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_2,
@@ -163,14 +163,14 @@ static const struct dpu_lm_cfg sar2130p_lm[] = { 
		.dspp = DSPP_3,

	}, {

		.name = "lm_4", .id = LM_4,

		.base = 0x48000, .len = 0x320,

		.base = 0x48000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_5,

		.pingpong = PINGPONG_4,

	}, {

		.name = "lm_5", .id = LM_5,

		.base = 0x49000, .len = 0x320,

		.base = 0x49000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_4,

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

+6 −6
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static const struct dpu_sspp_cfg x1e80100_sspp[] = { 
static const struct dpu_lm_cfg x1e80100_lm[] = {

	{

		.name = "lm_0", .id = LM_0,

		.base = 0x44000, .len = 0x320,

		.base = 0x44000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_1,
@@ -138,7 +138,7 @@ static const struct dpu_lm_cfg x1e80100_lm[] = { 
		.dspp = DSPP_0,

	}, {

		.name = "lm_1", .id = LM_1,

		.base = 0x45000, .len = 0x320,

		.base = 0x45000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_0,
@@ -146,7 +146,7 @@ static const struct dpu_lm_cfg x1e80100_lm[] = { 
		.dspp = DSPP_1,

	}, {

		.name = "lm_2", .id = LM_2,

		.base = 0x46000, .len = 0x320,

		.base = 0x46000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_3,
@@ -154,7 +154,7 @@ static const struct dpu_lm_cfg x1e80100_lm[] = { 
		.dspp = DSPP_2,

	}, {

		.name = "lm_3", .id = LM_3,

		.base = 0x47000, .len = 0x320,

		.base = 0x47000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_2,
@@ -162,14 +162,14 @@ static const struct dpu_lm_cfg x1e80100_lm[] = { 
		.dspp = DSPP_3,

	}, {

		.name = "lm_4", .id = LM_4,

		.base = 0x48000, .len = 0x320,

		.base = 0x48000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_5,

		.pingpong = PINGPONG_4,

	}, {

		.name = "lm_5", .id = LM_5,

		.base = 0x49000, .len = 0x320,

		.base = 0x49000, .len = 0x400,

		.features = MIXER_MSM8998_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_4,