From nobody Sun Feb 8 04:33:43 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6CC913D8B1 for ; Thu, 1 Jan 2026 05:05:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767243902; cv=none; b=CeQ8K3tJ+urQgsi7kJJU8Y++yOYNZiOqTBivBXJRl8ST7XoviGkCWYM8k0e19A6AMNiLJvk9xnRbkLm/Ke86DAPoqDh/Cp6Lznl7IR4v5WU1qXwPqr0TvI2BKq54mCX5ZVWWmWQsFYUyTbPmu+6uQVXp3gi9CsfPGG1uukdhbis= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767243902; c=relaxed/simple; bh=xqa4amP8z0/9O5shd3ZQo8nN7+fGD7ILoQmcbkQw+kY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=q0PD2BhpyRSJmJTSxut7sx3/psrRxcUBHOk34PQK5HITlbajoXeVY4BkWJHv8LUmmwyaBOGYCz9coB20uOmFsh57K+kUX6syfETYTwMga4TmQRe/XML8n4Gh1zq2cj2ypuHAZb5rGawXYL165h2ZGNKgPxULveGz1wGaae1xtR0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Bd2f7ubz; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=gHvVNeQd; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Bd2f7ubz"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="gHvVNeQd" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6014uuHB1327130 for ; Thu, 1 Jan 2026 05:04:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=07+KOjrq6jz1M5PJIyukzP CzKsJ5MLq+baFE6H1I/tQ=; b=Bd2f7ubzjj28qGwwkcbdgVh7N//DdtsButYPFo MVdLpjIHgUx7HFCfmUugMoyM/Le8yTpgMnataVqggnwUs2R5ovvMNd46s6X4tWxW ttpPo6UX2YVDUJIlfnL82OMBeLilfv9KCuO2vfqRgepSW1MO8OJ6fdt5Xid/Xlkz BRNm+jiQ//tAS+rDcDJl/Y6OHLOZnH52iIKI0Wc4hOfg9r+yNSj2cnpjRAo3ys4G 8puld1KKUVjDqoWHxZ9dnjPzmiyOG1I9fn1DpR2HFeqPQg1y5SowChV60CgPv+Cg Q1y+lytKKxNUbqBFqJBbqycBPn0W/ja8bhvDD/YdcV+LDJeg== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bd2bb1d8t-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 01 Jan 2026 05:04:54 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-7b4933bc4aeso10857974b3a.2 for ; Wed, 31 Dec 2025 21:04:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1767243893; x=1767848693; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=07+KOjrq6jz1M5PJIyukzPCzKsJ5MLq+baFE6H1I/tQ=; b=gHvVNeQdm+l/PXkdX9MjjV1R1GgSY9+NgpT0tOJ6xKF9i4CQg+TY6kEpgCSeWSL43Z RTzSpdzE46J+hefoa3P5ApcUhuuy8i8QoLPKQrdjyUNQhsmobEjRLCUj2AwitYVlUxOi jb4Ie597TnmtbcsbE6DAOQJTKCqaK/w25wXrMm1nSVLydz0ABX7agAV/KKSxds4WqC22 GMBk8P+gcGpdsDlCbGWfLUB82F5rr4C0E3YXz0+M/WV9hgvabB/qnsGH/vKcRp2wxfwo g2UTDt5G5lhPB5uQityhrtIzB0Pi2lf3d6+/rdDk0O71GfqjXmyJhgkytzgvpiRJkXo3 bqyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767243893; x=1767848693; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=07+KOjrq6jz1M5PJIyukzPCzKsJ5MLq+baFE6H1I/tQ=; b=Wmko3m0UlUllu3xipaZoinA6m4BpTEi72CFS61rvWzmh4YdfmSgrBqBsTa2b6epeLo 1RqYM42dYnpKLMxCA4yW7G5/46aD5Nk90R/wGKp6l7a4bAn5uku1J63ZCRCtEY/UEtq8 eXG2+I5kis35x3NFIbAbd3B41bt0kVi6w0GzLdmA4DcBh9rSIIqdDY/aGqR9jyXOkQTS skH3MA+G21G0UeroWxwM+xSvR8gw+T7zSHWhuutVECxoNQLS2JYVcP2FcvCajYDH36iZ wgRapLJpZ7DsIYgDz5BRVIO4gRXsc00RT7DYi42Ez8RSu3ZRagu71fmDK932Y4AMHxXw 1XbQ== X-Forwarded-Encrypted: i=1; AJvYcCXCqEwergcqUzPz4rgvTJKfkNk96KRuRHZf1NGtMioVY2X/oE8j5xHMWxkG9hzRlEipTgJz+4OuVdIKCBo=@vger.kernel.org X-Gm-Message-State: AOJu0YykGygbndYe/g3IUIu2umO1QVX44ctsW8Td/y0gl9ctFwC9mdlj MhyCBFdhaj/C1y9UZbI1HWKbQCfnmtM3hkcusa1HrYdtzniBW+kJYvfrHVRoZaLAiaKieEoA8Uv ACTDRIwP6RLdHZ16rLuQniXFUsZ+wQYxOE3igKkM0IAW30m4E+4JZgiGHBwuEVNa2q1A= X-Gm-Gg: AY/fxX59brukg9o3e4gBwcmgnCHBuEEt31n49JgXybeLhw9cTByQXALm+TQWGZ+39dl HWaVZddTyMGs6XK0XhGM5Uu5Z1BORVETFuSjmoG3+NGO6Hj53/okUufLixr0160UXl6LgD/JKhp BoZM628qh78FgW6Iaw2jMfnX0I041zkT0EixMrzHfUiK+qzKKKhDbNkFokR+EUaJ8Hg6CVr03mW 0N3Fr9LivtYVmUUoIIPT5ZgrCP10qBM1s+gFPWPjCqCWgq/zDBArjfoUDXjg12gMoZmYW4ECTLV woKphVyeBaPzXdQ5jal13zN6x25DFWkxeU/1n6ilRj506hj7q+EvApGNCLjYmCMLxc19jkfu7Pb +c02AiTXDMD2LW9YhUJQrswPc5jDyYWSvMiac X-Received: by 2002:a05:6a00:1d98:b0:7aa:8397:7754 with SMTP id d2e1a72fcca58-7ff64ed1413mr31668850b3a.2.1767243892980; Wed, 31 Dec 2025 21:04:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IHd5bbetNMmPFCI2o+xooK+bp2gy/VQ6yWacZiMYQSjS52Fb5kSaL215a+Cf++Nt/UijyQRMg== X-Received: by 2002:a05:6a00:1d98:b0:7aa:8397:7754 with SMTP id d2e1a72fcca58-7ff64ed1413mr31668826b3a.2.1767243892499; Wed, 31 Dec 2025 21:04:52 -0800 (PST) Received: from hu-mahap-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7ff7e0a0595sm36404922b3a.44.2025.12.31.21.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Dec 2025 21:04:52 -0800 (PST) From: Mahadevan P Date: Thu, 01 Jan 2026 10:34:38 +0530 Subject: [PATCH v2] drm/msm/disp/dpu: add merge3d support for sc7280 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260101-4k-v2-1-712ae3c1f816@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIAGUAVmkC/0XMzQrCMBAE4FcpObulu0l/4sn3EA8x2bZB02iiR Sh9d4MXLwMfzMwmMifPWRyrTSReffZxKaBDJexslonBu2JBDbVIEkHdQHf62kpHbJQVpfhIPPr P7+R8KR5TDPCaE5v/FElB4DSxdJBtT0MDKwJCrwenFSF21J1izvXzbe42hlCXEPv+BQ4IemmhA AAA X-Change-ID: 20251231-4k-969b53d2ea4c To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Krishna Manikandan Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Mahadevan P X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1767243888; l=2753; i=mahadevan.p@oss.qualcomm.com; s=20250923; h=from:subject:message-id; bh=xqa4amP8z0/9O5shd3ZQo8nN7+fGD7ILoQmcbkQw+kY=; b=dL/Y8sUl8BHZxZ3ipn/80+emTBzda4tXdgTE4WQI5DmIWYKmgZQAYgVHSvbrvkkDVk7X/6vcx GuMPq2YMMKOCrsZodaxsgQ0hbvYsFd5WsrwKbx0N5ACTqJVOJqC1564 X-Developer-Key: i=mahadevan.p@oss.qualcomm.com; a=ed25519; pk=wed9wuAek0VbCYfkANx7ujIG4VY0XfCYrffFKPN2p0Y= X-Proofpoint-GUID: 6ZHlkaaRDdlMTpNX73NkxLLZzWp4Ukb6 X-Proofpoint-ORIG-GUID: 6ZHlkaaRDdlMTpNX73NkxLLZzWp4Ukb6 X-Authority-Analysis: v=2.4 cv=dMKrWeZb c=1 sm=1 tr=0 ts=69560076 cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=5FlqbPEWv7NCXEe-mtIA:9 a=QEXdDO2ut3YA:10 a=IoOABgeZipijB_acs4fv:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTAxMDA0NCBTYWx0ZWRfXyyJLQZChU47i g+teSb5jKQFcsQLouTgeGOdeyfRhRyY3YoL9mMalyp14pMND7IylbmtHwWjpJetCqde+tX0j9Kx dZ6W66BjG7n/Ase31WQQdJm2ajxFqXBvSgbiwBXGOTi2aRpJOZ93JsvI21wfKHeixszEWzdLxbX EkthYIBfkSLBopNWYNVyyIFuAQngoTZR/UtK9Uwin7MG+o2Fynz3BHAgEq2jRVVzqLuIpzeHDLq n/pHUVnnjtLa2jNI3h/3IWVT/GSOhz16n7iyQeUuLJM0KSlV/Wq+a53NOiHlr2cbEprFW5cBpdY N50j3v8YYkqJYrSPK8ksiAlj2PpV9l+uG6QG9x2Vzqt3AYqDj/QThQ7a70aKr0p86rpQmc9lpPy V4xv0CencaDBCCC/o0qtSKhuHh6QpclA83oITR/JDN5Dc5FvHrnR9XSzOfirdRNmON/4kmz9D0B kLgR7Br5HKvVrBsuNxA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-01_02,2025-12-31_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 suspectscore=0 spamscore=0 malwarescore=0 impostorscore=0 adultscore=0 phishscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601010044 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 SC7280= target") Signed-off-by: Mahadevan P Reviewed-by: Dmitry Baryshkov --- 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/drive= rs/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, --=20 Mahadevan P