]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
projects / thirdparty / kernel / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a9dece6)
drm/msm/dpu: Fix LM size on a number of platforms
authorKonrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Tue, 27 Jan 2026 10:58:49 +0000 (11:58 +0100)
committerDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Mon, 23 Feb 2026 23:24:46 +0000 (01:24 +0200)
The register space has grown with what seems to be DPU8.
Bump up the .len to match.

Fixes: e3b1f369db5a ("drm/msm/dpu: Add X1E80100 support")
Fixes: 4a352c2fc15a ("drm/msm/dpu: Introduce SC8280XP")
Fixes: efcd0107727c ("drm/msm/dpu: add support for SM8550")
Fixes: 100d7ef6995d ("drm/msm/dpu: add support for SM8450")
Fixes: 178575173472 ("drm/msm/dpu: add catalog entry for SAR2130P")
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>
Reviewed-by: Dmitry 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: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h patch | blob | blame | history
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h patch | blob | blame | history
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h patch | blob | blame | history
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h patch | blob | blame | history
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h patch | blob | blame | history

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
index 303d33dc7783ac91a496fa0a19860564ad0b6d5d..9f2bceca1789ede4ed07b3ccb169a44399e7363c 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
@@ -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,
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
index b09a6af4c474aa9301c0ef6bc0ce71ba42cce3a2..04b22167f93d66aa75d29d222edc8424b798192e 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
@@ -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,
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
index 465b6460f8754df18bbcf4baac2f8a3ebdea3324..4c7eb55d474c5149321cab99a936de4c6f488c8d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
@@ -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,
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h
index 6caa7d40f368802793c8690544c1c82b49a617cd..dec83ea8167d1de4f8fd05b582bf05c66d8a54e7 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h
@@ -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,
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h
index 7243eebb85f36f2a8ae848f2c95d21b0bc3bebef..52ff4baa668a4b90e51f8e0c99c0141ffa9db51b 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h
@@ -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,
A mirror of Linus' kernel repository