From nobody Tue Dec 2 00:26:25 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 9F0702A1C7 for ; Mon, 24 Nov 2025 14:27:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763994435; cv=none; b=KfuTj29JC//E3E2EPx4KPZogJaSYbOe0926z+pYNhzfI1c9iuaV2QsmXoi8BFIF2YF/5/aXlcDyvKoHlAD8et+ypkyHCas6o8/yqbzdebU4GFLgUjnwO+4Z/yyv+nkphtJqgVmBzyAIgZ+4y9YnKP2lKKekD0vctKjyKMI4wtjg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763994435; c=relaxed/simple; bh=Cqakb/xfljPG9dtjKNPYMpTRNnHruMaDQIKf8YD6vOI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=TKkchrupwy+vAc/FGCPf6Yhox77M38cVA+aC3pu+BfeXTFHziTSqEXctYfvqCyAZHcKdrYEQQD968EugodcCvwpD0Xj4Rpsxg3QRAx6gU8peYAw4DnKnV2nxWbSogqGkNAXWgnykgif0THqCOVYoJbarO1ocA1yZTgMXCeiTLoQ= 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=TjoQccNK; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=BpsaDNm2; arc=none smtp.client-ip=205.220.168.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="TjoQccNK"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="BpsaDNm2" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5AOE96D7079616 for ; Mon, 24 Nov 2025 14:27:12 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=0HW5XLCUu/d+MIz/UiAcX3 6i++Er1qyFHbbeEgya9aY=; b=TjoQccNKnIPMb4XQ4/AQYLSBhgCUwdQzVxJJ93 CTdd2SHf6kgDaD6J4tKZv8OFwePXEmaLMRQyxZJ3gynWH1LnVu1bdlEtSWgT7vzd pSWspuZPoP25MBLLnYCgdxGG3uck8q4tdJSQC6cp2Z8esY888Kvxe2QwmNfGr4jK IE/d1xIYQIp2nCYTo6scYTPCqAkTQBrY4hnI694nHPIf48LcQmZa2Atv+jN/WFCA lzbPhAqEE/TeW8z9/Vkc6/I8LTe5AT7ldm80I2CTEMR06/AVjtYddIOIrXcTrrF/ QL3+SiPvFjtPlXryxeGBtFdvfgU3c2X5EMw9MwmERM1HBBNg== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4amrv681fc-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 24 Nov 2025 14:27:12 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-295fbc7d4abso67281075ad.1 for ; Mon, 24 Nov 2025 06:27:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1763994432; x=1764599232; 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=0HW5XLCUu/d+MIz/UiAcX36i++Er1qyFHbbeEgya9aY=; b=BpsaDNm29kiO8mZLSyIjUpBLkUtdQ+Ie08LPjHVE07Bvj0RmRRy6d7V4bru1gK+F+b 9QYO3g8c7b2FebXu4nWXHFh4i6ggU8wpQLQk3r/YAMskEARzimq7Lw8BtIoYBfeaC+7S eN9De0ATQcmZWRHI2jvOCOyNtQvb17wIJ/kBvjUUfG6uS5VpXSEjiTkUggXbzdXy/lER JcNUf1cNXCac+ESoB+AlclhIo+2R8yrD+9WKhdMECqsvLfrBivJVjguvWUGvSHPawoGi MydX9AANyHV5mgKAvyKYfXQOHVffq+6m5ubBdj471gKINPhpJaAD8koYhJuaRJCMHd23 0oMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763994432; x=1764599232; 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=0HW5XLCUu/d+MIz/UiAcX36i++Er1qyFHbbeEgya9aY=; b=RobT2nEEHT3fwM4LAl5X6rZGcP6LD8i7xYZpPWjP7F41q8tsZ2l14O0xVCjJmGnJUW TOXHbTWZ0FXKcFBPoN/+waqEXoLskiJOXqP2cpU1+vVWA88D6w9qI8hjuS/OEKi2fPfo yT102R2hox2uELEROc3KO2o0p2vScX+o9Ka2I7zEM6iMvhDXsslh2LsKrx5rjRHBRaXa 3pb7BlCiedUsnuv3g5L/GkgWM+rikuSGtgNpsXMcQDNPYiPjLM81qdqroSfp4Vcoi1YP A8oi5fMKUZtesUA/cumtKPxBW+LwFBFQw0MuylDx6NvU/SHTjfFfxuxWVS+JpQfLrWdJ kPBg== X-Forwarded-Encrypted: i=1; AJvYcCVzPrCXtuHYi5FzKGY/zmpruQOk0PitVWh9eACDeLOe8+AXgaUJQ9L484TIyTnxo9yQgWtC7uirzMNMwHk=@vger.kernel.org X-Gm-Message-State: AOJu0YzmjP5fQ9bMJbrLGk3bZI96HYrvdyfUrrbGUdBi18rsxWI7jcVd 9fm8gQa5QykPeF8pi0ra91gcIvz3GHKzLD+EEJyrAiMH1t3GeSjrqSEqpmP1ptme/BdFDwC4R8Z w1Xrv2jgrCo0GNdWNkVq7mHPpqyFzSJq2F/sSoYT6IZQpj9s5lxcyOP8Vlc5f2hJrJto= X-Gm-Gg: ASbGnctFUG39gwJMQPSUGRGbocVYwBVJvGDJ2pCKwVV+CWBmnPKuO1QFZiYnEjnwCW5 e1zOBd57bq7VzIWjXuZR499CvuUkH/UiW+UcnJfv4maAGNSee0wam4edwcdwDWpog0Uw97yf4/v N+5QpgRd+cjQMXYuxfiwwbhRGmllZOrSm6zQ14jzzMQi1HSsJKHakeaOtPS3cFS10ltaOAARggE lyxjzK3fAGH16yrYJ/IAXW91pRaAqdiL1UzfNGsuit8gV5FIPwVhQZV6M/SZ7fwGTXH/uke48Dt uKjz/1nlj8mVbyJHdd/0vTdYG3+fBUnTgahqtKHutFLp8RmPrduAhro26s4+y5XMvYbZEvj0bbl zLl90LfE+XC00yDJuHT1CRaiex+QtRUXCe3LL X-Received: by 2002:a17:902:f60d:b0:298:1288:e873 with SMTP id d9443c01a7336-29b6bf841fdmr150523375ad.56.1763994431901; Mon, 24 Nov 2025 06:27:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IHvj5vvlpXKGpda7uqJ0yoxGLT7O0Qfxwh8v6kPITKB/su/JLICLN0aRP9xSR2chCAxHf9+KQ== X-Received: by 2002:a17:902:f60d:b0:298:1288:e873 with SMTP id d9443c01a7336-29b6bf841fdmr150522895ad.56.1763994431266; Mon, 24 Nov 2025 06:27:11 -0800 (PST) Received: from hu-mahap-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29b5b25e4basm135549715ad.47.2025.11.24.06.27.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 06:27:10 -0800 (PST) From: Mahadevan P Date: Mon, 24 Nov 2025 19:57:01 +0530 Subject: [PATCH] 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: <20251124-merge3d-sc7280-v1-1-798d94211626@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIADRrJGkC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDI1NDQyMT3dzUovRU4xTd4mRzIwsDXXNTo5SkxORkY9NEEyWgpoKi1LTMCrC B0bG1tQAHNqsDYAAAAA== X-Change-ID: 20251124-merge3d-sc7280-752dbacc35a4 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.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1763994427; l=2380; i=mahadevan.p@oss.qualcomm.com; s=20250923; h=from:subject:message-id; bh=Cqakb/xfljPG9dtjKNPYMpTRNnHruMaDQIKf8YD6vOI=; b=hiN+PFBJeuzG5CK/eZUy2WYBNdpKWqLzNd1hHDYTDzrg3A4OsVtpRjp7+F0vbtcvd8hr1R7JX xAh5y2fgq1LDLgSqZ21crIfK0gRyYma8AbydGXwBJ/a4Ij+rncXTD+A X-Developer-Key: i=mahadevan.p@oss.qualcomm.com; a=ed25519; pk=wed9wuAek0VbCYfkANx7ujIG4VY0XfCYrffFKPN2p0Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTI0MDEyNiBTYWx0ZWRfX4jHwDFAlgd2W SU/sK6A8UmXWQCbUY5komNz6TV/bGDbfJydiI0V4V6KK6SoGamHjMp7KRVn5z0bfczXiSN7bgkw 9dg9RxH3rKH6ucyDCjulvbod9qzzknMdk2BgCdSD0kRs1hZsxA3j8/5LSKctu9q/1VvBKiFVcHp bwka7kVgnZhS6o5DBRKecO9mLl/LsYysBs78ZOol+c9SPvw7xSQrkYs8TbzSctAliseCEOsrDqL 6bAsyP5yXWrXos3dZjqRAhLxxyH/2poQIzJHSwK2DELXxwfUAuvGADw3a7U9U7XRBeYd0kBVlpK jcmA2hZkUkNn0FiEnOXxwrYxjw+x061pcW4vtmY9pqSevHnZcdP9kDc0YW6DGm60LZadl2z4a98 ixi9A13H4a7RXVpOOL33KBWwqrJX1A== X-Proofpoint-GUID: dpAKYgN3T7VObPSkktpjO3dfLtBwqGQs X-Authority-Analysis: v=2.4 cv=f7BFxeyM c=1 sm=1 tr=0 ts=69246b40 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=5FlqbPEWv7NCXEe-mtIA:9 a=QEXdDO2ut3YA:10 a=uG9DUKGECoFWVXl0Dc02:22 X-Proofpoint-ORIG-GUID: dpAKYgN3T7VObPSkktpjO3dfLtBwqGQs 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=2025-11-24_05,2025-11-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 phishscore=0 adultscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511240126 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 --- 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 8f978b9c345202d3ea1a7781e4ef2763b46c6f6e..2f8688224f3430ff6d2aa80836b= 72262ed5b7058 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: d724c6f85e80a23ed46b7ebc6e38b527c09d64f5 change-id: 20251124-merge3d-sc7280-752dbacc35a4 Best regards, --=20 Mahadevan P