From patchwork Thu Mar 30 23:25:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 669193 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E088C77B6C for ; Thu, 30 Mar 2023 23:25:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231528AbjC3XZp (ORCPT ); Thu, 30 Mar 2023 19:25:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231354AbjC3XZe (ORCPT ); Thu, 30 Mar 2023 19:25:34 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 868833581 for ; Thu, 30 Mar 2023 16:25:23 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id b6so1242407ljr.1 for ; Thu, 30 Mar 2023 16:25:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680218722; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:from:to:cc:subject:date:message-id:reply-to; bh=HftqcNV01bP1qUBb1ndE/MxthMYt+qKNBzFxnthplNQ=; b=YHioA3L6VEW32L/h2taxmexBRWwLMCC/8dgB+lchxyiuN/O3/YD3RPWOdt2vUwtv5O LF/oyn4ug9VZndmJqS9331+l1ADXAOPJXuC+/QXzsBhCyB66kjIXK1dibi6foXDVS3xM UZJMisFRzgtItCuxIToiivIY6gJLwzdOO0scqsZcuHx+vTdzd6nhi1fp3QAE5WjijL8g OwxaYpa4Gix3BHNenRmsZhG1ZdN9zhDz/pawaI5cEz3wnurWEkXeXeZdy21yHWeThLc0 ffTiDGnvXpSZSi6rJpMNC/SiaJb4hPHwCxOLq2/+DHMIcHYPPKZtCwPGhXPm45BdA26h uRsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680218722; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HftqcNV01bP1qUBb1ndE/MxthMYt+qKNBzFxnthplNQ=; b=Dbc+i+NZ7rTx1I7G1j3Blpi/DRCjpbS7yLb4797X1CM588KiGiR6JR0WrOGkUDKdaT cYqWp4Yd3DiJ2McFiV8ybZj2DnrlVjS4ScYv4SdFQvByGybAPCB000AnyVS7Nj8hkuWp Po8rtRe6K91Ic1hjwasBU/BwduAHlNFJ7BHkFzXheq1AIXv0RFKupAo8+GlfyrUvuXc8 tIDr23L3Bl8CMDGsq5vXS587goq1hrjvuuBUCEN977TbhXEZVOcn68s5IbqjddG4nGJs JdYsFIZFYnT/gLPspg+FKcO1iNJg+nHovHI9gn+pSxvi2QLf7EGGJg3Ij/uFazhGU5Ww FAWA== X-Gm-Message-State: AAQBX9epW43JMk8YZsKRpGgoj8VE3JJuJsayGX8emOeuPlHq2sIEJGev MYeI21u9lArYuO7R39ZBtG2mMg== X-Google-Smtp-Source: AKy350bFW2GxqfZ2PgSy1dO4tJywp1vSMTUAz7/Y5Z2uoQZJ7czj+lxKXD7ygzxAXEHiMb9OIwVv8Q== X-Received: by 2002:a2e:9809:0:b0:2a6:8a:d0f5 with SMTP id a9-20020a2e9809000000b002a6008ad0f5mr3499555ljj.23.1680218721685; Thu, 30 Mar 2023 16:25:21 -0700 (PDT) Received: from [192.168.1.101] (abxj225.neoplus.adsl.tpnet.pl. [83.9.3.225]) by smtp.gmail.com with ESMTPSA id g26-20020ac2539a000000b004dda80cabf0sm127241lfh.172.2023.03.30.16.25.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 16:25:21 -0700 (PDT) From: Konrad Dybcio Subject: [PATCH v5 00/15] GMU-less A6xx support (A610, A619_holi) Date: Fri, 31 Mar 2023 01:25:14 +0200 Message-Id: <20230223-topic-gmuwrapper-v5-0-bf774b9a902a@linaro.org> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAFoaJmQC/4WNwQ6CMBAFf4X0bA22VMCT/2E8tLCFTbBttoAaw r9buHnR47zkzSwsAiFEdskWRjBjRO8SqEPGml67Dji2iZnIhcyFkHz0ARvePaYn6RCAuCmstcq 2ZVnVLN2MjsANadf06eimYUhjILD42ju3e+Ie4+jpvWdnua0/CrPkOVcGlNJSnqtTfR3QafJHT x3bbHPxz1AkA9RVCaas21zaL8O6rh/8u3epCAEAAA== To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen 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, Rob Clark , Marijn Suijten , Konrad Dybcio , Krzysztof Kozlowski X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1680218720; l=8169; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=z01+nQp81ADGS1gO2kKSpfKPGGLF6jHYGBobC+p5DLM=; b=Z5RIid0auN1tbffl8LatAvpNkO6ippIxfaXQT3RcGuXAR+LdHaIyEhImjSofn4Gibc3KmDNQJrfx xyo2bX82DDI9DzmALjecr0sNQgE1EbyBp2cJvHwd4djHHGMkW3Te X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org v4 -> v5: - Add a newline before the new allOf:if: [3/15] - Enforce 6 clocks on A619_holi/A610 [2/15] - Pick up tags - Improve error handling in a6xx_pm_resume [6/15] - Add patch [1/15] (fix an existing issue) which can be picked separately and account for it in [6/15] - Rebase atop Akhil's CX shutdown patches and incorporate analogous logic - Fix a regression introduced in v3 that made the fw loader expect GMU fw on GMU wrapper GPUs Dependencies: - https://lore.kernel.org/linux-arm-msm/20230120172233.1905761-1-konrad.dybcio@linaro.org/ (to apply) - https://lore.kernel.org/linux-arm-msm/20230330231517.2747024-1-konrad.dybcio@linaro.org/ (to work properly) v4: https://lore.kernel.org/r/20230223-topic-gmuwrapper-v4-0-e987eb79d03f@linaro.org v3 -> v4: - Drop the mistakengly-included and wrong A3xx-A5xx bindings changes - Improve bindings commit messages to better explain what GMU Wrapper is - Drop the A680 highest bank bit value adjustment patch - Sort UBWC config variables in a reverse-Christmass-tree fashion [4/14] - Don't alter any UBWC config values in [4/14] - Do so for a619_holi in [8/14] - Rebase on next-20230314 (shouldn't matter at all) v3: https://lore.kernel.org/r/20230223-topic-gmuwrapper-v3-0-5be55a336819@linaro.org v2 -> v3: New dependencies: - https://lore.kernel.org/linux-arm-msm/20230223-topic-opp-v3-0-5f22163cd1df@linaro.org/T/#t - https://lore.kernel.org/linux-arm-msm/20230120172233.1905761-1-konrad.dybcio@linaro.org/ Sidenote: A speedbin rework is in progress, the of_machine_is_compatible calls in A619_holi are ugly (but well, necessary..) but they'll be replaced with socid matching in this or the next kernel cycle. Due to the new way of identifying GMU wrapper GPUs, configuring 6350 to use wrapper would cause the wrong fuse values to be checked, but that will be solved by the conversion + the ultimate goal is to use the GMU whenever possible with the wrapper left for GMU-less Adrenos and early bringup debugging of GMU-equipped ones. - Ship dt-bindings in this series as we're referencing the compatible now - "De-staticize" -> "remove static keyword" [3/15] - Track down all the values in [4/15] - Add many comments and explanations in [4/15] - Fix possible return-before-mutex-unlock [5/15] - Explain the GMU wrapper a bit more in the commit msg [5/15] - Separate out pm_resume/suspend for GMU-wrapper GPUs to make things cleaner [5/15] - Don't check if `info` exists, it has to at this point [5/15] - Assign gpu->info early and clean up following if statements in a6xx_gpu_init [5/15] - Determine whether we use GMU wrapper based on the GMU compatible instead of a quirk [5/15] - Use a struct field to annotate whether we're using gmu wrapper so that it can be assigned at runtime (turns out a619 holi-ness cannot be determined by patchid + that will make it easier to test out GMU GPUs without actually turning on the GMU if anybody wants to do so) [5/15] - Unconditionally hook up gx to the gmu wrapper (otherwise our gpu will not get power) [5/15] - Don't check for gx domain presence in gmu_wrapper paths, it's guaranteed [5/15] - Use opp set rate in the gmuwrapper suspend path [5/15] - Call opp functions on the GPU device and not on the DRM device of mdp4/5/DPU1 half the time (WHOOOOPS!) [5/15] - Disable the memory clock in a6xx_pm_suspend instead of enabling it (moderate oops) [5/15] - Call the forgotten clk_bulk_disable_unprepare in a6xx_pm_suspend [5/15] - Set rate to FMIN (a6xx really doesn't like rate=0 + that's what msm-5.x does anyway) before disabling core clock [5/15] - pm_runtime_get_sync -> pm_runtime_resume_and_get [5/15] - Don't annotate no cached BO support with a quirk, as A619_holi is merged into the A619 entry in the big const struct - this means that all GPUs operating in gmu wrapper configuration will be implicitly treated as if they didn't have this feature [7/15] - Drop OPP rate & icc related patches, they're a part of a separate series now; rebase on it - Clean up extra parentheses [8/15] - Identify A619_holi by checking the compatible of its GMU instead of patchlevel [8/15] - Drop "Fix up A6XX protected registers" - unnecessary, Rob will add a comment explaining why - Fix existing UBWC values for A680, new patch [10/15] - Use adreno_is_aXYZ macros in speedbin matching [13/15] - new patch v2: https://lore.kernel.org/linux-arm-msm/20230214173145.2482651-1-konrad.dybcio@linaro.org/ v1 -> v2: - Fix A630 values in [2/14] - Fix [6/14] for GMU-equipped GPUs Link to v1: https://lore.kernel.org/linux-arm-msm/20230126151618.225127-1-konrad.dybcio@linaro.org/ This series concludes my couple-weeks-long suffering of figuring out the ins and outs of the "non-standard" A6xx GPUs which feature no GMU. The GMU functionality is essentially emulated by parting out a "GMU wrapper" region, which is essentially just a register space within the GPU. It's modeled to be as similar to the actual GMU as possible while staying as unnecessary as we can make it - there's no IRQs, communicating with a microcontroller, no RPMh communication etc. etc. I tried to reuse as much code as possible without making a mess where every even line is used for GMU and every odd line is used for GMU wrapper.. This series contains: - plumbing for non-GMU operation, if-ing out GMU calls based on GMU presence - GMU wrapper support - A610 support (w/ speedbin) - A619 support (w/ speedbin) - couple of minor fixes and improvements - VDDCX/VDDGX scaling fix for non-GMU GPUs (concerns more than just A6xx) - Enablement of opp interconnect properties A619_holi works perfectly fine using the already-present A619 support in mesa. A610 needs more work on that front, but can already replay command traces captures on downstream. NOTE: the "drm/msm/a6xx: Add support for A619_holi" patch contains two occurences of 0x18 used in place of a register #define, as it's supposed to be RBBM_GPR0_CNTL, but that will only be present after mesa-side changes are merged and headers are synced from there. Speedbin patches depend on: https://lore.kernel.org/linux-arm-msm/20230120172233.1905761-1-konrad.dybcio@linaro.org/ Signed-off-by: Konrad Dybcio --- Konrad Dybcio (15): drm/msm/adreno: adreno_gpu: Don't set OPP scaling clock w/ GMU dt-bindings: display/msm: gpu: Document GMU wrapper-equipped A6xx dt-bindings: display/msm/gmu: Add GMU wrapper drm/msm/a6xx: Remove static keyword from sptprac en/disable functions drm/msm/a6xx: Extend and explain UBWC config drm/msm/a6xx: Introduce GMU wrapper support drm/msm/a6xx: Remove both GBIF and RBBM GBIF halt on hw init drm/msm/adreno: Disable has_cached_coherent in GMU wrapper configurations drm/msm/a6xx: Add support for A619_holi drm/msm/a6xx: Add A610 support drm/msm/a6xx: Fix some A619 tunables drm/msm/a6xx: Use "else if" in GPU speedbin rev matching drm/msm/a6xx: Use adreno_is_aXYZ macros in speedbin matching drm/msm/a6xx: Add A619_holi speedbin support drm/msm/a6xx: Add A610 speedbin support .../devicetree/bindings/display/msm/gmu.yaml | 50 +- .../devicetree/bindings/display/msm/gpu.yaml | 61 ++- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 76 ++- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 2 + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 507 ++++++++++++++++++--- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 1 + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 14 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 17 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 28 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 33 +- 10 files changed, 687 insertions(+), 102 deletions(-) --- base-commit: fe7e6951d3a535867dbc65fbdfc48b9f5f6b66f9 change-id: 20230223-topic-gmuwrapper-b4fff5fd7789 Best regards,