[PATCH] drm/msm/disp/dpu: add merge3d support for sc7280

[PATCH] drm/msm/disp/dpu: add merge3d support for sc7280

[Mahadevan P]

Add support for the merge3d block on sc7280 which will allow
merge of streams coming from two layer mixers routed to single
non DSC interface. This change helps to support larger buffer
width which exceeds max_linewidth of 2400.

Fixes: 591e34a091d1 ("drm/msm/disp/dpu1: add support for display for SC7280 target")
Signed-off-by: Mahadevan P <mahadevan.p@oss.qualcomm.com>
---
 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
index 8f978b9c345202d3ea1a7781e4ef2763b46c6f6e..2f8688224f3430ff6d2aa80836b72262ed5b7058 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
@@ -13,6 +13,7 @@ static const struct dpu_caps sc7280_dpu_caps = {
 	.has_dim_layer = true,
 	.has_idle_pc = true,
 	.max_linewidth = 2400,
+	.has_3d_merge = true,
 	.pixel_ram_size = DEFAULT_PIXEL_RAM_SIZE,
 };
 
@@ -134,17 +135,24 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = {
 		.name = "pingpong_2", .id = PINGPONG_2,
 		.base = 0x6b000, .len = 0,
 		.sblk = &sc7280_pp_sblk,
-		.merge_3d = 0,
+		.merge_3d = MERGE_3D_1,
 		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
 	}, {
 		.name = "pingpong_3", .id = PINGPONG_3,
 		.base = 0x6c000, .len = 0,
 		.sblk = &sc7280_pp_sblk,
-		.merge_3d = 0,
+		.merge_3d = MERGE_3D_1,
 		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
 	},
 };
 
+static const struct dpu_merge_3d_cfg sc7280_merge_3d[] = {
+	{
+		.name = "merge_3d_1", .id = MERGE_3D_1,
+		.base = 0x4f000, .len = 0x8,
+	},
+};
+
 /* NOTE: sc7280 only has one DSC hard slice encoder */
 static const struct dpu_dsc_cfg sc7280_dsc[] = {
 	{
@@ -247,6 +255,8 @@ const struct dpu_mdss_cfg dpu_sc7280_cfg = {
 	.mixer = sc7280_lm,
 	.pingpong_count = ARRAY_SIZE(sc7280_pp),
 	.pingpong = sc7280_pp,
+	.merge_3d_count = ARRAY_SIZE(sc7280_merge_3d),
+	.merge_3d = sc7280_merge_3d,
 	.dsc_count = ARRAY_SIZE(sc7280_dsc),
 	.dsc = sc7280_dsc,
 	.wb_count = ARRAY_SIZE(sc7280_wb),

---
base-commit: d724c6f85e80a23ed46b7ebc6e38b527c09d64f5
change-id: 20251124-merge3d-sc7280-752dbacc35a4

Best regards,
-- 
Mahadevan P <mahadevan.p@oss.qualcomm.com>

Re: [PATCH] drm/msm/disp/dpu: add merge3d support for sc7280

[Dmitry Baryshkov]

On Mon, Nov 24, 2025 at 07:57:01PM +0530, Mahadevan P wrote:
> Add support for the merge3d block on sc7280 which will allow
> merge of streams coming from two layer mixers routed to single
> non DSC interface. This change helps to support larger buffer
> width which exceeds max_linewidth of 2400.

Please see Documentation/process/submitting-patches.rst.

First describe the issue that you observe, then describe steps required
for solving it.

> Fixes: 591e34a091d1 ("drm/msm/disp/dpu1: add support for display for SC7280 target")
> Signed-off-by: Mahadevan P <mahadevan.p@oss.qualcomm.com>
> ---
>  drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 

The patch LGTM.

-- 
With best wishes
Dmitry

Re: [PATCH] drm/msm/disp/dpu: add merge3d support for sc7280

[Dmitry Baryshkov]

On Wed, Nov 26, 2025 at 02:32:41AM +0200, Dmitry Baryshkov wrote:
> On Mon, Nov 24, 2025 at 07:57:01PM +0530, Mahadevan P wrote:
> > Add support for the merge3d block on sc7280 which will allow
> > merge of streams coming from two layer mixers routed to single
> > non DSC interface. This change helps to support larger buffer
> > width which exceeds max_linewidth of 2400.
> 
> Please see Documentation/process/submitting-patches.rst.
> 
> First describe the issue that you observe, then describe steps required
> for solving it.
> 
> > Fixes: 591e34a091d1 ("drm/msm/disp/dpu1: add support for display for SC7280 target")
> > Signed-off-by: Mahadevan P <mahadevan.p@oss.qualcomm.com>
> > ---
> >  drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14 ++++++++++++--
> >  1 file changed, 12 insertions(+), 2 deletions(-)
> > 
> 
> The patch LGTM.

Mahadevan, you got review comments about a month ago. Any updates?

-- 
With best wishes
Dmitry

Re: [PATCH] drm/msm/disp/dpu: add merge3d support for sc7280

[Mahadevan P]

On 12/24/2025 12:05 PM, Dmitry Baryshkov wrote:
> On Wed, Nov 26, 2025 at 02:32:41AM +0200, Dmitry Baryshkov wrote:
>> On Mon, Nov 24, 2025 at 07:57:01PM +0530, Mahadevan P wrote:
>>> Add support for the merge3d block on sc7280 which will allow
>>> merge of streams coming from two layer mixers routed to single
>>> non DSC interface. This change helps to support larger buffer
>>> width which exceeds max_linewidth of 2400.
>>
>> Please see Documentation/process/submitting-patches.rst.
>>
>> First describe the issue that you observe, then describe steps required
>> for solving it.
>>
>>> Fixes: 591e34a091d1 ("drm/msm/disp/dpu1: add support for display for SC7280 target")
>>> Signed-off-by: Mahadevan P <mahadevan.p@oss.qualcomm.com>
>>> ---
>>>   drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14 ++++++++++++--
>>>   1 file changed, 12 insertions(+), 2 deletions(-)
>>>
>>
>> The patch LGTM.
> 
> Mahadevan, you got review comments about a month ago. Any updates?
I apologize for the delay. I will update the commit message as per your 
suggestion and post the revised patch within a week.
>