From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F40B382F2C for ; Fri, 13 Mar 2026 08:33:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773390803; cv=none; b=c0dvqW9HMoYd3C5OC5Qyh34QifaV2SQgjqa7Ih196EOctOjA2ljCJ70yhW1fipQy7g3YpTMcak1xRcEKbqo64iaZILqcovi+SeNKirATIWNr/npeAbkGQKJdVQuoMOE+5wFjnLr79hiFCyUIPVpD1HtUi63UKD707r0h8jAYPuE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773390803; c=relaxed/simple; bh=nIe5XlUNriiR8D6Am6b8PFXzokq99k3sTxbhixq+J8A=; h=Mime-Version:Content-Type:Date:Message-Id:Subject:From:To:Cc: References:In-Reply-To; b=Bp44HDQ5a7m7HmvBpLnBPhVPdVrl7B1K4aLuFV2eQaHsVN0yWSa4MtsbB/dL8HOZlL1QNBBnMdZo7NBrC7991cXMXz0a6hV+7Fh+ze+WsvI/ZpEYdRmOHoc0kE3hS7CCQ4IoDLnJEyx7zS9sf31CEUOlMKDd4WPMnQNdTEU9POI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fairphone.com; spf=pass smtp.mailfrom=fairphone.com; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b=2M514VPN; arc=none smtp.client-ip=209.85.208.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fairphone.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fairphone.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="2M514VPN" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-6642a16be1cso248823a12.3 for ; Fri, 13 Mar 2026 01:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1773390799; x=1773995599; darn=vger.kernel.org; h=in-reply-to:references:cc:to:from:subject:message-id:date :content-transfer-encoding:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=/of78zuCI1x5T6ZYrwM97n73xB/ugxAeVuA7riCgkNo=; b=2M514VPN9upyiskCuWgTj0DFIuTItOSqYDh9f3BkMEcLSchNXzj3/TIkYP/7oPmmVE t1Z9jzYBayoHRe7IhM9wFkoEB/6h+WFN+c5+onPqwuNUX9MwVz4EgVOLhgn4KFWn+YLc QtpVrQ+zrky7cncsgG0FGh9BUQxEBShonC7rUUCjJWlFBFBH/j4st0jy9yxtEAEnUiro 3DrNAZU3Z3u92FA34o28w0PRd+rCQAGc7xwUPkUblZ0STH9TJsFfdZDaYlczuOV8wUy2 +yDfPDDKwbQIVR2FB8G7LyAodcnjY2kZ16YTl4a+yyTpZbihgX9fF9IbKycmkqp6kNqW 6jVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773390799; x=1773995599; h=in-reply-to:references:cc:to:from:subject:message-id:date :content-transfer-encoding:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=/of78zuCI1x5T6ZYrwM97n73xB/ugxAeVuA7riCgkNo=; b=cIijjS+CylmBpZoEPhWtQpBPsVKoobUe/JeDGI0efbzTGT+y4KVlppv79aFFVnvWvd 2EgBylS274I7iDogn0BaW4q0DFNFZhOu5Z2k1hTSu/T+jFrtaTCZK4/e2wpSpfaGpvdJ LzawKYnf/+keGK08bdM68+ZQeKBq8crOwrY3TcR+fXHVGFF8lCxW4tKurUHffm/dFcEj 5v+ciXOuzil6016MnuAturcVbcRyqQTamOpFV6qSs35IH26mfxvByOeR8+T7mkfvKuR6 giHAAY+46CyIDUa6V/cg1JmbVjRIlOdBhJOCK7xaYpi8C4YAJWrWkGGI6SWBFTsbd12J OxsA== X-Forwarded-Encrypted: i=1; AJvYcCUyqYNpn199VK4jtllMO+GdHSwD+QPV9RIikKNwQVEEoL7jOWjFBIZL08e7skwgms1PIS7T1IWwegyYUaw=@vger.kernel.org X-Gm-Message-State: AOJu0Yy6IY+SRcsi4UZHMbe29CkdN4mqYw+NfKoRnEKx9F1285qXe7ar 0/lG/cOUIejVy/OBPiJScNiCrSXOMWZHeEIOCzzCiBb/4AbYGnX6TBIiMl0OY/LcS68= X-Gm-Gg: ATEYQzyMmyq7+rsyGezidcM1qIZjC+QIEU4Ishx433bU1cwCV5hoHbfiVVvBzZoYNvG kG2uqnE0oFVF24wbr4ONk8wobljGE6W070ps+4I8nGdtqIvJg0/W2o1FujvGMGQvk8NPj6whS+I tcwtPHIgm6thBy/DPpbypGuCIE17baJc2mhQhvabumXhjQaB8n2WZIrCl2luZdQREaPuor4D/87 /QKlRHYTOHshrKG+spzm1Ue1WP4S/tRmCb4j8yGp47AHTJFLjGFwcHKgw4sZsBKaBl2dqEwfLH4 SH5/tc92me6q5cc6VPQ68OzUA7w8IG+UoIWhAbP1UeqYJh8INcM9h+0lArWkvLrh5SCUiqXWE26 SX6ATQyK9l/4j6y4Q+S6KrtiOZ1wjZmdbvlfhXB7Wum8Jmloa60yeNGRbffm+feJiQRb8fyUZFm V4SnK9DV58AgkmmwooFEF8FEF2Ma4O/URPXgqgjU3NAS/0CP4kfSe/+tpLvD5cjyafNAta X-Received: by 2002:a17:906:4a9a:b0:b97:f3:1231 with SMTP id a640c23a62f3a-b97653525a2mr101020566b.57.1773390799228; Fri, 13 Mar 2026 01:33:19 -0700 (PDT) Received: from localhost (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b976cc1c154sm28620666b.27.2026.03.13.01.33.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 13 Mar 2026 01:33:18 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Fri, 13 Mar 2026 09:33:18 +0100 Message-Id: Subject: Re: [PATCH v2] drm/msm/disp/dpu: add merge3d support for sc7280 From: "Luca Weiss" To: "Mahadevan P" , "Rob Clark" , "Dmitry Baryshkov" , "Abhinav Kumar" , "Jessica Zhang" , "Sean Paul" , "Marijn Suijten" , "David Airlie" , "Simona Vetter" , "Krishna Manikandan" Cc: , , , , X-Mailer: aerc 0.21.0-0-g5549850facc2 References: <20260101-4k-v2-1-712ae3c1f816@oss.qualcomm.com> In-Reply-To: <20260101-4k-v2-1-712ae3c1f816@oss.qualcomm.com> Hi Mahadevan, On Thu Jan 1, 2026 at 6:04 AM CET, Mahadevan P wrote: > On SC7280 targets, display modes with a width greater than the > max_mixer_width (2400) are rejected during mode validation when > merge3d is disabled. This limitation exists because, without a > 3D merge block, two layer mixers cannot be combined(non-DSC interface), > preventing large layers from being split across mixers. As a result, > higher resolution modes cannot be supported. > > Enable merge3d support on SC7280 to allow combining streams from > two layer mixers into a single non-DSC interface. This capability > removes the width restriction and enables buffer sizes beyond the > 2400-pixel limit. > > Fixes: 591e34a091d1 ("drm/msm/disp/dpu1: add support for display for SC72= 80 target") > Signed-off-by: Mahadevan P This patch is causing display regression on QCM6490 fairphone-fp5. With this patch in 7.0-rc3 (or 6.18.16) there's just pink noise on the screen. When reverting this patch everything becomes working again. See also https://salsa.debian.org/Mobian-team/devices/kernels/qcom-linux/-/= issues/41 @Dmitry: Can we revert this for later 7.0-rc, in case it's not fixed quickly? Regards Luca #regzbot introduced: 2892de3f4f985fa779c330468e2f341fdb762ccd > --- > Changes in v2: > - Updated commit message for clarity (Dmitry). > --- > 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/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h > index 8f978b9c3452..2f8688224f34 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 =3D { > .has_dim_layer =3D true, > .has_idle_pc =3D true, > .max_linewidth =3D 2400, > + .has_3d_merge =3D true, > .pixel_ram_size =3D DEFAULT_PIXEL_RAM_SIZE, > }; > =20 > @@ -134,17 +135,24 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = =3D { > .name =3D "pingpong_2", .id =3D PINGPONG_2, > .base =3D 0x6b000, .len =3D 0, > .sblk =3D &sc7280_pp_sblk, > - .merge_3d =3D 0, > + .merge_3d =3D MERGE_3D_1, > .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), > }, { > .name =3D "pingpong_3", .id =3D PINGPONG_3, > .base =3D 0x6c000, .len =3D 0, > .sblk =3D &sc7280_pp_sblk, > - .merge_3d =3D 0, > + .merge_3d =3D MERGE_3D_1, > .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), > }, > }; > =20 > +static const struct dpu_merge_3d_cfg sc7280_merge_3d[] =3D { > + { > + .name =3D "merge_3d_1", .id =3D MERGE_3D_1, > + .base =3D 0x4f000, .len =3D 0x8, > + }, > +}; > + > /* NOTE: sc7280 only has one DSC hard slice encoder */ > static const struct dpu_dsc_cfg sc7280_dsc[] =3D { > { > @@ -247,6 +255,8 @@ const struct dpu_mdss_cfg dpu_sc7280_cfg =3D { > .mixer =3D sc7280_lm, > .pingpong_count =3D ARRAY_SIZE(sc7280_pp), > .pingpong =3D sc7280_pp, > + .merge_3d_count =3D ARRAY_SIZE(sc7280_merge_3d), > + .merge_3d =3D sc7280_merge_3d, > .dsc_count =3D ARRAY_SIZE(sc7280_dsc), > .dsc =3D sc7280_dsc, > .wb_count =3D ARRAY_SIZE(sc7280_wb), > > --- > base-commit: efb26a23ed5f5dc3554886ab398f559dcb1de96b > change-id: 20251231-4k-969b53d2ea4c > > Best regards,