From patchwork Fri Feb 16 17:01:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 13560330 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A25F5C48BEF for ; Fri, 16 Feb 2024 17:01:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4158910EC50; Fri, 16 Feb 2024 17:01:27 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="fuN4UO3W"; dkim-atps=neutral Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id EBC3B10EC49 for ; Fri, 16 Feb 2024 17:01:21 +0000 (UTC) Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-563c595f968so2219870a12.0 for ; Fri, 16 Feb 2024 09:01:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708102880; x=1708707680; darn=lists.freedesktop.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=uXAA6feqe7ITmVt5QxnaZYVqRK0lZp3lcWFLVwQYYf4=; b=fuN4UO3WnDDkm0qnhAR+dGQdJNPGyBMItL5SprNa6umc1bSfBzBsjiTLmY3aCTDRlc eW72EuzLOuClD6tYRwSP4xcTNZqXV21DOVj/6ROt6mxk2V63lhbwYnCGX+tqOmcNBEwj LfkriPemfEhLhVJft70MZc7Stt/umTyHsyes3sjp1wbm6cAzoC5ta0nWg8Po/T1br2C7 Wz9QQCzMWjnUiz2lxJRY9MEwi0W0x1T3bbwfTJRq08o3Y7zjIl8YCnujMnyLxSO2lGym Lxa+b+zCpU6kNBxAdDZ5iTnNUTBn6tPFawP6MOLAuKi8rpf1+BpFxAPk1wXEr1hrZXlq al6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708102880; x=1708707680; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uXAA6feqe7ITmVt5QxnaZYVqRK0lZp3lcWFLVwQYYf4=; b=CpB+ApDAb/UpXK6ZUS8xWP59/7hyxy5Y+cZlhcMVKuY0YbBKiL68yRQUEJyyfM1V6j Urrv25S0p4Pwbz+smY0KV8G5eNa4zPaZ/SNz7TN6rTdcDzzI1O3o2LBghts9hvYLCkyF 4gKfJOwBiC6sSDY0c8mNDS4BOx0kxTa7jCB7susRHssaVsWbToLTCWYKlL1yagrWXDaV pyS3IvQj4hZ/GWlyq5aILBVp470lGzYcfi32s3i5G8bNy30f843G7ZEkCUAyfMJTydCa cg5mHsYXA0FLOlsmMZDUkw4o1cX9cmp2N3MAfB6+CDusLtg5Wy1x+chSx9iuiA7S0l/r xcSA== X-Forwarded-Encrypted: i=1; AJvYcCWPcNGLxKVeeH/xee/sTyep+nn3jZCfrUgM4QzZN4arjNO1khQJ2N2ZndguFeCYA21AQCoAAWuEaW+BCBjdPf6z3GjlkF9WTP7YJziIsmU8 X-Gm-Message-State: AOJu0Yw4mWKusMEBrIDjCL2qc126N+Cf5VWo5i30NPxHIvII2kL8lfh7 8EoU+6ly1HppkeDOIB4onOWJMjhZ+QYRgEMC4PcOnNXSnwNifIzTyV3RZ6U2cYA= X-Google-Smtp-Source: AGHT+IEO2GYnWZztWy4XVywiNgZP0RuxxOlupGrJMYJD8z2qtV3pisYWh1Ggd55fo+KivYfDs38Q2g== X-Received: by 2002:aa7:c517:0:b0:561:dd88:cffc with SMTP id o23-20020aa7c517000000b00561dd88cffcmr3984240edq.28.1708102880426; Fri, 16 Feb 2024 09:01:20 -0800 (PST) Received: from [127.0.1.1] ([188.24.162.93]) by smtp.gmail.com with ESMTPSA id u20-20020aa7d894000000b00563a6c9fd71sm159706edq.16.2024.02.16.09.01.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 09:01:20 -0800 (PST) From: Abel Vesa Date: Fri, 16 Feb 2024 19:01:05 +0200 Subject: [PATCH v3 1/4] dt-bindings: display/msm: Document the DPU for X1E80100 MIME-Version: 1.0 Message-Id: <20240216-x1e80100-display-v3-1-28b1c33ac8c0@linaro.org> References: <20240216-x1e80100-display-v3-0-28b1c33ac8c0@linaro.org> In-Reply-To: <20240216-x1e80100-display-v3-0-28b1c33ac8c0@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Rob Herring 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, Abel Vesa X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=848; i=abel.vesa@linaro.org; h=from:subject:message-id; bh=u4L61jxb3pk7DyZvt+6wEP3FQgg6lRJc0FDd03RRCBk=; b=owEBbQKS/ZANAwAKARtfRMkAlRVWAcsmYgBlz5TYbMJUWE9HZuo+njQfmr+vjOQUCQV6QLLZ/ 4kzPkjW3U6JAjMEAAEKAB0WIQRO8+4RTnqPKsqn0bgbX0TJAJUVVgUCZc+U2AAKCRAbX0TJAJUV VvKnD/9g6oILdR5vqRFFbgbtXaC5J7KXoj68K2u393MveLTILQFQN0LAfdRRujCfb3ELEOigDfA NXO/3X6gmcOogYPWCTQpX0B0cn1vO6bVnKNHHbn/dKk+mQlSrsMIOxikE35TlNr4ou3LT++k4oG C64KVfOcCdgWP7H4C8jbANe6I/UsVApD2AKEeN+6f8WUqsyPc8lMo8uPZEpiYz4edOen+Bcyl9N 3Hzek00KbEqtp24QIiq5A2yfuUugZWl5Fqm/az0HBRfnK92jJB0vYmerrDJ70ssgZhGrveTjood PBnNWc8dlUm5E5XDAUF44LXGe75PjBSWC3whVq4WwD0TTZXmtcMGRYrTiYbsZb3NVp8E7hFP+wJ Db5C+Is3VPxuAbyC/LL7SoKtj5inVWu0aazj8Xfkvo+addk4KdoN9DoU2go0trFXBiFba+Vxo2l dePKe0I6hx3uqnfwyyK29id4FeHeYLQo4hor+CwwngJvQWPnEHVZygsKvgpCxF9ltt2qF8eNwCi Ooms9WXbRJ4KRuIX74ifLnFUjbowX2gSmf3zo6ErTJQyXmaNbG4HUrSiukniIG51vL/lJYFD1lJ wiYV1soMShJTjUOgeSxA8HwxnTOiurmI073VGg5K9Z8zMPfZyt9cXmR2WZ5ugfRkrY8rR6mfANU O7zD6kYzw9TDUlw== X-Developer-Key: i=abel.vesa@linaro.org; a=openpgp; fpr=6AFF162D57F4223A8770EF5AF7BF214136F41FAE X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Document the DPU for Qualcomm X1E80100 platform in the SM8650 schema, as they are similar. Signed-off-by: Abel Vesa Reviewed-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml index a01d15a03317..c4087cc5abbd 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml @@ -13,7 +13,9 @@ $ref: /schemas/display/msm/dpu-common.yaml# properties: compatible: - const: qcom,sm8650-dpu + enum: + - qcom,sm8650-dpu + - qcom,x1e80100-dpu reg: items: From patchwork Fri Feb 16 17:01:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 13560329 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 73CE7C48260 for ; Fri, 16 Feb 2024 17:01:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F0E310EC3F; Fri, 16 Feb 2024 17:01:26 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Rn4o5jLT"; dkim-atps=neutral Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id C246510EC54 for ; Fri, 16 Feb 2024 17:01:23 +0000 (UTC) Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-5611e54a92dso3086896a12.2 for ; Fri, 16 Feb 2024 09:01:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708102882; x=1708707682; darn=lists.freedesktop.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=crKQXHujlEPtk+uGMVKxkMxMZ3Lju0dDrB83Csxz81I=; b=Rn4o5jLTgucTE8aO9r6NQeyi91iF9sgZgcDEkNNS3QHy3fCdIRQU3gULEsQcdhnBVd iQTWY9p6+5iCrEjj31MSpOf/V2ZwsENiHBLytuQdGjEXKXms/Ke3AVS67lzSSHn6TJxf 0Y3eeGjryrd+MP8W5ZAObJblv/Z/gM/zHMIfhLpn2qWDyU9QkgE2E50TXzN0MtYMH/Hx QFn//ftd23uzrY5CB15ZSsQP/p47vCoFMgtJlYosZQdn9oMU734yaAexW7Ed75uDjdZm ER2pSVzuFH2ivORryt5/Wrc4bi4Os9vph9Qh664vxfKvkAO/emD/fNx4L3nnzseQOIYU g7UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708102882; x=1708707682; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=crKQXHujlEPtk+uGMVKxkMxMZ3Lju0dDrB83Csxz81I=; b=siXQDk1yjeYsa33XCI5GP+PdoVEWJ4skE8J2t1fL2KxOJBnFO2R/7mR12AF52jIgRw 94rVH2VNsOzPPRuSAa8hVZ6u8FgCGZkDcuzeUP6ZjY64Iwuut7/Va1MAPgKqa47RXUkz 1SAIef9ZcHDZX54LZxVBFikna0NiVONpMCXUdF2L2RyuqR1xZwg6WMAmSDErgcOisApg tqjnGMnYPdm8qQiqEhW6QRCSBoFUQKkDNF4JdsjZMeffjxe40ZlCkBLU4nWz7MWC1Mns ircy2t69JlQZliu0zs+E7NxtUUNd4Ie6GQIZyb9VNKYKJiNR5qJoJYoPENyhQOaaL4z7 25gA== X-Forwarded-Encrypted: i=1; AJvYcCUaJGqGHAYZ1uds2Qg0kPU52TBmE/BzWTPc8Zd0T/cADWdB5op3VNOQ0QTgq7DaxVaJILukn7iMzYf/FQ9WSkaCgJtsMrMNnkcyru0BxxS+ X-Gm-Message-State: AOJu0Yw3uZDAknkDvbs2jSCPKEnVL6FY7BsHBWC0gzV0UXxX+RKyR0nJ 903ykhkbL58vCV5kUC1pdt5BzXVN/uWoqig4p0tNKeTNS6Es+tPx3cM8H5HYlWA= X-Google-Smtp-Source: AGHT+IHyjtsHD0YHNwlqDvyJbPbnV0gKGx4PIjyqtGjkSpBJr21RhfvWdQUkYwtmB7kWgFLvc88Mcw== X-Received: by 2002:aa7:d6cb:0:b0:564:6fc:7cf8 with SMTP id x11-20020aa7d6cb000000b0056406fc7cf8mr962831edr.1.1708102882315; Fri, 16 Feb 2024 09:01:22 -0800 (PST) Received: from [127.0.1.1] ([188.24.162.93]) by smtp.gmail.com with ESMTPSA id u20-20020aa7d894000000b00563a6c9fd71sm159706edq.16.2024.02.16.09.01.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 09:01:21 -0800 (PST) From: Abel Vesa Date: Fri, 16 Feb 2024 19:01:06 +0200 Subject: [PATCH v3 2/4] dt-bindings: display/msm: Document MDSS on X1E80100 MIME-Version: 1.0 Message-Id: <20240216-x1e80100-display-v3-2-28b1c33ac8c0@linaro.org> References: <20240216-x1e80100-display-v3-0-28b1c33ac8c0@linaro.org> In-Reply-To: <20240216-x1e80100-display-v3-0-28b1c33ac8c0@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Rob Herring 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, Abel Vesa , Krzysztof Kozlowski X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=8377; i=abel.vesa@linaro.org; h=from:subject:message-id; bh=D6FjYEeIRirUmJdoyL9czcYWbZneMKaVnTNx9zorPJo=; b=owEBbQKS/ZANAwAKARtfRMkAlRVWAcsmYgBlz5TZzqeq1DwHb+s3WCfqX6J8OUEFZ0djz4uj8 f1hEhqtgGOJAjMEAAEKAB0WIQRO8+4RTnqPKsqn0bgbX0TJAJUVVgUCZc+U2QAKCRAbX0TJAJUV VtbhEACJVHz1cG7R7jwbLBuH+OUGNmilQH3ro9L6zo64VVA3+nmgISRBhhaF2Nb6ZUCmXCNBmfB wkUDjHioSCezdPfg7NZS+TYCtUyzUGAM/JbjJsihElql/Mn36F3SceZxNLHJFIPF51k1ZsD86If BJR0XngJkx99Oh7NSpnrOicoliJV7Kn/1sDlVphIF7PgE7w1/qdodRO0FPCqCqWAUYPepofGMNC uGAiQIJdqUFZOHgULDExulcap8hhA2HK9lhQ25CRmI8yhNflstLB/b5wLV0pGfKCEIq9f8/ixMA PGwalPV3B1iXfoiZAIMQejOpPVnit10jk2q4cHsAuGucmo3YgiCHCDQ9r9TXh2vUr4FSAN1IAMU KhBIDSLCUXTrGfgBwfQpJ2HPMpeyxOFA1tyFecMZtPDg6T807D3SWcoyTOIvBhGUsu3WUXUvWpw Kwg3MtfABMS8JMbnuud7hq7kA353HUJ4QVe2SbK/StV0GaNyklSgmpUMrGeuwQIWVyUTp5vFe6U HurEK+6r0WBoNTDrNG77asDHZkHNA30petKyaSdSKbqwcxl53yHnq7kIyha3eZmSf1tNngZqRhU 5Qew4SA9xHhuLqEfp1rvh9S+Y/swCAb5XWWhKc7MgQX6OHkMnBohuQplTd+mmA3d8pXWGo12/Bf TnirYkNzBcKEhhg== X-Developer-Key: i=abel.vesa@linaro.org; a=openpgp; fpr=6AFF162D57F4223A8770EF5AF7BF214136F41FAE X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Document the MDSS hardware found on the Qualcomm X1E80100 platform. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Abel Vesa --- .../bindings/display/msm/qcom,x1e80100-mdss.yaml | 253 +++++++++++++++++++++ 1 file changed, 253 insertions(+) diff --git a/Documentation/devicetree/bindings/display/msm/qcom,x1e80100-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,x1e80100-mdss.yaml new file mode 100644 index 000000000000..09a034b9ee7a --- /dev/null +++ b/Documentation/devicetree/bindings/display/msm/qcom,x1e80100-mdss.yaml @@ -0,0 +1,253 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/msm/qcom,x1e80100-mdss.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm X1E80100 Display MDSS + +maintainers: + - Abel Vesa + +description: + X1E80100 MSM Mobile Display Subsystem(MDSS), which encapsulates sub-blocks like + DPU display controller, DP interfaces, etc. + +$ref: /schemas/display/msm/mdss-common.yaml# + +properties: + compatible: + const: qcom,x1e80100-mdss + + clocks: + items: + - description: Display AHB + - description: Display hf AXI + - description: Display core + + iommus: + maxItems: 1 + + interconnects: + maxItems: 3 + + interconnect-names: + maxItems: 3 + +patternProperties: + "^display-controller@[0-9a-f]+$": + type: object + additionalProperties: true + properties: + compatible: + const: qcom,x1e80100-dpu + + "^displayport-controller@[0-9a-f]+$": + type: object + additionalProperties: true + properties: + compatible: + const: qcom,x1e80100-dp + + "^phy@[0-9a-f]+$": + type: object + additionalProperties: true + properties: + compatible: + const: qcom,x1e80100-dp-phy + +required: + - compatible + +unevaluatedProperties: false + +examples: + - | + #include + #include + #include + #include + #include + #include + #include + + display-subsystem@ae00000 { + compatible = "qcom,x1e80100-mdss"; + reg = <0x0ae00000 0x1000>; + reg-names = "mdss"; + + interconnects = <&mmss_noc MASTER_MDP 0 &gem_noc SLAVE_LLCC 0>, + <&mc_virt MASTER_LLCC 0 &mc_virt SLAVE_EBI1 0>, + <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_DISPLAY_CFG 0>; + interconnect-names = "mdp0-mem", "mdp1-mem", "cpu-cfg"; + + resets = <&dispcc_core_bcr>; + + power-domains = <&dispcc_gdsc>; + + clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>, + <&gcc GCC_DISP_HF_AXI_CLK>, + <&dispcc DISP_CC_MDSS_MDP_CLK>; + clock-names = "bus", "nrt_bus", "core"; + + interrupts = ; + interrupt-controller; + #interrupt-cells = <1>; + + iommus = <&apps_smmu 0x1c00 0x2>; + + #address-cells = <1>; + #size-cells = <1>; + ranges; + + display-controller@ae01000 { + compatible = "qcom,x1e80100-dpu"; + reg = <0x0ae01000 0x8f000>, + <0x0aeb0000 0x2008>; + reg-names = "mdp", "vbif"; + + clocks = <&gcc_axi_clk>, + <&dispcc_ahb_clk>, + <&dispcc_mdp_lut_clk>, + <&dispcc_mdp_clk>, + <&dispcc_mdp_vsync_clk>; + clock-names = "nrt_bus", + "iface", + "lut", + "core", + "vsync"; + + assigned-clocks = <&dispcc_mdp_vsync_clk>; + assigned-clock-rates = <19200000>; + + operating-points-v2 = <&mdp_opp_table>; + power-domains = <&rpmhpd RPMHPD_MMCX>; + + interrupt-parent = <&mdss>; + interrupts = <0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + dpu_intf1_out: endpoint { + remote-endpoint = <&dsi0_in>; + }; + }; + + port@1 { + reg = <1>; + dpu_intf2_out: endpoint { + remote-endpoint = <&dsi1_in>; + }; + }; + }; + + mdp_opp_table: opp-table { + compatible = "operating-points-v2"; + + opp-200000000 { + opp-hz = /bits/ 64 <200000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-325000000 { + opp-hz = /bits/ 64 <325000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-375000000 { + opp-hz = /bits/ 64 <375000000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-514000000 { + opp-hz = /bits/ 64 <514000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + }; + + displayport-controller@ae90000 { + compatible = "qcom,x1e80100-dp"; + reg = <0 0xae90000 0 0x200>, + <0 0xae90200 0 0x200>, + <0 0xae90400 0 0x600>, + <0 0xae91000 0 0x400>, + <0 0xae91400 0 0x400>; + + interrupt-parent = <&mdss>; + interrupts = <12>; + + clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>, + <&dispcc DISP_CC_MDSS_DPTX0_AUX_CLK>, + <&dispcc DISP_CC_MDSS_DPTX0_LINK_CLK>, + <&dispcc DISP_CC_MDSS_DPTX0_LINK_INTF_CLK>, + <&dispcc DISP_CC_MDSS_DPTX0_PIXEL0_CLK>; + clock-names = "core_iface", "core_aux", + "ctrl_link", + "ctrl_link_iface", + "stream_pixel"; + + assigned-clocks = <&dispcc DISP_CC_MDSS_DPTX0_LINK_CLK_SRC>, + <&dispcc DISP_CC_MDSS_DPTX0_PIXEL0_CLK_SRC>; + assigned-clock-parents = <&usb_1_ss0_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_1_ss0_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>; + + operating-points-v2 = <&mdss_dp0_opp_table>; + + power-domains = <&rpmhpd RPMHPD_MMCX>; + + phys = <&usb_1_ss0_qmpphy QMP_USB43DP_DP_PHY>; + phy-names = "dp"; + + #sound-dai-cells = <0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + mdss_dp0_in: endpoint { + remote-endpoint = <&mdss_intf0_out>; + }; + }; + + port@1 { + reg = <1>; + + mdss_dp0_out: endpoint { + }; + }; + }; + + mdss_dp0_opp_table: opp-table { + compatible = "operating-points-v2"; + + opp-160000000 { + opp-hz = /bits/ 64 <160000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-270000000 { + opp-hz = /bits/ 64 <270000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-540000000 { + opp-hz = /bits/ 64 <540000000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-810000000 { + opp-hz = /bits/ 64 <810000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + }; + }; +... From patchwork Fri Feb 16 17:01:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 13560331 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7D281C48BC4 for ; Fri, 16 Feb 2024 17:01:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5565310EC52; Fri, 16 Feb 2024 17:01:27 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Eq54IAD7"; dkim-atps=neutral Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0698610EC3C for ; Fri, 16 Feb 2024 17:01:26 +0000 (UTC) Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-5129859c6b3so916687e87.2 for ; Fri, 16 Feb 2024 09:01:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708102884; x=1708707684; darn=lists.freedesktop.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=TiEpeDDImaOw/7EpXqQxgkCNsM3mPa/vvbsJHlnFxEg=; b=Eq54IAD7mpAxRZcfMq+4PY8hJpLCBSDBk3UAGtLoZof/bYCT+I2x5NbLQYn9C9kSm6 sie4HNb/mknPZyC8j/Yfoex/E+xaV9hnjuF/YFejG4XCoctOEuXocVniBlXumBQoMxbN zpwCR984IPDTrg3a++euqiRclDCxTvqqcGZj2fONbd4UF0KufxtYJC0HADJjWo6HII4d y2IhDsO7iXvucBDS1rxLtQeqDuQIgBgP4hhxtSf/KLURI07CzaGbj9nK6DmHDn4niAjU g2hiLUs4OeTpPC175DRtv0R0NvBi0NDy32csiw7n/gJQiyosqKM9AyuFDqr+So/bzZLD BubA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708102884; x=1708707684; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TiEpeDDImaOw/7EpXqQxgkCNsM3mPa/vvbsJHlnFxEg=; b=cYK+10JNz0ViyyKQBJccZBJtcMrMCP02FS5LFbV0l/IVA47ifL1+9Hl1+j6fLX2vDq m7mzXvdIrz5BHrqYvErPtSYjX3xAWo6KYCjI9uJf6wGip5pE222i3jkWQOuP2+4MeQgh 9F94nNGZF26RsdFK4X6heINTiXFHPCAohoYGTcT07kmW7jB4gMxhqa5d7OyJ1Q06YAFj EdITOM+979VzMky2vpcDQDu9e1Fw07xK47vjK6GgM46oFMDMHphY0NzSsLNzxf1uccRV wqE6ql08Bgjz9kWSAgCmc0fyQJN0ar3pI6Ek7Xp9lmx/y0sueHkPqd+Qw/V930oW6Rwc XFPw== X-Forwarded-Encrypted: i=1; AJvYcCV44umvLuZ9p7BMhgPPZxyAFSCcajDtjDx7CLNxLy6BHbYQyU+k/sZx+dsy9HpGlWuHkGm5FlrKfKOs8NsyQijSee2txleXU6vQ1YSF6E7R X-Gm-Message-State: AOJu0YxHvpnmiXomPBqrq21RBJnblyKd6+xglDPasWAP7xzvTb/AOAFG 2n2nDVBLkXOx/QaduFWQVrUe4vvPe7++Ctzlt963rQm0QApr/vDHYoin19cU1eA= X-Google-Smtp-Source: AGHT+IE8Tjchp09XxZHaTZmVANhIcW5m1PAkNqucoJupWuJwPnVGH6GRAKyVCEiT78F8gRWfT2VEXg== X-Received: by 2002:ac2:5e91:0:b0:512:9a29:1a81 with SMTP id b17-20020ac25e91000000b005129a291a81mr810748lfq.14.1708102884192; Fri, 16 Feb 2024 09:01:24 -0800 (PST) Received: from [127.0.1.1] ([188.24.162.93]) by smtp.gmail.com with ESMTPSA id u20-20020aa7d894000000b00563a6c9fd71sm159706edq.16.2024.02.16.09.01.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 09:01:23 -0800 (PST) From: Abel Vesa Date: Fri, 16 Feb 2024 19:01:07 +0200 Subject: [PATCH v3 3/4] drm/msm: mdss: Add X1E80100 support MIME-Version: 1.0 Message-Id: <20240216-x1e80100-display-v3-3-28b1c33ac8c0@linaro.org> References: <20240216-x1e80100-display-v3-0-28b1c33ac8c0@linaro.org> In-Reply-To: <20240216-x1e80100-display-v3-0-28b1c33ac8c0@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Rob Herring 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, Abel Vesa X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1429; i=abel.vesa@linaro.org; h=from:subject:message-id; bh=84rmvZDk8zW8CmAQCdqUYugRzCw8mcvg2iteKd1+WTI=; b=owEBbQKS/ZANAwAKARtfRMkAlRVWAcsmYgBlz5TawkNXFf8B6q+w8cJ6kZXt6czU75fNIjfWe S7h6Gw6Y7qJAjMEAAEKAB0WIQRO8+4RTnqPKsqn0bgbX0TJAJUVVgUCZc+U2gAKCRAbX0TJAJUV VuvRD/4z8UMEJIBQnP1ombhXmaNwnavPDiWb+WUoZcchzehTqQFuOvOd7gUbysgF1BetLgS0fBR bO6yAlQY9as5QEB09JCpPqMM8ZM5mdr2RrL0n8F2wBtaIBzlwL9Xfn4kw7FTcLTTws/hX4ALuMa ciCS+Fw6gOa9QCFCG94wLQo3BWEJ8WBnzIkN4K3yuhZ/Dd1B0ElfzvGGiR0EIozJe+u0sbHFzcG d56O8FaZQotNrHjwqstRaS8VJISvf7ern1/2pvbF/DU5hgVmLMF2tzKiIg+vnJB4sI/y73792yL CmRIKriZwzWe8VNlyfyr6bmo5N3EOYR7pU0rXsHQS6VKtwjYRir7dO0wpw9WWSlTO8rUtFRwk4g dl3gqxK+fXp0iJPXrDWbHT2osLWWIU4XOXfaa/vSMTlKB+dW7vkXXluONKWE+W51I9KtC96cywl kVVIikF8ZkEaCK+EvO0rBmubczFUFqPqrCTiQxR+p2w0QG4IXZyNtLhLM0IBIe44tpaqfOFa+7Z tFFosC1TELeeAW+2YEncvg08NlWL8AllQJsneqnirC/dlZYhmPCiw+5wNVyB3PpSE02GtW8xRs6 IRseXiwYM4AC+tBkkFKS2W7PIqZNTY1oQZqvru/7jaIQDtKyY8QsXCJvQZE6k2R9sZszH9LlF4a ZzbVyEAPLeVLYzA== X-Developer-Key: i=abel.vesa@linaro.org; a=openpgp; fpr=6AFF162D57F4223A8770EF5AF7BF214136F41FAE X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add support for MDSS on X1E80100. Reviewed-by: Dmitry Baryshkov Signed-off-by: Abel Vesa --- drivers/gpu/drm/msm/msm_mdss.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 35423d10aafa..6eda501e2a1a 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -636,6 +636,18 @@ static const struct msm_mdss_data sm8550_data = { .macrotile_mode = 1, .reg_bus_bw = 57000, }; + +static const struct msm_mdss_data x1e80100_data = { + .ubwc_enc_version = UBWC_4_0, + .ubwc_dec_version = UBWC_4_3, + .ubwc_swizzle = 6, + .ubwc_static = 1, + /* TODO: highest_bank_bit = 2 for LP_DDR4 */ + .highest_bank_bit = 3, + .macrotile_mode = 1, + /* TODO: Add reg_bus_bw with real value */ +}; + static const struct of_device_id mdss_dt_match[] = { { .compatible = "qcom,mdss" }, { .compatible = "qcom,msm8998-mdss", .data = &msm8998_data }, @@ -656,6 +668,7 @@ static const struct of_device_id mdss_dt_match[] = { { .compatible = "qcom,sm8450-mdss", .data = &sm8350_data }, { .compatible = "qcom,sm8550-mdss", .data = &sm8550_data }, { .compatible = "qcom,sm8650-mdss", .data = &sm8550_data}, + { .compatible = "qcom,x1e80100-mdss", .data = &x1e80100_data}, {} }; MODULE_DEVICE_TABLE(of, mdss_dt_match); From patchwork Fri Feb 16 17:01:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 13560333 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 720F2C48BC4 for ; Fri, 16 Feb 2024 17:01:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EBE3410EC47; Fri, 16 Feb 2024 17:01:29 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="A2lWRHfj"; dkim-atps=neutral Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by gabe.freedesktop.org (Postfix) with ESMTPS id D64CB10EC5D for ; Fri, 16 Feb 2024 17:01:27 +0000 (UTC) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-563cc707c7cso2871626a12.1 for ; Fri, 16 Feb 2024 09:01:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708102886; x=1708707686; darn=lists.freedesktop.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=mXXcyuPilQ9nXPlOaKhEVr0yZRCsEUndDUsEgWHiPIw=; b=A2lWRHfjSslDdcP8yjHkxpevJIORJH0YyL1piQGTFjEEGAJtlunYlyVeSd8GMWnEQh QF7LScUSjVz8THZ3sGIYeTKZm/X+qcKqjRgXJjg9Guopl10j0MyN8F1oUx657nMpVlrr PI8Exw4hOJTCOZlSZg3zapQZVPJAoZLWxdQvmeFPtBjyHfVYMOrWKwJtCZ07n0YvhdNT hebXy95ig323RSe2rqNRxKt/0q/iBPgXQBhV5IteL1gaFlEwIZb+2/zscS3jLrHsOZqw PZU/yrTSrJR5vbQ3NWTtjNho2/rB+rahqPxHZ9xBBla09avRPVriLqqtgcx5No6uY8Qh jpmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708102886; x=1708707686; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mXXcyuPilQ9nXPlOaKhEVr0yZRCsEUndDUsEgWHiPIw=; b=gIyJcdZBrjKSY7duZwYfOurHmtQMJP62BGxmi635+ouwVlWWpqp116PbZlbC3kv4lp 3u5D2ZK6XYboyrwO6X/jQ319vEniResy1j9RhXDq3m3rXtqNxvf0zOc6bg+AQNZOfEGC gX+E3KsYKu8KWDGOzMO3E0K+TQzyRDuNPHC2qUERTHfFJ7nJ8G+mp901CYdiaMI00/Rs rp18zU/B9wQ/OFQm/1kYn0TYSoQy9UPZiP5anjNNXQ4vdzsTc3sOjaAEafqeIZW2740E /N1/RTFQqMuLoQSb1eE8+1U3JT5Ls/C4YdDJYFGmYLDZaTIKcIb2fY+QRiYai/DuSaKB OoiA== X-Forwarded-Encrypted: i=1; AJvYcCW2KbgO4dtKTDpNJqffylGjaagyZGJUyygXGdl1R4h8MG9KIxYwx1ZUzj4CIGFjdpmt1MKwjyUYp5IqD+XA8of26r2mciDZmaIVsmju2xr6 X-Gm-Message-State: AOJu0YypYQ5BBGlSSMdSPuNGtScBwvKVFBtboIb0WAxalt+z5PDvUPoQ Qe1PtAS9A6EdcHhmrilrdgf2LM8NkPMOgi4oCRFXbEpGK7xFylXH9KY2cFmhV1o= X-Google-Smtp-Source: AGHT+IEj0TiS8SMzqziJFwnfImfE3MIXes3M8tKnCzm6riauWQLMtts2l65koB4duqgvoSEFr89vUA== X-Received: by 2002:a05:6402:1cc4:b0:561:7832:d35 with SMTP id ds4-20020a0564021cc400b0056178320d35mr9431639edb.15.1708102886311; Fri, 16 Feb 2024 09:01:26 -0800 (PST) Received: from [127.0.1.1] ([188.24.162.93]) by smtp.gmail.com with ESMTPSA id u20-20020aa7d894000000b00563a6c9fd71sm159706edq.16.2024.02.16.09.01.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 09:01:25 -0800 (PST) From: Abel Vesa Date: Fri, 16 Feb 2024 19:01:08 +0200 Subject: [PATCH v3 4/4] drm/msm/dpu: Add X1E80100 support MIME-Version: 1.0 Message-Id: <20240216-x1e80100-display-v3-4-28b1c33ac8c0@linaro.org> References: <20240216-x1e80100-display-v3-0-28b1c33ac8c0@linaro.org> In-Reply-To: <20240216-x1e80100-display-v3-0-28b1c33ac8c0@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Rob Herring 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, Abel Vesa X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=15961; i=abel.vesa@linaro.org; h=from:subject:message-id; bh=Wjo+0pOGgXnx4YaZ4l1uyPRnvTzMVxrVJy0mXHIFY5A=; b=owEBbQKS/ZANAwAKARtfRMkAlRVWAcsmYgBlz5Tbzdi1p4lwt7Q8DYso6+WpunWYfvxSHrB+v XRp0NgqjlCJAjMEAAEKAB0WIQRO8+4RTnqPKsqn0bgbX0TJAJUVVgUCZc+U2wAKCRAbX0TJAJUV VtPqD/9gT7zJ0K/qj0yOcSNTOFnfRUfZ67zB7HBCuX5wLyOW6gff3SWsWqUPY83w+zeQ6miUjRP ur/0rvt+7l3OhaETFxiLsBqBCdEbhR2kwAoZ8zmSmHX9gfUE9C9Cn+ma+HrsqK88iTWSt7pav9W oREMf50KWQILrt2zNxUJS5UZUCHOD7PizBuysCbAP4cBMLycIBNdliAJpSf+/V4UaoEMhjlBUoD dW2XPpVQB6xuoxo57L3n8jHMnVfhGC3PvIhiHsrX/ef/gu/kZrTwMGtozNljLzkOJr6JnoOUTzR i/SKFpagICr4bW9jmpUaFxaUrQSzKfwBDJBGTfXklpTRHJfAA/T/6h+yRrKTPA5v6xwxcgXhfuU QQb9YBZeYA298atWEfC7RyQt2g1jAze+e4dGlp4PvH78lk23Hf8dVAMaUBkp+1SGasuQvuBQXsT hGYlxUuGx/jSCwWaPbEo2seGbYm0d4YM2xHEVlS1kzsB2XlB97WJw7F2b6dwKvh7ejkG5P016o5 y3/bJagoMtiIwHa++Zl9VoTjj6bUL3b6ESHch2mrBCXZ8F6ztHU41PvMp7n8pJDu56WX20z6HOZ fV5BkNTAwQbaHJSGKYPDSW0fryHCKAIhdtuOh6ONns8uhAWf5LX8mmCOyopSLt3cve3pxrLxi6D bguYG4VB3bY+J6g== X-Developer-Key: i=abel.vesa@linaro.org; a=openpgp; fpr=6AFF162D57F4223A8770EF5AF7BF214136F41FAE X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add definitions for the display hardware used on the Qualcomm X1E80100 platform. Co-developed-by: Abhinav Kumar Signed-off-by: Abhinav Kumar Reviewed-by: Dmitry Baryshkov Signed-off-by: Abel Vesa --- .../drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 449 +++++++++++++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 2 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 + 4 files changed, 453 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h new file mode 100644 index 000000000000..9a9f7092c526 --- /dev/null +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h @@ -0,0 +1,449 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2023, Linaro Limited + */ + +#ifndef _DPU_9_2_X1E80100_H +#define _DPU_9_2_X1E80100_H + +static const struct dpu_caps x1e80100_dpu_caps = { + .max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH, + .max_mixer_blendstages = 0xb, + .has_src_split = true, + .has_dim_layer = true, + .has_idle_pc = true, + .has_3d_merge = true, + .max_linewidth = 5120, + .pixel_ram_size = DEFAULT_PIXEL_RAM_SIZE, +}; + +static const struct dpu_mdp_cfg x1e80100_mdp = { + .name = "top_0", + .base = 0, .len = 0x494, + .features = BIT(DPU_MDP_PERIPH_0_REMOVED), + .clk_ctrls = { + [DPU_CLK_CTRL_REG_DMA] = { .reg_off = 0x2bc, .bit_off = 20 }, + }, +}; + +/* FIXME: get rid of DPU_CTL_SPLIT_DISPLAY in favour of proper ACTIVE_CTL support */ +static const struct dpu_ctl_cfg x1e80100_ctl[] = { + { + .name = "ctl_0", .id = CTL_0, + .base = 0x15000, .len = 0x290, + .features = CTL_SM8550_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), + }, { + .name = "ctl_1", .id = CTL_1, + .base = 0x16000, .len = 0x290, + .features = CTL_SM8550_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), + }, { + .name = "ctl_2", .id = CTL_2, + .base = 0x17000, .len = 0x290, + .features = CTL_SM8550_MASK, + .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), + }, { + .name = "ctl_3", .id = CTL_3, + .base = 0x18000, .len = 0x290, + .features = CTL_SM8550_MASK, + .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), + }, { + .name = "ctl_4", .id = CTL_4, + .base = 0x19000, .len = 0x290, + .features = CTL_SM8550_MASK, + .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), + }, { + .name = "ctl_5", .id = CTL_5, + .base = 0x1a000, .len = 0x290, + .features = CTL_SM8550_MASK, + .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), + }, +}; + +static const struct dpu_sspp_cfg x1e80100_sspp[] = { + { + .name = "sspp_0", .id = SSPP_VIG0, + .base = 0x4000, .len = 0x344, + .features = VIG_SDM845_MASK_SDMA, + .sblk = &dpu_vig_sblk_qseed3_3_3, + .xin_id = 0, + .type = SSPP_TYPE_VIG, + }, { + .name = "sspp_1", .id = SSPP_VIG1, + .base = 0x6000, .len = 0x344, + .features = VIG_SDM845_MASK_SDMA, + .sblk = &dpu_vig_sblk_qseed3_3_3, + .xin_id = 4, + .type = SSPP_TYPE_VIG, + }, { + .name = "sspp_2", .id = SSPP_VIG2, + .base = 0x8000, .len = 0x344, + .features = VIG_SDM845_MASK_SDMA, + .sblk = &dpu_vig_sblk_qseed3_3_3, + .xin_id = 8, + .type = SSPP_TYPE_VIG, + }, { + .name = "sspp_3", .id = SSPP_VIG3, + .base = 0xa000, .len = 0x344, + .features = VIG_SDM845_MASK_SDMA, + .sblk = &dpu_vig_sblk_qseed3_3_3, + .xin_id = 12, + .type = SSPP_TYPE_VIG, + }, { + .name = "sspp_8", .id = SSPP_DMA0, + .base = 0x24000, .len = 0x344, + .features = DMA_SDM845_MASK_SDMA, + .sblk = &dpu_dma_sblk, + .xin_id = 1, + .type = SSPP_TYPE_DMA, + }, { + .name = "sspp_9", .id = SSPP_DMA1, + .base = 0x26000, .len = 0x344, + .features = DMA_SDM845_MASK_SDMA, + .sblk = &dpu_dma_sblk, + .xin_id = 5, + .type = SSPP_TYPE_DMA, + }, { + .name = "sspp_10", .id = SSPP_DMA2, + .base = 0x28000, .len = 0x344, + .features = DMA_SDM845_MASK_SDMA, + .sblk = &dpu_dma_sblk, + .xin_id = 9, + .type = SSPP_TYPE_DMA, + }, { + .name = "sspp_11", .id = SSPP_DMA3, + .base = 0x2a000, .len = 0x344, + .features = DMA_SDM845_MASK_SDMA, + .sblk = &dpu_dma_sblk, + .xin_id = 13, + .type = SSPP_TYPE_DMA, + }, { + .name = "sspp_12", .id = SSPP_DMA4, + .base = 0x2c000, .len = 0x344, + .features = DMA_CURSOR_SDM845_MASK_SDMA, + .sblk = &dpu_dma_sblk, + .xin_id = 14, + .type = SSPP_TYPE_DMA, + }, { + .name = "sspp_13", .id = SSPP_DMA5, + .base = 0x2e000, .len = 0x344, + .features = DMA_CURSOR_SDM845_MASK_SDMA, + .sblk = &dpu_dma_sblk, + .xin_id = 15, + .type = SSPP_TYPE_DMA, + }, +}; + +static const struct dpu_lm_cfg x1e80100_lm[] = { + { + .name = "lm_0", .id = LM_0, + .base = 0x44000, .len = 0x320, + .features = MIXER_SDM845_MASK, + .sblk = &sdm845_lm_sblk, + .lm_pair = LM_1, + .pingpong = PINGPONG_0, + .dspp = DSPP_0, + }, { + .name = "lm_1", .id = LM_1, + .base = 0x45000, .len = 0x320, + .features = MIXER_SDM845_MASK, + .sblk = &sdm845_lm_sblk, + .lm_pair = LM_0, + .pingpong = PINGPONG_1, + .dspp = DSPP_1, + }, { + .name = "lm_2", .id = LM_2, + .base = 0x46000, .len = 0x320, + .features = MIXER_SDM845_MASK, + .sblk = &sdm845_lm_sblk, + .lm_pair = LM_3, + .pingpong = PINGPONG_2, + }, { + .name = "lm_3", .id = LM_3, + .base = 0x47000, .len = 0x320, + .features = MIXER_SDM845_MASK, + .sblk = &sdm845_lm_sblk, + .lm_pair = LM_2, + .pingpong = PINGPONG_3, + }, { + .name = "lm_4", .id = LM_4, + .base = 0x48000, .len = 0x320, + .features = MIXER_SDM845_MASK, + .sblk = &sdm845_lm_sblk, + .lm_pair = LM_5, + .pingpong = PINGPONG_4, + }, { + .name = "lm_5", .id = LM_5, + .base = 0x49000, .len = 0x320, + .features = MIXER_SDM845_MASK, + .sblk = &sdm845_lm_sblk, + .lm_pair = LM_4, + .pingpong = PINGPONG_5, + }, +}; + +static const struct dpu_dspp_cfg x1e80100_dspp[] = { + { + .name = "dspp_0", .id = DSPP_0, + .base = 0x54000, .len = 0x1800, + .features = DSPP_SC7180_MASK, + .sblk = &sdm845_dspp_sblk, + }, { + .name = "dspp_1", .id = DSPP_1, + .base = 0x56000, .len = 0x1800, + .features = DSPP_SC7180_MASK, + .sblk = &sdm845_dspp_sblk, + }, { + .name = "dspp_2", .id = DSPP_2, + .base = 0x58000, .len = 0x1800, + .features = DSPP_SC7180_MASK, + .sblk = &sdm845_dspp_sblk, + }, { + .name = "dspp_3", .id = DSPP_3, + .base = 0x5a000, .len = 0x1800, + .features = DSPP_SC7180_MASK, + .sblk = &sdm845_dspp_sblk, + }, +}; + +static const struct dpu_pingpong_cfg x1e80100_pp[] = { + { + .name = "pingpong_0", .id = PINGPONG_0, + .base = 0x69000, .len = 0, + .features = BIT(DPU_PINGPONG_DITHER), + .sblk = &sc7280_pp_sblk, + .merge_3d = MERGE_3D_0, + .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), + }, { + .name = "pingpong_1", .id = PINGPONG_1, + .base = 0x6a000, .len = 0, + .features = BIT(DPU_PINGPONG_DITHER), + .sblk = &sc7280_pp_sblk, + .merge_3d = MERGE_3D_0, + .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), + }, { + .name = "pingpong_2", .id = PINGPONG_2, + .base = 0x6b000, .len = 0, + .features = BIT(DPU_PINGPONG_DITHER), + .sblk = &sc7280_pp_sblk, + .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, + .features = BIT(DPU_PINGPONG_DITHER), + .sblk = &sc7280_pp_sblk, + .merge_3d = MERGE_3D_1, + .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), + }, { + .name = "pingpong_4", .id = PINGPONG_4, + .base = 0x6d000, .len = 0, + .features = BIT(DPU_PINGPONG_DITHER), + .sblk = &sc7280_pp_sblk, + .merge_3d = MERGE_3D_2, + .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), + }, { + .name = "pingpong_5", .id = PINGPONG_5, + .base = 0x6e000, .len = 0, + .features = BIT(DPU_PINGPONG_DITHER), + .sblk = &sc7280_pp_sblk, + .merge_3d = MERGE_3D_2, + .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), + }, { + .name = "pingpong_6", .id = PINGPONG_6, + .base = 0x66000, .len = 0, + .features = BIT(DPU_PINGPONG_DITHER), + .sblk = &sc7280_pp_sblk, + .merge_3d = MERGE_3D_3, + }, { + .name = "pingpong_7", .id = PINGPONG_7, + .base = 0x66400, .len = 0, + .features = BIT(DPU_PINGPONG_DITHER), + .sblk = &sc7280_pp_sblk, + .merge_3d = MERGE_3D_3, + }, +}; + +static const struct dpu_merge_3d_cfg x1e80100_merge_3d[] = { + { + .name = "merge_3d_0", .id = MERGE_3D_0, + .base = 0x4e000, .len = 0x8, + }, { + .name = "merge_3d_1", .id = MERGE_3D_1, + .base = 0x4f000, .len = 0x8, + }, { + .name = "merge_3d_2", .id = MERGE_3D_2, + .base = 0x50000, .len = 0x8, + }, { + .name = "merge_3d_3", .id = MERGE_3D_3, + .base = 0x66700, .len = 0x8, + }, +}; + +/* + * 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 x1e80100_dsc[] = { + { + .name = "dce_0_0", .id = DSC_0, + .base = 0x80000, .len = 0x4, + .features = BIT(DPU_DSC_HW_REV_1_2), + .sblk = &dsc_sblk_0, + }, { + .name = "dce_0_1", .id = DSC_1, + .base = 0x80000, .len = 0x4, + .features = BIT(DPU_DSC_HW_REV_1_2), + .sblk = &dsc_sblk_1, + }, { + .name = "dce_1_0", .id = DSC_2, + .base = 0x81000, .len = 0x4, + .features = BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .sblk = &dsc_sblk_0, + }, { + .name = "dce_1_1", .id = DSC_3, + .base = 0x81000, .len = 0x4, + .features = BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .sblk = &dsc_sblk_1, + }, +}; + +static const struct dpu_wb_cfg x1e80100_wb[] = { + { + .name = "wb_2", .id = WB_2, + .base = 0x65000, .len = 0x2c8, + .features = WB_SM8250_MASK, + .format_list = wb2_formats_rgb, + .num_formats = ARRAY_SIZE(wb2_formats_rgb), + .xin_id = 6, + .vbif_idx = VBIF_RT, + .maxlinewidth = 4096, + .intr_wb_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), + }, +}; + +static const struct dpu_intf_cfg x1e80100_intf[] = { + { + .name = "intf_0", .id = INTF_0, + .base = 0x34000, .len = 0x280, + .features = INTF_SC7280_MASK, + .type = INTF_DP, + .controller_id = MSM_DP_CONTROLLER_0, + .prog_fetch_lines_worst_case = 24, + .intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), + .intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25), + }, { + .name = "intf_1", .id = INTF_1, + .base = 0x35000, .len = 0x300, + .features = INTF_SC7280_MASK, + .type = INTF_DSI, + .controller_id = MSM_DSI_CONTROLLER_0, + .prog_fetch_lines_worst_case = 24, + .intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), + .intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), + .intr_tear_rd_ptr = DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2), + }, { + .name = "intf_2", .id = INTF_2, + .base = 0x36000, .len = 0x300, + .features = INTF_SC7280_MASK, + .type = INTF_DSI, + .controller_id = MSM_DSI_CONTROLLER_1, + .prog_fetch_lines_worst_case = 24, + .intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28), + .intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29), + .intr_tear_rd_ptr = DPU_IRQ_IDX(MDP_INTF2_TEAR_INTR, 2), + }, { + .name = "intf_3", .id = INTF_3, + .base = 0x37000, .len = 0x280, + .features = INTF_SC7280_MASK, + .type = INTF_DP, + .controller_id = MSM_DP_CONTROLLER_1, + .prog_fetch_lines_worst_case = 24, + .intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30), + .intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 31), + }, { + .name = "intf_4", .id = INTF_4, + .base = 0x38000, .len = 0x280, + .features = INTF_SC7280_MASK, + .type = INTF_DP, + .controller_id = MSM_DP_CONTROLLER_2, + .prog_fetch_lines_worst_case = 24, + .intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 20), + .intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 21), + }, { + .name = "intf_5", .id = INTF_5, + .base = 0x39000, .len = 0x280, + .features = INTF_SC7280_MASK, + .type = INTF_DP, + .controller_id = MSM_DP_CONTROLLER_3, + .prog_fetch_lines_worst_case = 24, + .intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 22), + .intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 23), + }, +}; + +static const struct dpu_perf_cfg x1e80100_perf_data = { + .max_bw_low = 13600000, + .max_bw_high = 18200000, + .min_core_ib = 2500000, + .min_llcc_ib = 0, + .min_dram_ib = 800000, + .min_prefill_lines = 35, + /* FIXME: lut tables */ + .danger_lut_tbl = {0x3ffff, 0x3ffff, 0x0}, + .safe_lut_tbl = {0xfe00, 0xfe00, 0xffff}, + .qos_lut_tbl = { + {.nentry = ARRAY_SIZE(sc7180_qos_linear), + .entries = sc7180_qos_linear + }, + {.nentry = ARRAY_SIZE(sc7180_qos_macrotile), + .entries = sc7180_qos_macrotile + }, + {.nentry = ARRAY_SIZE(sc7180_qos_nrt), + .entries = sc7180_qos_nrt + }, + /* TODO: macrotile-qseed is different from macrotile */ + }, + .cdp_cfg = { + {.rd_enable = 1, .wr_enable = 1}, + {.rd_enable = 1, .wr_enable = 0} + }, + .clk_inefficiency_factor = 105, + .bw_inefficiency_factor = 120, +}; + +static const struct dpu_mdss_version x1e80100_mdss_ver = { + .core_major_ver = 9, + .core_minor_ver = 2, +}; + +const struct dpu_mdss_cfg dpu_x1e80100_cfg = { + .mdss_ver = &x1e80100_mdss_ver, + .caps = &x1e80100_dpu_caps, + .mdp = &x1e80100_mdp, + .ctl_count = ARRAY_SIZE(x1e80100_ctl), + .ctl = x1e80100_ctl, + .sspp_count = ARRAY_SIZE(x1e80100_sspp), + .sspp = x1e80100_sspp, + .mixer_count = ARRAY_SIZE(x1e80100_lm), + .mixer = x1e80100_lm, + .dspp_count = ARRAY_SIZE(x1e80100_dspp), + .dspp = x1e80100_dspp, + .pingpong_count = ARRAY_SIZE(x1e80100_pp), + .pingpong = x1e80100_pp, + .dsc_count = ARRAY_SIZE(x1e80100_dsc), + .dsc = x1e80100_dsc, + .merge_3d_count = ARRAY_SIZE(x1e80100_merge_3d), + .merge_3d = x1e80100_merge_3d, + .wb_count = ARRAY_SIZE(x1e80100_wb), + .wb = x1e80100_wb, + .intf_count = ARRAY_SIZE(x1e80100_intf), + .intf = x1e80100_intf, + .vbif_count = ARRAY_SIZE(sm8550_vbif), + .vbif = sm8550_vbif, + .perf = &x1e80100_perf_data, +}; + +#endif diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c index 54e8717403a0..31ade66a3c87 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -703,4 +703,6 @@ static const struct dpu_qos_lut_entry sc7180_qos_nrt[] = { #include "catalog/dpu_9_0_sm8550.h" +#include "catalog/dpu_9_2_x1e80100.h" + #include "catalog/dpu_10_0_sm8650.h" diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h index ba82ef4560a6..572a25f7f62d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -849,5 +849,6 @@ extern const struct dpu_mdss_cfg dpu_sc8280xp_cfg; extern const struct dpu_mdss_cfg dpu_sm8450_cfg; extern const struct dpu_mdss_cfg dpu_sm8550_cfg; extern const struct dpu_mdss_cfg dpu_sm8650_cfg; +extern const struct dpu_mdss_cfg dpu_x1e80100_cfg; #endif /* _DPU_HW_CATALOG_H */ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 48728be27e15..fc420b805bbf 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1337,6 +1337,7 @@ static const struct of_device_id dpu_dt_match[] = { { .compatible = "qcom,sm8450-dpu", .data = &dpu_sm8450_cfg, }, { .compatible = "qcom,sm8550-dpu", .data = &dpu_sm8550_cfg, }, { .compatible = "qcom,sm8650-dpu", .data = &dpu_sm8650_cfg, }, + { .compatible = "qcom,x1e80100-dpu", .data = &dpu_x1e80100_cfg, }, {} }; MODULE_DEVICE_TABLE(of, dpu_dt_match);