From patchwork Wed Apr 21 05:28:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 12215461 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65937C433B4 for ; Wed, 21 Apr 2021 05:31:57 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A105E6140F for ; Wed, 21 Apr 2021 05:31:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A105E6140F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1O3kuQS661PrIk0PpYa2jesomz19JyKnFmEVxRFHHh4=; b=UubcdatfEawzUy8VwTcBgdgRy GEhmq/uuLvAcFvpSLr9FrWTtPN97lpQ1JR+AHT7HiXvdZpR5iCxpLah05Ww1ePuTOmW6aQ0ldx/1P GBVXmXBdks4LsBtEbzuUKZVyk7dEblot6BG5kA8ziLCtKx+1wIJQH7wusir+XlXstTs0ZFZPQlXMg a1AtMzhBucSKufRltLSmLZ6WbpyLtksey0S6zH1wyiOmWDiTy8Mk6GmIs18y/bXBz+EYYMAqOsyIC 29PNemBFHk/PeqFuxaFOUm6Tjj+LgUtexOjyEqxQTYVPvxKjnN2ZwmoFs6EFi5B+aazTv6BthV4d4 /TFMVYDsw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZ5Sh-00DiDo-RL; Wed, 21 Apr 2021 05:31:43 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZ5QE-00Di51-Mt for linux-mediatek@desiato.infradead.org; Wed, 21 Apr 2021 05:29:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=kxnhLi78DPDSYFjxJIM+qzcCyplsSYCFm1pDPKchpRM=; b=CJt67AWZRok1cxCbs1Q10RCTXg TPdeG5giRkoaP9rtmrF5+4OOTVq3C5BBtT7PNDTHP/+iBvY/WSDECPI7StzRbpbeeo7NynngN1KXp SDqt/Q8ID4t/dHfErdO4d3Ys0mLTMtnqcygqZoAiE/eZ34MYBQZGVKj5cTviJJpz1ypZYisjbSIL4 voyDVUcExvO8ELcby3U8Yp/mZMBAf7R6ABGpPrZm1uWc6us6KbfOXjRSXQLtonYZpo4j9/XlVZo2L ydG0MIRcd0HGpLbp+z5hA1FtbiHm0f7S/xDKQJWs61YZNh5F73oR6avyaIy9lv8ba1FAhI5NJoPHN 0JTTx7eQ==; Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZ5Q9-00CbxU-Pp for linux-mediatek@lists.infradead.org; Wed, 21 Apr 2021 05:29:09 +0000 Received: by mail-pg1-x52c.google.com with SMTP id p12so28675406pgj.10 for ; Tue, 20 Apr 2021 22:29:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kxnhLi78DPDSYFjxJIM+qzcCyplsSYCFm1pDPKchpRM=; b=hmTmxKk7RkXuD+YrXgXMT7YbIC9neJ63/n1UtLtvvY3ocKbGWYT7FRURBUJSutrmJW qxVfRy5vX/W6NqaKXQNqwkiwlb7RR0HTYRciruFEEb8N2oQPOaTQsSbNON3gBZ2l/Bdi FZqMALQbvzzM42Np2JYnVdxQGwEWEkli7Uq6Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kxnhLi78DPDSYFjxJIM+qzcCyplsSYCFm1pDPKchpRM=; b=t5ZEiwF5qdnriaMHNoGLBdhuNZlsVoEUOrV9P+ngkq0SxBipAsKukdYomNzDVldiui RpKPa74AIkplr0hw3+yUUmbjbwtwASNt8IwBpklNdXUbvMRvhxBAY838loaT7I7L+26z n3jmvyAX+BlqoJcvRpT21oERmAdUmr5TfXN4sK60w/KDEJLjXf4p0Jf/CjZOq1pvTL+Y ZhVBzji8Ldycr36WvoMRk0ddXhIlv3gIB0Hhhdq2zYQ1+kIiCMJJtwqlN7UqsuXYExPg paNy5aEmydfR7oKu+erqnOV7lc1WumHrifp/PazPFeDbHxsun4o5C+q+M/XiOWf1PHfp P1NQ== X-Gm-Message-State: AOAM532JdXuUeLsNF2c6lAcU3kwaX2v+vdQBDzSSoKLcqzo663fWIYec 36yurNtxNsZMrk22XTXvLtW22g== X-Google-Smtp-Source: ABdhPJyhb2uM0S9Pz4wG6iMzL3FZiBTC1btTNtARSLk++FAK0bWUnZI684adzhBP8AOcY3vu81YTNg== X-Received: by 2002:a62:aa09:0:b029:25c:3c28:e2b with SMTP id e9-20020a62aa090000b029025c3c280e2bmr18791955pff.39.1618982945075; Tue, 20 Apr 2021 22:29:05 -0700 (PDT) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:b3e5:49c0:4843:2bbe]) by smtp.gmail.com with ESMTPSA id b6sm602537pfa.185.2021.04.20.22.29.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 22:29:04 -0700 (PDT) From: Nicolas Boichat To: Rob Herring , Steven Price , Alyssa Rosenzweig Cc: fshao@chromium.org, hsinyi@chromium.org, hoegsberg@chromium.org, Tomeu Vizoso , Neil Armstrong , boris.brezillon@collabora.com, Nicolas Boichat , Daniel Vetter , David Airlie , Matthias Brugger , Rob Herring , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v13 1/4] dt-bindings: gpu: mali-bifrost: Add Mediatek MT8183 Date: Wed, 21 Apr 2021 13:28:52 +0800 Message-Id: <20210421132841.v13.1.Ie74d3355761aab202d4825ac6f66d990bba0130e@changeid> X-Mailer: git-send-email 2.31.1.368.gbe11c130af-goog In-Reply-To: <20210421052855.1279713-1-drinkcat@chromium.org> References: <20210421052855.1279713-1-drinkcat@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210420_222905_844925_B338558D X-CRM114-Status: GOOD ( 11.22 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Define a compatible string for the Mali Bifrost GPU found in Mediatek's MT8183 SoCs. Signed-off-by: Nicolas Boichat Reviewed-by: Rob Herring --- (no changes since v12) Changes in v12: - binding: Fix min/maxItems logic (Rob Herring) Changes in v11: - binding: power-domain-names not power-domainS-names Changes in v10: - Fix the binding to make sure sram-supply property can be provided. Changes in v6: - Rebased, actually tested with recent mesa driver. Changes in v5: - Rename "2d" power domain to "core2" Changes in v4: - Add power-domain-names description (kept Alyssa's reviewed-by as the change is minor) .../bindings/gpu/arm,mali-bifrost.yaml | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml b/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml index 184492162e7e..b22cd8f1b015 100644 --- a/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml +++ b/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml @@ -17,6 +17,7 @@ properties: items: - enum: - amlogic,meson-g12a-mali + - mediatek,mt8183-mali - realtek,rtd1619-mali - rockchip,px30-mali - const: arm,mali-bifrost # Mali Bifrost GPU model/revision is fully discoverable @@ -41,10 +42,13 @@ properties: mali-supply: true + sram-supply: true + operating-points-v2: true power-domains: - maxItems: 1 + minItems: 1 + maxItems: 3 resets: maxItems: 2 @@ -87,6 +91,30 @@ allOf: then: required: - resets + - if: + properties: + compatible: + contains: + const: mediatek,mt8183-mali + then: + properties: + power-domains: + minItems: 3 + power-domain-names: + items: + - const: core0 + - const: core1 + - const: core2 + + required: + - sram-supply + - power-domains + - power-domain-names + else: + properties: + power-domains: + maxItems: 1 + sram-supply: false examples: - | From patchwork Wed Apr 21 05:28:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 12215459 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86274C433ED for ; Wed, 21 Apr 2021 05:31:46 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B1FB86141E for ; Wed, 21 Apr 2021 05:31:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1FB86141E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=LFWeomWN9mYeIgSm0GmmpYPLHr7O9CgkqwUMg+TL06M=; b=ggY4qUJc2iRcNAIPQWmK2O7G1 ofNMufRdXpC65ktmBXVAl8H2ShW7914OVAXeQvD4d1X4hwns+aILVeYBOW1eBXNVtGnqR54hCBIf8 xVfUnvvuYw806pc1at9fxsHjDMsbT8GnW5TvB+USM5t04guCUmMo1LPOIsz8fwmS5ElUp3PybadVx 2ekn0dKK3Mt/VjvAvToEu9BnGpVGDJOdOyGnF1xRoBPpWtl5u7/oRL6TlC4WNStSbzdiXtBdZq7wU sD0pL9OfQ0M42MnyE2NPccnam03i4RDhsb2xscg5YKnXjgjCOnp5zbGW9RN9tE8fPPUPzBvmXD/8i IARcOE5DQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZ5SD-00DiBf-Aw; Wed, 21 Apr 2021 05:31:13 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZ5QF-00Di59-UP for linux-mediatek@desiato.infradead.org; Wed, 21 Apr 2021 05:29:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=d2Ex8H/B2lVYbCEFqXrDb6QEUdQirbnByEdkR8Qupd8=; b=4Uh4wM6BkW+KH45eXqLIdCq02W b5rbMRSxL4EkghIP8/wYzpYj3nh5f3YxiafVO0zqTlPMhCSxd8ZaM/a5XgqteCC0l0ibQTgdKm3kF mME2AkKRSj/Gi+bsdArIjZfVAZEq2KAkLbsbCD7RRTHQp4xotoPC1WM2pgkFQxSrjaJvKzr+A2XKQ PXStc+m07a6Ob99lz4MwaKKxrvw5Doij+gLMIuF+Wieinwvodkp1OFzK8LsarQnbtkvFNzGm8tURj xLWQl1Ois4XbXrX6eydMFO7Fl6wXH8zLTStTLnx1HRVbQ9UlmS1GpH4A3yhnNOAysljZakU85zCUF mnH0RfuQ==; Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZ5QC-00Cbyi-Ro for linux-mediatek@lists.infradead.org; Wed, 21 Apr 2021 05:29:10 +0000 Received: by mail-pl1-x629.google.com with SMTP id e9so4000538plj.2 for ; Tue, 20 Apr 2021 22:29:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d2Ex8H/B2lVYbCEFqXrDb6QEUdQirbnByEdkR8Qupd8=; b=ajQHA8APYObyWB5oqbzUMYZb1Ea5Ajix/xQg+3MMIW35RwIf61BVnbWO9GcOwFOp3v ob8Hmpuvv626h+CHKlOAcAIY0KdK46eyzVXH7oAodZtC49OvfQy8oGxzjMrEP7hr3bYU VaW628+eilqnSrrS5rRMZ19qGgOZ/KgDsLh/M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d2Ex8H/B2lVYbCEFqXrDb6QEUdQirbnByEdkR8Qupd8=; b=nQl0PIznFuZ5SaQACufBBLDREJzZsfLPNhBwIkE6l1QUeUq4w2qcIqwmv0bcmJN3Q8 ka7fuJft3l/nq2K0BRfGx7TCpwjidJtvJfuAHq9Wh7TeLpuTppDe0pDghIq3tsCn3YTY rtVAneBZQDKqaSHoKeGJdAvvQo7lSWT5uDmuhYN4yqfk2zscNF9jDEvyY/vMOXJoU/EC Gfduq88JsUi4wqfVp+/UkXkT/HNbFN7Ivw5AWRbtF64Nk0BR7Zui8xPW5MGbNf+JwHkj SBL9k+adghZcUi1NMCQqpuEkK9NKoO94m3mwMweiTMbW3/9mPbMzFF7YqO1H4kAW430v Exuw== X-Gm-Message-State: AOAM532epwEo6/MHX2oXwvx3c8763ADKebRx9EfyTYyRgImEUSRjhE2A pKPGmv4YVBdJcPBIq3ZdhFtPZw== X-Google-Smtp-Source: ABdhPJwRyhKP+Lo3SrnymSVn1o37Yt6+zT9t+RvWrGrqorV8znxZqGzETqdJcX8lJDuiPyr/zf5pSg== X-Received: by 2002:a17:902:d48c:b029:ec:b2c9:62c5 with SMTP id c12-20020a170902d48cb02900ecb2c962c5mr9546958plg.51.1618982948171; Tue, 20 Apr 2021 22:29:08 -0700 (PDT) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:b3e5:49c0:4843:2bbe]) by smtp.gmail.com with ESMTPSA id b6sm602537pfa.185.2021.04.20.22.29.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 22:29:07 -0700 (PDT) From: Nicolas Boichat To: Rob Herring , Steven Price , Alyssa Rosenzweig Cc: fshao@chromium.org, hsinyi@chromium.org, hoegsberg@chromium.org, Tomeu Vizoso , Neil Armstrong , boris.brezillon@collabora.com, Nicolas Boichat , Matthias Brugger , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v13 2/4] arm64: dts: mt8183: Add node for the Mali GPU Date: Wed, 21 Apr 2021 13:28:53 +0800 Message-Id: <20210421132841.v13.2.I9f45f5c1f975422d58b5904d11546349e9ccdc94@changeid> X-Mailer: git-send-email 2.31.1.368.gbe11c130af-goog In-Reply-To: <20210421052855.1279713-1-drinkcat@chromium.org> References: <20210421052855.1279713-1-drinkcat@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210420_222908_922556_4C087633 X-CRM114-Status: GOOD ( 14.05 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Add a basic GPU node for mt8183. Signed-off-by: Nicolas Boichat Reviewed-by: Ezequiel Garcia --- The binding we use with out-of-tree Mali drivers includes more clocks, this is used for devfreq: the out-of-tree driver switches clk_mux to clk_sub_parent (26Mhz), adjusts clk_main_parent, then switches clk_mux back to clk_main_parent: (see https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-4.19/drivers/gpu/arm/midgard/platform/mediatek/mali_kbase_runtime_pm.c#423) clocks = <&topckgen CLK_TOP_MFGPLL_CK>, <&topckgen CLK_TOP_MUX_MFG>, <&clk26m>, <&mfgcfg CLK_MFG_BG3D>; clock-names = "clk_main_parent", "clk_mux", "clk_sub_parent", "subsys_mfg_cg"; (based on discussions, this probably belongs in the clock core) This only matters for devfreq, that is disabled anyway as we don't have platform-specific code to handle >1 supplies. (no changes since v12) Changes in v12: - Add gpu node to mt8183-pumpkin.dts as well (Neil Armstrong). Changes in v11: - mt8183*.dts: remove incorrect supply-names Changes in v6: - Add gpu regulators to kukui dtsi as well. - Power domains are now attached to spm, not scpsys - Drop R-B. Changes in v5: - Rename "2d" power domain to "core2" (keep R-B again). Changes in v4: - Add power-domain-names to describe the 3 domains. (kept Alyssa's reviewed-by as the change is minor) Changes in v2: - Use sram instead of mali_sram as SRAM supply name. - Rename mali@ to gpu@. arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 5 + .../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 5 + .../boot/dts/mediatek/mt8183-pumpkin.dts | 5 + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 105 ++++++++++++++++++ 4 files changed, 120 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts index edff1e03e6fe..7bc0a6a7fadf 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts @@ -42,6 +42,11 @@ &auxadc { status = "okay"; }; +&gpu { + mali-supply = <&mt6358_vgpu_reg>; + sram-supply = <&mt6358_vsram_gpu_reg>; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c_pins_0>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi index ff56bcfa3370..e4e54be1c2b2 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi @@ -279,6 +279,11 @@ dsi_out: endpoint { }; }; +&gpu { + mali-supply = <&mt6358_vgpu_reg>; + sram-supply = <&mt6358_vsram_gpu_reg>; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts b/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts index 0aff5eb52e88..ee912825cfc6 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts @@ -68,6 +68,11 @@ &auxadc { status = "okay"; }; +&gpu { + mali-supply = <&mt6358_vgpu_reg>; + sram-supply = <&mt6358_vsram_gpu_reg>; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c_pins_0>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi index c5e822b6b77a..c75fdeea8aa4 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi @@ -1118,6 +1118,111 @@ mfgcfg: syscon@13000000 { #clock-cells = <1>; }; + gpu: gpu@13040000 { + compatible = "mediatek,mt8183-mali", "arm,mali-bifrost"; + reg = <0 0x13040000 0 0x4000>; + interrupts = + , + , + ; + interrupt-names = "job", "mmu", "gpu"; + + clocks = <&topckgen CLK_TOP_MFGPLL_CK>; + + power-domains = + <&spm MT8183_POWER_DOMAIN_MFG_CORE0>, + <&spm MT8183_POWER_DOMAIN_MFG_CORE1>, + <&spm MT8183_POWER_DOMAIN_MFG_2D>; + power-domain-names = "core0", "core1", "core2"; + + operating-points-v2 = <&gpu_opp_table>; + }; + + gpu_opp_table: opp_table0 { + compatible = "operating-points-v2"; + opp-shared; + + opp-300000000 { + opp-hz = /bits/ 64 <300000000>; + opp-microvolt = <625000>, <850000>; + }; + + opp-320000000 { + opp-hz = /bits/ 64 <320000000>; + opp-microvolt = <631250>, <850000>; + }; + + opp-340000000 { + opp-hz = /bits/ 64 <340000000>; + opp-microvolt = <637500>, <850000>; + }; + + opp-360000000 { + opp-hz = /bits/ 64 <360000000>; + opp-microvolt = <643750>, <850000>; + }; + + opp-380000000 { + opp-hz = /bits/ 64 <380000000>; + opp-microvolt = <650000>, <850000>; + }; + + opp-400000000 { + opp-hz = /bits/ 64 <400000000>; + opp-microvolt = <656250>, <850000>; + }; + + opp-420000000 { + opp-hz = /bits/ 64 <420000000>; + opp-microvolt = <662500>, <850000>; + }; + + opp-460000000 { + opp-hz = /bits/ 64 <460000000>; + opp-microvolt = <675000>, <850000>; + }; + + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <687500>, <850000>; + }; + + opp-540000000 { + opp-hz = /bits/ 64 <540000000>; + opp-microvolt = <700000>, <850000>; + }; + + opp-580000000 { + opp-hz = /bits/ 64 <580000000>; + opp-microvolt = <712500>, <850000>; + }; + + opp-620000000 { + opp-hz = /bits/ 64 <620000000>; + opp-microvolt = <725000>, <850000>; + }; + + opp-653000000 { + opp-hz = /bits/ 64 <653000000>; + opp-microvolt = <743750>, <850000>; + }; + + opp-698000000 { + opp-hz = /bits/ 64 <698000000>; + opp-microvolt = <768750>, <868750>; + }; + + opp-743000000 { + opp-hz = /bits/ 64 <743000000>; + opp-microvolt = <793750>, <893750>; + }; + + opp-800000000 { + opp-hz = /bits/ 64 <800000000>; + opp-microvolt = <825000>, <925000>; + }; + }; + mmsys: syscon@14000000 { compatible = "mediatek,mt8183-mmsys", "syscon"; reg = <0 0x14000000 0 0x1000>; From patchwork Wed Apr 21 05:28:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 12215471 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AB56C433ED for ; Wed, 21 Apr 2021 05:32:41 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E3B5B6141C for ; Wed, 21 Apr 2021 05:32:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E3B5B6141C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bbSsGmup9O/wsGbJr0wdbbQ+BzgVzEiFRx2o1hUCvsQ=; b=UxhIg1aW85Xe5iQa9S8x6ts1r I95GQzSai5Q3ViBnzpOz9W+BTIAo+iyHizrQR77JXz0sP4ktkAOomBlT0sgAJqKkk356cwOdRhgV6 b6z3C2Ghs94yGv7vO2tcsCXO+EBCtkecN0UlbOyJijxbwZC1dH9fGuNcb+KBc7SbwMsYWN7IEGbJA lVa3TPiNssJ85eeWv/zW7plDYhFz37n89fZN9jy34Qy4/5WdqcMgirwwR/A0OzDOs1csDVL9FQDyG XYpPlyDjpsOiATFZaELjItuB358XuqHBk8R/SyA5QzhqgqIdCcYUFP6Bu76Qmcw7VGcvhW1nxdBPk qkPNpUMJw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZ5TP-00DiIe-5G; Wed, 21 Apr 2021 05:32:27 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZ5QP-00Di5e-A7 for linux-mediatek@desiato.infradead.org; Wed, 21 Apr 2021 05:29:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=5hFZoL/B1X+TSHMC73OVlRCB/m5eFhUPf/0EsulpbQc=; b=h2XkV7IlCQXNcX8mASJ3NyvJWX bhIISNVWvYQgIPJqZuloqxtx+WMNzR7d3zRAS5mRHYlz3h+YgXJ7YG5l2TOXP+ottJBxg8bDYOCap QyTZqRWtXKrqfErYpyN0UM9u2poFce7AbQSx/+N8qanDGR8NtcPAuqXvtmIL+cKjCL6RzWVHCcR+5 iV+8JoDis/lSKr/3geKJ1iKPG5ATKL1Fjq67rljrFV791QEhfS1u4A5q/M/y456RjcveCzbMIbk7f gt0duGL43qkHTfqCu7XTK3/eSahPR87XOn6B65IAdsy1dkNI3a0YOTNNNzSMGz2fHxHwDm6LJhYO1 6WAWrvVQ==; Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZ5QK-00Cc0h-7S for linux-mediatek@lists.infradead.org; Wed, 21 Apr 2021 05:29:20 +0000 Received: by mail-pg1-x52b.google.com with SMTP id q10so28665991pgj.2 for ; Tue, 20 Apr 2021 22:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5hFZoL/B1X+TSHMC73OVlRCB/m5eFhUPf/0EsulpbQc=; b=GSqR/tNLV3h2WeySeGfMGXOdlSgUpYvKwLbgArv7aByT94uKy05vclZyhRVEgxk6z1 y2lzKfsYfERoExvktOFnGzS6Nit5WD4J93WIFbcrCCn5ypodHnnkR6Xb9ApUv4tRIkTX X4dQbkBfnwKACwTorawRek4NP46rAGerLZ384= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5hFZoL/B1X+TSHMC73OVlRCB/m5eFhUPf/0EsulpbQc=; b=Vvt3xWA0phj5QXlxo9tMgRZUC2e5324+1a/u7Pv/oyo24kEWMMHBaUXeU69x+qX+E2 UElvC/TAO79ZLx/VvU/O2bftC0jCoGmbFmcYVUBuXrBU1RvOZDilLhGy8/pnuhE/i7gV ElCbWSbzNvJH6Yt2EqOZiE+aFf0zDF0dRmNZ28m6OgDkaNN6by9IwpIW7Aui8ZPJG8SY 6+mQMfkNN27WGBo6hujficIwLKAItzrfNeg8xzU316ze6+ARXW51c1pkv7sEmLzEAuc1 bU49NYjWXmmYEIctauUwSec80/iIBVUlr9jr+ZPXW6SW0DNXALlCl1OZUpM5F+wYJ71a EvwQ== X-Gm-Message-State: AOAM5304EMoZq3Gl0muedzO+N44xBfjTSNaxYE2J9grv8bpx9iFChZm4 zrL7BX+ptuZtNepjePjnRFt7lw== X-Google-Smtp-Source: ABdhPJyZDRqJdOcJWbtPfs6X/UaeVpCly9Jbo3Ob3dn5LLzwTPwfK1AOmwpC17pOPG6/nzFx3YPVUw== X-Received: by 2002:a17:90b:808:: with SMTP id bk8mr9347798pjb.128.1618982955584; Tue, 20 Apr 2021 22:29:15 -0700 (PDT) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:b3e5:49c0:4843:2bbe]) by smtp.gmail.com with ESMTPSA id b6sm602537pfa.185.2021.04.20.22.29.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 22:29:15 -0700 (PDT) From: Nicolas Boichat To: Rob Herring , Steven Price , Alyssa Rosenzweig Cc: fshao@chromium.org, hsinyi@chromium.org, hoegsberg@chromium.org, Tomeu Vizoso , Neil Armstrong , boris.brezillon@collabora.com, Nicolas Boichat , Daniel Vetter , David Airlie , Matthias Brugger , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v13 4/4] drm/panfrost: Add mt8183-mali compatible string Date: Wed, 21 Apr 2021 13:28:55 +0800 Message-Id: <20210421132841.v13.4.I5f6b04431828ec9c3e41e65f3337cec6a127480d@changeid> X-Mailer: git-send-email 2.31.1.368.gbe11c130af-goog In-Reply-To: <20210421052855.1279713-1-drinkcat@chromium.org> References: <20210421052855.1279713-1-drinkcat@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210420_222916_280307_CD3801F5 X-CRM114-Status: GOOD ( 12.42 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Add support for MT8183's G72 Bifrost. Signed-off-by: Nicolas Boichat Reviewed-by: Tomeu Vizoso Reviewed-by: Steven Price --- (no changes since v7) Changes in v7: - Fix GPU ID in commit message Changes in v6: - Context conflicts, reflow the code. - Use ARRAY_SIZE for power domains too. Changes in v5: - Change power domain name from 2d to core2. Changes in v4: - Add power domain names. Changes in v3: - Match mt8183-mali instead of bifrost, as we require special handling for the 2 regulators and 3 power domains. drivers/gpu/drm/panfrost/panfrost_drv.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index 83a461bdeea8..ca07098a6141 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -665,6 +665,15 @@ static const struct panfrost_compatible amlogic_data = { .vendor_quirk = panfrost_gpu_amlogic_quirk, }; +const char * const mediatek_mt8183_supplies[] = { "mali", "sram" }; +const char * const mediatek_mt8183_pm_domains[] = { "core0", "core1", "core2" }; +static const struct panfrost_compatible mediatek_mt8183_data = { + .num_supplies = ARRAY_SIZE(mediatek_mt8183_supplies), + .supply_names = mediatek_mt8183_supplies, + .num_pm_domains = ARRAY_SIZE(mediatek_mt8183_pm_domains), + .pm_domain_names = mediatek_mt8183_pm_domains, +}; + static const struct of_device_id dt_match[] = { /* Set first to probe before the generic compatibles */ { .compatible = "amlogic,meson-gxm-mali", @@ -681,6 +690,7 @@ static const struct of_device_id dt_match[] = { { .compatible = "arm,mali-t860", .data = &default_data, }, { .compatible = "arm,mali-t880", .data = &default_data, }, { .compatible = "arm,mali-bifrost", .data = &default_data, }, + { .compatible = "mediatek,mt8183-mali", .data = &mediatek_mt8183_data }, {} }; MODULE_DEVICE_TABLE(of, dt_match);