From nobody Fri Apr 3 03:00:56 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 015303DA5B3 for ; Wed, 25 Mar 2026 12:17:15 +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=1774441037; cv=none; b=qN5LZPGcD8Ti+FKDYKGBQ8GhYPLmkNEAjpVy0lNZqXOhTpBAn/rqnknuJJMihPcVTVKwLQ+eZlV4nw4ncL+5F+xHl2nB6PG+f9IHsApl+DYtXCfIT3TnbyZE1rNAK6FRNS6JQItxhCKP3UTtgDAh+I47/YorM4Q0FVq/YeeTQEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774441037; c=relaxed/simple; bh=PbitL4CSumQClLc/UFacpLO1SjYL2Pb+7GHHapEhIn4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tvGuzS/KUT/WahHTan4zgWTlvBMsejN/2xAC+Rk/mJZf7w8gVd6jj4/uneix+MhmWjWjUAYScowDxu+i1/F99yT6i4hgzKxhJWrQ6yT/JiHHAIgCikZEuArIZieJBZPwQgBBg8a/0xBY9jPdXlSrKXubjSdEQ3UDYHvyV6oHE34= 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=T9Se5181; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=bMhxQXjg; 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="T9Se5181"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="bMhxQXjg" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62PBGGcC241549 for ; Wed, 25 Mar 2026 12:17:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= sE/X9TaBswHSoutSFu5zfCfu4vgJw1Sp7OALRwW9W2E=; b=T9Se5181rG6pMXPi ZFkTpDaTgxsVskEbrtROTawt3F/BH+Gb+Z3wM89mSwsCs9SGlAk8mwHrDyzCD3Ie 4woEAfN5oYgM5Dug8DguJZvbDhBEtcfh4YndtRtIil8Ze2b/xipMSrqbgLjyOxaO Rw62FQAAMoPFmcQPGLkerH67hispEbMhhUe2PALX2xDakVljaUGYoyj5Lp3zjtPF 4jjtkOanMXpSBHmdh77UpdoT0lADB3m9WIJ92P8xpPrNlPy/GpZ6rJ8os/tfmnaD FFcLH++9uiiAj5iofVTJllKV53RiMj0tuoPzZT/9C+iG6xY9CNa3tAnq8gNfOvLg D3xXvA== Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4d4cvp0naq-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 25 Mar 2026 12:17:14 +0000 (GMT) Received: by mail-ua1-f69.google.com with SMTP id a1e0cc1a2514c-94eb4245732so4191931241.3 for ; Wed, 25 Mar 2026 05:17:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1774441034; x=1775045834; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=sE/X9TaBswHSoutSFu5zfCfu4vgJw1Sp7OALRwW9W2E=; b=bMhxQXjgsRsNn4EXSEmkW8FUQQDM9wG9vIQUUSLtIF9vbBGTuDBDMXBY6vh/Qxhaih 5VabKO19H6THHV9DecW5kWp1SK1qmYSPSDWPwAfxKEyApU1eho/UebcNzTUCrEp9qMQp 5S9dTqW8Pqv9NIdaFvNHmZvRczNabQEix+rSoP+XjCB8NSscZtxR5wydgGY//DNPUv6h eqG4u/2FsRAm91d29m5WmL8JLV4eg07ScLwOPcF1RLRk0y1VuQ9OMVKZpG4zRp9Sh10p 6omflPQv4BMbphzQ2TQIc9UCGGujwTJKUgeS+QkPDoYGgN+PVvM8li/UUn73a3Nc7N7J pLcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774441034; x=1775045834; h=cc:to:in-reply-to:references: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=sE/X9TaBswHSoutSFu5zfCfu4vgJw1Sp7OALRwW9W2E=; b=DA0etetOxPhpdq/0Dl3qp8GbpbpXsV3ifkPCsAHeSkXyO75272iTZcSCLkY+DzT46j Jom86lbwh3v9vVxA9MvLWdBG1nfDCWFmh/FikLvDhVoUv4+KSjC3Eny9IYkA0CulUPS8 I+h6VRCPnlO0WG4FZjlFn5gi6kSUQNulJMwKAA2nRVsESxUXAAArxAPzfo3RQCz+AZl0 jw1SSnHEZ5v9dj8GWnJtP34UnlicYs2ktIFhl4IdmR4QMZQrQYfjwpKj2rdpHPTo6Fhu 4dXJbZ1XBHyjTIF+T8wO75mgPG8fs7jQZ0Av9W6Bcqlwmso9uUPMqOpFGtREcMSCFVlR 9qHg== X-Forwarded-Encrypted: i=1; AJvYcCXfxxTdsGndtsv01YJ8e7g/TqpTUN9U6MbiD7qyJH/H3W0oUK9zDfxIcIa1JkVxgbWJ1Y0bNwJ1vBztwrg=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1yVVTa7VhJB1TdZcPlF09TqDLZMq0+ygVCn01pHe6IRNPIJNA H/7EMYZ2UyXHBF6XiQCah5BSPqJur7rKB+AUohHi90KR5SfW0vCVf+oWwmbKEOElSx9DQMMfcJX TWeJZI3bNjSmbNkTDskRIectElvxvqvGyRHZvuo3Ft3dBmHwMYrQ8XCTkMr6Ts1rMFow= X-Gm-Gg: ATEYQzxKY/QyYUmF7lN29fcrGeAMpCD2p74wdoGagCxOJWkLH/Sz+YKDWJreLiT2NBW YpcRRpnftoDbTc5xRdmMXbo0m1PFggAVvKEI8xX1wnnieRa8GmOeudbwDS5/wyOHA9ScFZAgGKA Q6Bf1Aa0xYpZV0nO8Z69+/wHG30tWQrQWSLhZJPcPGyNfaXe4kO5zp8IHwU8mBwM/zL1ENYWnmK WVs1STNVVH0sCpmVOhIEsIVWEYw5OyXC2MD24/spHF7OTQFxZHqKjsskA02wdaQlTm9uqqkEbp1 i8Lt8QU0/KSUfjTtH9Fvi1jdV8Q2ny5vHmGt3FLgmtB+UDw9C3xwyvmF6o6DoGYV2JXqJyz+vfc VNJFW8kfhFaS2RVy/xOOnC6A56a+r1AumIP/ykrH782+a X-Received: by 2002:a05:6102:809f:b0:602:709a:52ce with SMTP id ada2fe7eead31-603870aae4cmr1471006137.10.1774441033976; Wed, 25 Mar 2026 05:17:13 -0700 (PDT) X-Received: by 2002:a05:6102:809f:b0:602:709a:52ce with SMTP id ada2fe7eead31-603870aae4cmr1470994137.10.1774441033500; Wed, 25 Mar 2026 05:17:13 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.94]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b8a106339sm6480356f8f.36.2026.03.25.05.17.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2026 05:17:12 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 25 Mar 2026 13:16:47 +0100 Subject: [PATCH v3 6/8] drm/msm/dpu: Add support for Eliza SoC 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: <20260325-drm-display-eliza-v3-6-dc2b2f0c74a2@oss.qualcomm.com> References: <20260325-drm-display-eliza-v3-0-dc2b2f0c74a2@oss.qualcomm.com> In-Reply-To: <20260325-drm-display-eliza-v3-0-dc2b2f0c74a2@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kuogee Hsieh , Jonathan Marek , Krishna Manikandan , Neil Armstrong , Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Dmitry Baryshkov , Krzysztof Kozlowski X-Mailer: b4 0.15.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=12943; i=krzysztof.kozlowski@oss.qualcomm.com; h=from:subject:message-id; bh=PbitL4CSumQClLc/UFacpLO1SjYL2Pb+7GHHapEhIn4=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBpw9I09lPDIkR4Ne2Dxj9VnGQFjH9OqZo9yVtCe 1kKhTDn3dGJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCacPSNAAKCRDBN2bmhouD 12suD/0cpelqU1g4GbcWW2fN8eXA/bh1P7TYOaJVYTO2IksxO6nS7Pt8m0HQzPOtpDNv7Xo4Ddn G7Kwgr/kFFdDHTqZZJugBRbFvJ/DkFa5HOIKk8qGanQOtiRwlc17xUd5VjPftqp2WKDlHZeMKpE lYVomZNJkYTcnsKsFnbDX3k4RKsQoCgX7lTpZoauAX6tPPlBPeB+BzjKWSOjZKMJDB+4c+nKbf2 +6D5wjPa3D+0VWZwEaoZdMZNuWcswEjuv50D1W97ZAZAxiNlYyfTp3nVoZgcTFsQrkLzJUtJ9FE QBCnJ037okJzSAjJr6J0xge4061FaOFRnFAvwF5EfR06bV/HB26RpO0bpFlUlfaA6e5MKGMljcS pZaJ9ViFEVzBZKzVcDEyR0nECcJ3qbZV11LcyWB78ydp+uzGOQVXAPTn/loNNo+db00+dhtbQcB S+0JbLLftxepxkGNCXRhzLjXA2EmPBIOBDp+iFSX/t/PRCKxmsjP6k2Lk8Hqok3j15vLNzmEXLu ycOesARm+GECT9H4DvL7Xo1eqQ0Ub+yab5kjIZmVegrjTVwIThL0gp3qtLKPQCHdf/7S5mkN/gg 1XV+iovHXPvHhQFCYX4I6xEBr+wFT7OGsr361vopao156t/lSMHv+jZHEXH7+s41YBthd3kcxsj +3ZZIgzc8swYt3g== X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Proofpoint-ORIG-GUID: auJZ6EktD401fiKwD4YabpUFeVhF8Kyj X-Proofpoint-GUID: auJZ6EktD401fiKwD4YabpUFeVhF8Kyj X-Authority-Analysis: v=2.4 cv=Q73fIo2a c=1 sm=1 tr=0 ts=69c3d24a cx=c_pps a=UbhLPJ621ZpgOD2l3yZY1w==:117 a=gOEeR9iKwsj33Yj5oN/cWg==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=iownPTfTGqJqHk1l-jUA:9 a=QEXdDO2ut3YA:10 a=TOPH6uDL9cOC6tEoww4z:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzI1MDA4NyBTYWx0ZWRfX0E0w4KN8YF62 h15lFBBKXZnP0oTpbT17hi+fVsRXRqKiqsN3W/MPQP9wGR/MFJ+DEpn7/htwn0XdxkLEUwRLCyD iErMlGf03dO8w6ngrOCcR0YxYp9o4qjlN5o8JZIjtoSlH0+Jn0SseKtuGSKdX7CzxUVxeBMj3jI mYW3KDJwu4fp4uSon97LzcRG7wHis0WNKGNafEFlLZY420HH/ZeVADIHaCfftWbPeVQbGGIJ5Lo 8MfsmBk1+3FF27bBrk7rZ7vz3ba7cuHkFZci1mMfkmqphk3f+VF/RhXAW3aMblc9ygOFgw1a3Kf iRj7uV9PmCWZ5Y4cta0K7t3SS43+Zs4SDyyKlg9vr20a+opETjGYqdZ/xuijTUeTkuuf0NhD43U gkPdYjEGfChWTvjDvajDSlw5owKvvNEYds2Wu2bzwaoJgSNitgMLWURh+DX7tWdsAnsrCgGbpvz hPrKOaR/lrIuCGp0nTg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-25_04,2026-03-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 malwarescore=0 bulkscore=0 spamscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603250087 Add support for DPU (v12.4) on Qualcomm Eliza SoC, with one incomplete/skipped part: HDMI interface (INT_4). Reviewed-by: Dmitry Baryshkov Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. Drop stale comment 2. Fix INTF_3 controller_id -> DP0 (Dmitry) --- .../gpu/drm/msm/disp/dpu1/catalog/dpu_12_4_eliza.h | 365 +++++++++++++++++= ++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 + 4 files changed, 368 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_4_eliza.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_12_4_eliza.h new file mode 100644 index 000000000000..f718a181af21 --- /dev/null +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_4_eliza.h @@ -0,0 +1,365 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _DPU_12_4_ELIZA_H +#define _DPU_12_4_ELIZA_H + +static const struct dpu_caps eliza_dpu_caps =3D { + .max_mixer_width =3D DEFAULT_DPU_OUTPUT_LINE_WIDTH, + .max_mixer_blendstages =3D 0xb, + .has_src_split =3D true, + .has_dim_layer =3D true, + .has_idle_pc =3D true, + .has_3d_merge =3D true, + .max_linewidth =3D 8192, + .pixel_ram_size =3D DEFAULT_PIXEL_RAM_SIZE, +}; + +static const struct dpu_mdp_cfg eliza_mdp =3D { + .name =3D "top_0", + .base =3D 0, .len =3D 0x494, + .clk_ctrls =3D { + [DPU_CLK_CTRL_REG_DMA] =3D { .reg_off =3D 0x2bc, .bit_off =3D 20 }, + }, +}; + +static const struct dpu_ctl_cfg eliza_ctl[] =3D { + { + .name =3D "ctl_0", .id =3D CTL_0, + .base =3D 0x15000, .len =3D 0x1000, + .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), + }, { + .name =3D "ctl_1", .id =3D CTL_1, + .base =3D 0x16000, .len =3D 0x1000, + .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), + }, { + .name =3D "ctl_2", .id =3D CTL_2, + .base =3D 0x17000, .len =3D 0x1000, + .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), + }, { + .name =3D "ctl_3", .id =3D CTL_3, + .base =3D 0x18000, .len =3D 0x1000, + .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), + }, +}; + +static const struct dpu_sspp_cfg eliza_sspp[] =3D { + { + .name =3D "sspp_0", .id =3D SSPP_VIG0, + .base =3D 0x4000, .len =3D 0x344, + .features =3D VIG_SDM845_MASK_SDMA, + .sblk =3D &dpu_vig_sblk_qseed3_3_4, + .xin_id =3D 0, + .type =3D SSPP_TYPE_VIG, + }, { + .name =3D "sspp_1", .id =3D SSPP_VIG1, + .base =3D 0x6000, .len =3D 0x344, + .features =3D VIG_SDM845_MASK_SDMA, + .sblk =3D &dpu_vig_sblk_qseed3_3_4, + .xin_id =3D 4, + .type =3D SSPP_TYPE_VIG, + }, { + .name =3D "sspp_8", .id =3D SSPP_DMA0, + .base =3D 0x24000, .len =3D 0x344, + .features =3D DMA_SDM845_MASK_SDMA, + .sblk =3D &dpu_dma_sblk, + .xin_id =3D 1, + .type =3D SSPP_TYPE_DMA, + }, { + .name =3D "sspp_9", .id =3D SSPP_DMA1, + .base =3D 0x26000, .len =3D 0x344, + .features =3D DMA_SDM845_MASK_SDMA, + .sblk =3D &dpu_dma_sblk, + .xin_id =3D 5, + .type =3D SSPP_TYPE_DMA, + }, { + .name =3D "sspp_10", .id =3D SSPP_DMA2, + .base =3D 0x28000, .len =3D 0x344, + .features =3D DMA_SDM845_MASK_SDMA, + .sblk =3D &dpu_dma_sblk, + .xin_id =3D 9, + .type =3D SSPP_TYPE_DMA, + }, { + .name =3D "sspp_11", .id =3D SSPP_DMA3, + .base =3D 0x2a000, .len =3D 0x344, + .features =3D DMA_SDM845_MASK_SDMA, + .sblk =3D &dpu_dma_sblk, + .xin_id =3D 13, + .type =3D SSPP_TYPE_DMA, + }, +}; + +static const struct dpu_lm_cfg eliza_lm[] =3D { + { + .name =3D "lm_0", .id =3D LM_0, + .base =3D 0x44000, .len =3D 0x400, + .features =3D MIXER_MSM8998_MASK, + .sblk =3D &sm8750_lm_sblk, + .lm_pair =3D LM_1, + .pingpong =3D PINGPONG_0, + .dspp =3D DSPP_0, + }, { + .name =3D "lm_1", .id =3D LM_1, + .base =3D 0x45000, .len =3D 0x400, + .features =3D MIXER_MSM8998_MASK, + .sblk =3D &sm8750_lm_sblk, + .lm_pair =3D LM_0, + .pingpong =3D PINGPONG_1, + .dspp =3D DSPP_1, + }, { + .name =3D "lm_2", .id =3D LM_2, + .base =3D 0x46000, .len =3D 0x400, + .features =3D MIXER_MSM8998_MASK, + .sblk =3D &sm8750_lm_sblk, + .lm_pair =3D LM_3, + .pingpong =3D PINGPONG_2, + .dspp =3D DSPP_2, + }, { + .name =3D "lm_3", .id =3D LM_3, + .base =3D 0x47000, .len =3D 0x400, + .features =3D MIXER_MSM8998_MASK, + .sblk =3D &sm8750_lm_sblk, + .lm_pair =3D LM_2, + .pingpong =3D PINGPONG_3, + }, +}; + +static const struct dpu_dspp_cfg eliza_dspp[] =3D { + { + .name =3D "dspp_0", .id =3D DSPP_0, + .base =3D 0x54000, .len =3D 0x1800, + .sblk =3D &sm8750_dspp_sblk, + }, { + .name =3D "dspp_1", .id =3D DSPP_1, + .base =3D 0x56000, .len =3D 0x1800, + .sblk =3D &sm8750_dspp_sblk, + }, { + .name =3D "dspp_2", .id =3D DSPP_2, + .base =3D 0x58000, .len =3D 0x1800, + .sblk =3D &sm8750_dspp_sblk, + }, +}; + +static const struct dpu_pingpong_cfg eliza_pp[] =3D { + { + .name =3D "pingpong_0", .id =3D PINGPONG_0, + .base =3D 0x69000, .len =3D 0, + .sblk =3D &sc7280_pp_sblk, + .merge_3d =3D MERGE_3D_0, + .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), + }, { + .name =3D "pingpong_1", .id =3D PINGPONG_1, + .base =3D 0x6a000, .len =3D 0, + .sblk =3D &sc7280_pp_sblk, + .merge_3d =3D MERGE_3D_0, + .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), + }, { + .name =3D "pingpong_2", .id =3D PINGPONG_2, + .base =3D 0x6b000, .len =3D 0, + .sblk =3D &sc7280_pp_sblk, + .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 MERGE_3D_1, + .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), + }, { + .name =3D "pingpong_cwb_0", .id =3D PINGPONG_CWB_0, + .base =3D 0x66000, .len =3D 0, + .sblk =3D &sc7280_pp_sblk, + .merge_3d =3D MERGE_3D_2, + }, { + .name =3D "pingpong_cwb_1", .id =3D PINGPONG_CWB_1, + .base =3D 0x66400, .len =3D 0, + .sblk =3D &sc7280_pp_sblk, + .merge_3d =3D MERGE_3D_2, + }, { + .name =3D "pingpong_cwb_2", .id =3D PINGPONG_CWB_2, + .base =3D 0x7e000, .len =3D 0, + .sblk =3D &sc7280_pp_sblk, + .merge_3d =3D MERGE_3D_3, + }, { + .name =3D "pingpong_cwb_3", .id =3D PINGPONG_CWB_3, + .base =3D 0x7e400, .len =3D 0, + .sblk =3D &sc7280_pp_sblk, + .merge_3d =3D MERGE_3D_3, + }, +}; + +static const struct dpu_merge_3d_cfg eliza_merge_3d[] =3D { + { + .name =3D "merge_3d_0", .id =3D MERGE_3D_0, + .base =3D 0x4e000, .len =3D 0x1c, + }, { + .name =3D "merge_3d_1", .id =3D MERGE_3D_1, + .base =3D 0x4f000, .len =3D 0x1c, + }, { + .name =3D "merge_3d_2", .id =3D MERGE_3D_2, + .base =3D 0x66700, .len =3D 0x1c, + }, { + .name =3D "merge_3d_3", .id =3D MERGE_3D_3, + .base =3D 0x7e700, .len =3D 0x1c, + }, +}; + +/* + * NOTE: Each display compression engine (DCE) contains dual hard + * slice DSC encoders so both share same base address but with + * its own different sub block address. + */ +static const struct dpu_dsc_cfg eliza_dsc[] =3D { + { + .name =3D "dce_0_0", .id =3D DSC_0, + .base =3D 0x80000, .len =3D 0x8, + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .sblk =3D &sm8750_dsc_sblk_0, + }, { + .name =3D "dce_0_1", .id =3D DSC_1, + .base =3D 0x80000, .len =3D 0x8, + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .sblk =3D &sm8750_dsc_sblk_1, + }, { + .name =3D "dce_1_0", .id =3D DSC_2, + .base =3D 0x81000, .len =3D 0x8, + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .sblk =3D &sm8750_dsc_sblk_0, + }, +}; + +static const struct dpu_wb_cfg eliza_wb[] =3D { + { + .name =3D "wb_2", .id =3D WB_2, + .base =3D 0x65000, .len =3D 0x2c8, + .features =3D WB_SDM845_MASK, + .format_list =3D wb2_formats_rgb_yuv, + .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), + .xin_id =3D 6, + .vbif_idx =3D VBIF_RT, + .maxlinewidth =3D 4096, + .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), + }, +}; + +static const struct dpu_cwb_cfg eliza_cwb[] =3D { + { + .name =3D "cwb_0", .id =3D CWB_0, + .base =3D 0x66200, .len =3D 0x20, + }, + { + .name =3D "cwb_1", .id =3D CWB_1, + .base =3D 0x66600, .len =3D 0x20, + }, + { + .name =3D "cwb_2", .id =3D CWB_2, + .base =3D 0x7e200, .len =3D 0x20, + }, + { + .name =3D "cwb_3", .id =3D CWB_3, + .base =3D 0x7e600, .len =3D 0x20, + }, +}; + +static const struct dpu_intf_cfg eliza_intf[] =3D { + { + .name =3D "intf_0", .id =3D INTF_0, + .base =3D 0x34000, .len =3D 0x4bc, + .type =3D INTF_DP, + .controller_id =3D MSM_DP_CONTROLLER_0, + .prog_fetch_lines_worst_case =3D 24, + .intr_underrun =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), + .intr_vsync =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25), + }, { + .name =3D "intf_1", .id =3D INTF_1, + .base =3D 0x35000, .len =3D 0x4bc, + .type =3D INTF_DSI, + .controller_id =3D MSM_DSI_CONTROLLER_0, + .prog_fetch_lines_worst_case =3D 24, + .intr_underrun =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), + .intr_vsync =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), + .intr_tear_rd_ptr =3D DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2), + }, { + .name =3D "intf_2", .id =3D INTF_2, + .base =3D 0x36000, .len =3D 0x4bc, + .type =3D INTF_DSI, + .controller_id =3D MSM_DSI_CONTROLLER_1, + .prog_fetch_lines_worst_case =3D 24, + .intr_underrun =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28), + .intr_vsync =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29), + .intr_tear_rd_ptr =3D DPU_IRQ_IDX(MDP_INTF2_TEAR_INTR, 2), + }, { + .name =3D "intf_3", .id =3D INTF_3, + .base =3D 0x37000, .len =3D 0x4bc, + .type =3D INTF_DP, + .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ + .prog_fetch_lines_worst_case =3D 24, + .intr_underrun =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30), + .intr_vsync =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 31), + } +}; + +static const struct dpu_perf_cfg eliza_perf_data =3D { + .max_bw_low =3D 6800000, + .max_bw_high =3D 14200000, + .min_core_ib =3D 2500000, + .min_llcc_ib =3D 0, + .min_dram_ib =3D 1600000, + .min_prefill_lines =3D 35, + .danger_lut_tbl =3D {0x3ffff, 0x3ffff, 0x0}, + .safe_lut_tbl =3D {0xfe00, 0xfe00, 0xffff}, + .qos_lut_tbl =3D { + {.nentry =3D ARRAY_SIZE(sc7180_qos_linear), + .entries =3D sc7180_qos_linear + }, + {.nentry =3D ARRAY_SIZE(sc7180_qos_macrotile), + .entries =3D sc7180_qos_macrotile + }, + {.nentry =3D ARRAY_SIZE(sc7180_qos_nrt), + .entries =3D sc7180_qos_nrt + }, + /* TODO: macrotile-qseed is different from macrotile */ + }, + .cdp_cfg =3D { + {.rd_enable =3D 1, .wr_enable =3D 1}, + {.rd_enable =3D 1, .wr_enable =3D 0} + }, + .clk_inefficiency_factor =3D 105, + .bw_inefficiency_factor =3D 120, +}; + +static const struct dpu_mdss_version eliza_mdss_ver =3D { + .core_major_ver =3D 12, + .core_minor_ver =3D 4, +}; + +const struct dpu_mdss_cfg dpu_eliza_cfg =3D { + .mdss_ver =3D &eliza_mdss_ver, + .caps =3D &eliza_dpu_caps, + .mdp =3D &eliza_mdp, + .cdm =3D &dpu_cdm_5_x, + .ctl_count =3D ARRAY_SIZE(eliza_ctl), + .ctl =3D eliza_ctl, + .sspp_count =3D ARRAY_SIZE(eliza_sspp), + .sspp =3D eliza_sspp, + .mixer_count =3D ARRAY_SIZE(eliza_lm), + .mixer =3D eliza_lm, + .dspp_count =3D ARRAY_SIZE(eliza_dspp), + .dspp =3D eliza_dspp, + .pingpong_count =3D ARRAY_SIZE(eliza_pp), + .pingpong =3D eliza_pp, + .dsc_count =3D ARRAY_SIZE(eliza_dsc), + .dsc =3D eliza_dsc, + .merge_3d_count =3D ARRAY_SIZE(eliza_merge_3d), + .merge_3d =3D eliza_merge_3d, + .wb_count =3D ARRAY_SIZE(eliza_wb), + .wb =3D eliza_wb, + .cwb_count =3D ARRAY_SIZE(eliza_cwb), + .cwb =3D sm8650_cwb, + .intf_count =3D ARRAY_SIZE(eliza_intf), + .intf =3D eliza_intf, + .vbif_count =3D ARRAY_SIZE(sm8650_vbif), + .vbif =3D sm8650_vbif, + .perf =3D &eliza_perf_data, +}; + +#endif diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.c index c4e1f6b7345d..b096b748707e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -771,4 +771,5 @@ static const struct dpu_qos_lut_entry sc7180_qos_nrt[] = =3D { #include "catalog/dpu_10_0_sm8650.h" #include "catalog/dpu_12_0_sm8750.h" #include "catalog/dpu_12_2_glymur.h" +#include "catalog/dpu_12_4_eliza.h" #include "catalog/dpu_13_0_kaanapali.h" diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.h index 70d5ed4732f2..dedab08ea1d7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -767,6 +767,7 @@ struct dpu_mdss_cfg { const struct dpu_format_extended *vig_formats; }; =20 +extern const struct dpu_mdss_cfg dpu_eliza_cfg; extern const struct dpu_mdss_cfg dpu_glymur_cfg; extern const struct dpu_mdss_cfg dpu_kaanapali_cfg; extern const struct dpu_mdss_cfg dpu_msm8917_cfg; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/= disp/dpu1/dpu_kms.c index 31743699d05f..1d8e6007a350 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1506,6 +1506,7 @@ static const struct dev_pm_ops dpu_pm_ops =3D { }; =20 static const struct of_device_id dpu_dt_match[] =3D { + { .compatible =3D "qcom,eliza-dpu", .data =3D &dpu_eliza_cfg, }, { .compatible =3D "qcom,glymur-dpu", .data =3D &dpu_glymur_cfg, }, { .compatible =3D "qcom,kaanapali-dpu", .data =3D &dpu_kaanapali_cfg, }, { .compatible =3D "qcom,msm8917-mdp5", .data =3D &dpu_msm8917_cfg, }, --=20 2.51.0