From patchwork Tue Sep 26 18:24:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13399529 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 3DCC1E7E654 for ; Tue, 26 Sep 2023 18:24:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 206BE10E41C; Tue, 26 Sep 2023 18:24:49 +0000 (UTC) Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C27C10E418 for ; Tue, 26 Sep 2023 18:24:44 +0000 (UTC) Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-530fa34ab80so23255050a12.0 for ; Tue, 26 Sep 2023 11:24:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695752682; x=1696357482; 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=fImG1LGJjUdtZmi9fIr7EL8KTwVEILvKptZJzrzzi84=; b=wZmGeHb8+6o7rZrq4iVKv7hpmF8kxfT3i1EnE8kVvNylVHiCLwSK/4TSP3Y4DW+Vh1 GtW6YdXO5YiklfFpk9N4BgpxcQbtkskpM6eSDtnPtCBCDogD7E7diUfk+4W0pH+wgmkI DHAWHRJ8Fllc+0RlX/o7VyfFDk+bRl2f1upVnhnPDh0PT/93wnZ3P6sYyMl9CmbncncG bWGBS6j1ByCzdq3r/Pxde5FYNwjTIZOgi/SikofYf5wR35MNa0+CO2FsrJlTBiM7EF5x bWqRTBeCWKVwgEReMweqY4tZthrU8b0Q0bqAtJ957LAapoG3j+ABKLH9+vAusBxvTxHw NgFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695752682; x=1696357482; 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=fImG1LGJjUdtZmi9fIr7EL8KTwVEILvKptZJzrzzi84=; b=hvldbRSty2ilE+kDUrOYTjneOmyspSYJSqNMXJU0lOfatlYQuGyEgQdBnkjHqOBGVE cLBdjdxmt+UfTEFknRwOIh+NbcmTex+0Jfvyv5a3cBOMNSzSjnpLwYcHsV/uwC89LPZb 50okEtxcSjbjv+HUProBjqDf8HjI4M46IjZhvUKBQl+9itlQb4/wXe2cUEfx7vbq6HhJ WWMkenbnX320cLaY03A9XMZX1d+Q0C3b0K7YlS7ubhluN0Mn821mmKUCFP4zRfNPhZs4 EXg4DCNpgBzx34iDoKKwpyWmF9AzeiQ0cf81wXkWY6ylnhnQG40xUdQEUME57iJhA7q1 ipkQ== X-Gm-Message-State: AOJu0YyjvYORJlWzmZHVcbgHAkpNyl04kUcVyO3A2LRDc5PB7Jn4cNEE 04fu/qgAZ7PMIL4Z/l6D0g4hEg== X-Google-Smtp-Source: AGHT+IGyhzCX7pVh+DA0+lbZn90DwBp8MEe1mDcGOaXhO5brGM7FQnNVnsw4ZES8ExBZftUUH8qOhw== X-Received: by 2002:a05:6402:35d5:b0:51d:b184:efd with SMTP id z21-20020a05640235d500b0051db1840efdmr5471808edc.20.1695752682485; Tue, 26 Sep 2023 11:24:42 -0700 (PDT) Received: from [10.167.154.1] (178235177023.dynamic-4-waw-k-1-1-0.vectranet.pl. [178.235.177.23]) by smtp.gmail.com with ESMTPSA id f19-20020a056402151300b0053090e2afafsm7020643edw.22.2023.09.26.11.24.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 11:24:42 -0700 (PDT) From: Konrad Dybcio Date: Tue, 26 Sep 2023 20:24:36 +0200 Subject: [PATCH 1/7] drm/msm/a6xx: Fix unknown speedbin case MIME-Version: 1.0 Message-Id: <20230926-topic-a643-v1-1-7af6937ac0a3@linaro.org> References: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> In-Reply-To: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephen Boyd , Akhil P Oommen X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1695752677; l=1465; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=3B0yIPSygi0wMpl7xpS+ZhhsZWi7J9UA34HRlycQuyk=; b=Iu9f1ructFVGASge8ugqNeXgxQC0RA2BFUwle16+fVrgAArXS0bQ1QC4HXS8kP4G+m1Yn6duX ykCLE1FvC4ZB+qXAkv5ObgAqFPAY+KWSMuSl/qkqVw74fcluxKFF3Oe X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= 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: , Cc: Rob Clark , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Luca Weiss , Konrad Dybcio , Marijn Suijten , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" When opp-supported-hw is present under an OPP node, but no form of opp_set_supported_hw() has been called, that OPP is ignored by the API and marked as unsupported. Before Commit c928a05e4415 ("drm/msm/adreno: Move speedbin mapping to device table"), an unknown speedbin would result in marking all OPPs as available, but it's better to avoid potentially overclocking the silicon - the GMU will simply refuse to power up the chip. Currently, the Adreno speedbin code does just that (AND returns an invalid error, (int)UINT_MAX). Fix that by defaulting to speedbin 0 (which is conveniently always bound to fuseval == 0). Fixes: c928a05e4415 ("drm/msm/adreno: Move speedbin mapping to device table") Signed-off-by: Konrad Dybcio Reviewed-by: Akhil P Oommen --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index d4e85e24002f..522ca7fe6762 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -2237,7 +2237,7 @@ static int a6xx_set_supported_hw(struct device *dev, const struct adreno_info *i DRM_DEV_ERROR(dev, "missing support for speed-bin: %u. Some OPPs may not be supported by hardware\n", speedbin); - return UINT_MAX; + supp_hw = BIT(0); /* Default */ } ret = devm_pm_opp_set_supported_hw(dev, &supp_hw, 1); From patchwork Tue Sep 26 18:24:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13399528 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 C2687E7E657 for ; Tue, 26 Sep 2023 18:24:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E3F3610E41A; Tue, 26 Sep 2023 18:24:48 +0000 (UTC) Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by gabe.freedesktop.org (Postfix) with ESMTPS id B507610E419 for ; Tue, 26 Sep 2023 18:24:45 +0000 (UTC) Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-533df112914so6689190a12.0 for ; Tue, 26 Sep 2023 11:24:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695752684; x=1696357484; 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=rdOeaLeHcwftMyYfA8G29tOCdXwXQaoJFb0mcu8r5zw=; b=jf24Le9qR5cS+fhhexHcYAINNK7zNzXE4VwoFnNF123msoHWaoztIej/tM2jnSO3qM jNqS384/kwJHwloNaKeBD5XUSMC1jJURROIOBSwa6tRfLNF6lcKMTkfhHhbIgnW9ZrQc jRiNyzvDtoQ+Nrz7FosjWcoD1tfdjXO7e0HJIBzJ0BDO7ALkBZI6J75Xan44X8ENlEtd L2YbGuF9rqd02P3Lizyxg6zUhGrKfP3bI79L707ikmGCCV4aG0lNoHKo3vz3dj94Ha2P 9Z3WWJD8aNEsMLnU6I/s/IgfU2OGiwbkQ487vf3yAkRD05K0TR1L8ptFbh4OKihRPrF1 dhnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695752684; x=1696357484; 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=rdOeaLeHcwftMyYfA8G29tOCdXwXQaoJFb0mcu8r5zw=; b=M59184Ib9DmVuQVs24guONqeNCkPIxO2hgdX7O38Q47imu81Mb2f6GRDPmGSau7SdN AwJc8LtmF1O0yRwbO8MRFCJEThRmrGegz/0gjDsY/Kj6IcmwUEJz35Qp0TxPxWCqSPuf 55iDm9HvpkWT2sbGUZu9iBG1Q0w1VEyQBl0tY0M9oBCV7AkgCnRN5VcP9Ti+uS7cZwKz 4hQEGudo/SBiJNm6joEklDPcTfpac/0FC0X/iavuvgcBzR2fOrK50flC7hpl9HvaqE3h cB9XhPmbkVwnraxjGEUHzTAunUMHgo2+fuv8vcV3IVnC+BA1QH/RLM6BinJqRjijTMGf +xBg== X-Gm-Message-State: AOJu0YyWdZXEA2yhGMkeMwGKr6VfPW684ayA8+evN+vZ/Ddlnohxg2ma WLYAa3ALkYf3x6IMAa6364WBTw== X-Google-Smtp-Source: AGHT+IFNPKWtqP96Z/0gyVWxTahuOivQkjQlQvuDt3caSQC/FoLkRgSGW7croA7ASQ1ChCEC2PL20g== X-Received: by 2002:aa7:d0c2:0:b0:51d:f5bd:5a88 with SMTP id u2-20020aa7d0c2000000b0051df5bd5a88mr10428662edo.38.1695752684159; Tue, 26 Sep 2023 11:24:44 -0700 (PDT) Received: from [10.167.154.1] (178235177023.dynamic-4-waw-k-1-1-0.vectranet.pl. [178.235.177.23]) by smtp.gmail.com with ESMTPSA id f19-20020a056402151300b0053090e2afafsm7020643edw.22.2023.09.26.11.24.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 11:24:43 -0700 (PDT) From: Konrad Dybcio Date: Tue, 26 Sep 2023 20:24:37 +0200 Subject: [PATCH 2/7] drm/msm/adreno: Add ZAP firmware name to A635 MIME-Version: 1.0 Message-Id: <20230926-topic-a643-v1-2-7af6937ac0a3@linaro.org> References: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> In-Reply-To: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephen Boyd , Akhil P Oommen X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1695752677; l=810; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=j4J3bf93En8hfomc6iMl3gRDui2N6DxaHKguZItPSOc=; b=Z/8uVHWeeJiYMBhmKxURKKCY6E5ujoQW1IdowESmbyutCxeRpM55YuxSzaiPf3F/h1M6I0ebF Yo50w8YlEoVB1iHo9jiNgpsMDNM+4THYBPUM/ETvorOic57gT4f4kk5 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= 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: , Cc: Rob Clark , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Luca Weiss , Konrad Dybcio , Marijn Suijten , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Some (many?) devices with A635 expect a ZAP shader to be loaded. Set the file name to allow for that. Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/adreno/adreno_device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index fa527935ffd4..16527fe8584d 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -454,6 +454,7 @@ static const struct adreno_info gpulist[] = { .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT | ADRENO_QUIRK_HAS_HW_APRIV, .init = a6xx_gpu_init, + .zapfw = "a660_zap.mbn", .hwcg = a660_hwcg, .address_space_size = SZ_16G, .speedbins = ADRENO_SPEEDBINS( From patchwork Tue Sep 26 18:24:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13399531 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 A749FE7E654 for ; Tue, 26 Sep 2023 18:25:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C883D10E418; Tue, 26 Sep 2023 18:24:58 +0000 (UTC) Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by gabe.freedesktop.org (Postfix) with ESMTPS id E66CA10E41A for ; Tue, 26 Sep 2023 18:24:47 +0000 (UTC) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-533d6a8d6b6so7580038a12.2 for ; Tue, 26 Sep 2023 11:24:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695752686; x=1696357486; 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=1mXLi+0rIXccn25x+LJrv2RkBxKqdDr4aU+Gv5GVsoM=; b=RkMNM4czImzXYEl0CI7RrO5+lPBGct6e5SDay8Ug5NxtO/YvXSJtsOw1+06sJqUsiF 6vyq20krboP6g9iruNjvo41wgElxKwp5xgQ90yUw7aFfc0XGLTz5WTseora9UFFghHFv og7ktRQ2DSNi0LsMv3Ru8+hX62racKX0SlwWn6QFjbmvLjuJJc+4laditouhq9Ekc/T2 0SQEh1YMj6VHlcsFiEdhwZckCiQVNCMnvLeZxvsz8oS/6Bzhf/wt8cB5FH56XMAZ7qOB t6+WxoUMdQmdNeaw5Co6LAGBqlvKLtgaG5o7wpGbzTxYH2IQumGGB5gcQRJHu/Goo7wF dB/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695752686; x=1696357486; 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=1mXLi+0rIXccn25x+LJrv2RkBxKqdDr4aU+Gv5GVsoM=; b=eK0R9ahpqQbUIPFdHIt5x7G64f12xG3bKSXiPDs5AoDJscts7yYzHBMUUDOGMp3t7s 256ooCiFYdI9uXSS/AFzDifAcWsuyFgOB8stWHFvGPtL9UZTGTdpYdJvLLIua/e7CuOZ /quuY1nTz6TJiAZzaFqDb4qc/JeRUzmtBj6g2PFgueesztfTovMM9vyzzeLPVAwaVvMV YAageBpWTWathkVxr9FL5DFlXDpOZ4gdHD7B3VDyn0H4TcDXyz4J97JnJItgXPfaOt4i FeiiEOTGxV0iKeqJixjxEvHKLWCAnnvAw6tAVvQdMKqSf+FB2uJ4XevS1JSjtm69J5vc wpMw== X-Gm-Message-State: AOJu0YxEoonnCxFQT1FWM8W5HZ+YvZ3GwZPxOOMLS1Wn9fcZEKH92ioy DWhU2b+6HGjt/5GVaW1qtngVVg== X-Google-Smtp-Source: AGHT+IGh0ktD94Pk4wwsYiXRvrPoEyd0YO/XrDphwvk3G5mbEos4//shaUTYKbj122Zo01fAUAE68Q== X-Received: by 2002:aa7:d7c7:0:b0:51e:53eb:88a3 with SMTP id e7-20020aa7d7c7000000b0051e53eb88a3mr8851616eds.25.1695752686393; Tue, 26 Sep 2023 11:24:46 -0700 (PDT) Received: from [10.167.154.1] (178235177023.dynamic-4-waw-k-1-1-0.vectranet.pl. [178.235.177.23]) by smtp.gmail.com with ESMTPSA id f19-20020a056402151300b0053090e2afafsm7020643edw.22.2023.09.26.11.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 11:24:46 -0700 (PDT) From: Konrad Dybcio Date: Tue, 26 Sep 2023 20:24:38 +0200 Subject: [PATCH 3/7] drm/msm/adreno: Add A635 speedbin 0xac (A643) MIME-Version: 1.0 Message-Id: <20230926-topic-a643-v1-3-7af6937ac0a3@linaro.org> References: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> In-Reply-To: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephen Boyd , Akhil P Oommen X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1695752677; l=751; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=4Rw51EV+m1pbTmR00ftxlMR26PkphHnsyFSR2kZ1LeI=; b=SXUVrGfcSRMs/58bky5kYAUilsScEIoXeRRt6NDpibqMT9twn8G3KlhPx8o0SOlAHp7e6EZAZ ljAxQUAiqQsAsx7kSjWbCIUQoLnRFJOt84DDBQzWxWuw9V//8Y+N+Ur X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= 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: , Cc: Rob Clark , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Luca Weiss , Konrad Dybcio , Marijn Suijten , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Downstream calls this the "speedbin 1", but that number is already occupied. Use index two. Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/adreno/adreno_device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 16527fe8584d..4977fd759b5b 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -460,6 +460,7 @@ static const struct adreno_info gpulist[] = { .speedbins = ADRENO_SPEEDBINS( { 0, 0 }, { 117, 0 }, + { 172, 2 }, /* Called speedbin 1 downstream, but let's not break things! */ { 190, 1 }, ), }, { From patchwork Tue Sep 26 18:24:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13399530 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 7A550E7D0C4 for ; Tue, 26 Sep 2023 18:24:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 96B7410E41E; Tue, 26 Sep 2023 18:24:57 +0000 (UTC) Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 55B5410E41D for ; Tue, 26 Sep 2023 18:24:50 +0000 (UTC) Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-5031ccf004cso15341940e87.2 for ; Tue, 26 Sep 2023 11:24:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695752688; x=1696357488; 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=Hv259dlxpBQTllwsNOUgVjMH2doZt+8ko67T2DfMJJY=; b=Un/IR7gR7QUM5/uxdNENhXJZwI6UWqiWohue2+F13MQIN95hDuXc2ndQz2vA8SYJlW NFTRIdvn0iPrRYHiocWkkZgADIGqNC+VACzcqufyfpmJrdnDOCDozrinNiENywVeZ5P1 PLfjIPhybBuM4yA5PAoBIdBidqkqLEu/Gm+DTqrvkiFHzZyPik8VPUgBZkqCDk5zIcyA IYE7Q8kYT8L8HnwvZwSiEnUt49p30RWs8R/SqgFbLOIsf2AzAVa4u8UdXEDnl9oQA+1K Ijp9NbS0mN6xTl3iaAfxER+wZwGPwVjZrXOFTdh6tft4V5uX/f8RZ66Xf2WuwGdICe6D FxLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695752688; x=1696357488; 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=Hv259dlxpBQTllwsNOUgVjMH2doZt+8ko67T2DfMJJY=; b=CnoS49eeuZlq2yJrjdH5HmbjpKFgASEoKbmHsxT2FAi18FXO8RVYHqj1q9Wv4g0BKx 3NzxvfVg3XPL2uG/7nCNGX5syhog56kX1XHW7SIp3/P+TVIkomk+6PGhXXeim4hYm4tX zkXETFzmj37zDoMBoIkAgcSflUJuL7P57QLXhqWvI1no8d8/YcQmggKJMfbNIKvHjt09 z54KoOJK0KTORUiie+ILj/rEogy3WC651L9LVE9Dp2VCZ3bV7HEvJeh23SNky2oboAlE pw2JQSaVCgUTT4SgnTRBgj/XlSYSX6eARSXOiHslOdA/EuM+1jl/qmNZ93flg97McwdI iULg== X-Gm-Message-State: AOJu0YyU4vHjBv9bMvYXLecqq85FWf35AGDUjfOPeTMdLWEurz/3tPDf uE8IN1UKBtiesi4CaQrHNe+F/w== X-Google-Smtp-Source: AGHT+IE9ZA2Nur1n92NY0RcBoLiL+/hKUSUFtLkVB3x4JPU/I5ukFpS3TU2XD2rmTj/1KM/Es0EFmw== X-Received: by 2002:ac2:5990:0:b0:4fe:7e7f:1328 with SMTP id w16-20020ac25990000000b004fe7e7f1328mr8327434lfn.16.1695752688279; Tue, 26 Sep 2023 11:24:48 -0700 (PDT) Received: from [10.167.154.1] (178235177023.dynamic-4-waw-k-1-1-0.vectranet.pl. [178.235.177.23]) by smtp.gmail.com with ESMTPSA id f19-20020a056402151300b0053090e2afafsm7020643edw.22.2023.09.26.11.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 11:24:48 -0700 (PDT) From: Konrad Dybcio Date: Tue, 26 Sep 2023 20:24:39 +0200 Subject: [PATCH 4/7] arm64: dts: qcom: sc7280: Add ZAP shader support MIME-Version: 1.0 Message-Id: <20230926-topic-a643-v1-4-7af6937ac0a3@linaro.org> References: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> In-Reply-To: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephen Boyd , Akhil P Oommen X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1695752677; l=1716; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=KPLzI8JFAgOM8lipaf6IRavq4f0Qs8pGOQ9Xz036QH0=; b=PDlPugMO+iF59ClerI17jCYJbl64YHQKAQ2PSltxjIudAdlihLWSc6nsLkhRsORmNGP+5xoQK f6Hn3X2fOEGDA22Z+Akv8Movy+kal6fJjl/lAjkYrwFQELNg6ZJ4gyA X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= 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: , Cc: Rob Clark , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Luca Weiss , Konrad Dybcio , Marijn Suijten , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Non-Chrome SC7280-family platforms ship a ZAP shader with the Adreno GPU. Describe that and make sure it doesn't interfere with Chrome devices. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 2 ++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi index 5d462ae14ba1..88fc67c3646e 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -17,6 +17,8 @@ * required by the setup for Chrome boards. */ +/delete-node/ &gpu_zap_mem; +/delete-node/ &gpu_zap_shader; /delete-node/ &hyp_mem; /delete-node/ &xbl_mem; /delete-node/ &reserved_xbl_uefi_log; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 66f1eb83cca7..c38ddf267ef5 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -152,6 +152,11 @@ ipa_fw_mem: memory@8b700000 { no-map; }; + gpu_zap_mem: zap@8b71a000 { + reg = <0 0x8b71a000 0 0x2000>; + no-map; + }; + rmtfs_mem: memory@9c900000 { compatible = "qcom,rmtfs-mem"; reg = <0x0 0x9c900000 0x0 0x280000>; @@ -2608,6 +2613,11 @@ gpu: gpu@3d00000 { nvmem-cells = <&gpu_speed_bin>; nvmem-cell-names = "speed_bin"; + gpu_zap_shader: zap-shader { + memory-region = <&gpu_zap_mem>; + firmware-name = "qcom/a660_zap.mdt"; + }; + gpu_opp_table: opp-table { compatible = "operating-points-v2"; From patchwork Tue Sep 26 18:24:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13399532 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 A59FEE7E65E for ; Tue, 26 Sep 2023 18:25:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4217C10E424; Tue, 26 Sep 2023 18:24:59 +0000 (UTC) Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by gabe.freedesktop.org (Postfix) with ESMTPS id A024D10E41F for ; Tue, 26 Sep 2023 18:24:52 +0000 (UTC) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-503397ee920so15047876e87.1 for ; Tue, 26 Sep 2023 11:24:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695752691; x=1696357491; 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=JSsmJJyHe36J6r6QQN8EBPervMH/lsHyGZmLHEQGT3w=; b=pEyzPCvRAPqliQtW6Ad3uTVqRSK9xNDSECAqhfqN4NMOlXSN9qLLBML/x8YC4MH9uB bUMHF+EoLKP4MKiTqAu+lNU623VeBYKN4OtU6vfIAHYcTevZganB0W8T0tCUFmPb5r98 NwcUlkt94HQziRIjCjcR2ALIX9StgXDN3o/W8l4iCsnKXOh1lkgGE0Q1VA5IQXCTvE05 5VA6Uupolseda5LCXU0o1pQ/6o41KvOBzgdn00Wcf8MTkNq3i8mywSw0qzGVkvfgXpNc uX8bW4Nn3+OGW3AFk6nee1n1vIwGotSd/q3IsoQvx0XhrF19Zdi7YBTJKf06HTd/z1oi X7+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695752691; x=1696357491; 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=JSsmJJyHe36J6r6QQN8EBPervMH/lsHyGZmLHEQGT3w=; b=luzrv7VqQUh867vP/aMqYCq0ozBPduQbB0qNb8VgV5s4u9PT2Ej0qQ81Yc6A/fTAR4 l6/g4HjyUiI1+5NpkoBgREvvBrtdNjm49HqhnM72zrGxyXzlQOAuJJE+4m1e7vXc43cK 89ZuyTrhn2myQuEyzhQDBwrEXGL/4SpAPa9U+FQk4JrYPbdN1H6Cv5C+rOWkoPzc7NiE IW7ru39eomCiWDsdkAJHfttsjgFcrHzHbGkGOyj7iVb7uq57jluF6w+taZjF5IVwBm58 bhorBDgIjogCjUUTgfw7t5RBFYztmXCATWlLMPOVNI5sGkri2sjdTkKSrhQe4QkgM8kf VMHA== X-Gm-Message-State: AOJu0YzTK64eA/pYNNWewMnQN5agShJ40mQLntsAFQurPW2v3GYp9t9n jDMdqKJBlBjXI4cg4tJa5S7pew== X-Google-Smtp-Source: AGHT+IFxdFFgpcBTFxSLcZfqdtgfPTF/TNGZldeq7ysgqWnx8RGOLQ5gHMDX+UzFDSjdg3j002TJ9A== X-Received: by 2002:ac2:53ac:0:b0:503:2877:67e3 with SMTP id j12-20020ac253ac000000b00503287767e3mr8396426lfh.6.1695752690659; Tue, 26 Sep 2023 11:24:50 -0700 (PDT) Received: from [10.167.154.1] (178235177023.dynamic-4-waw-k-1-1-0.vectranet.pl. [178.235.177.23]) by smtp.gmail.com with ESMTPSA id f19-20020a056402151300b0053090e2afafsm7020643edw.22.2023.09.26.11.24.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 11:24:50 -0700 (PDT) From: Konrad Dybcio Date: Tue, 26 Sep 2023 20:24:40 +0200 Subject: [PATCH 5/7] arm64: dts: qcom: sc7280: Fix up GPU SIDs MIME-Version: 1.0 Message-Id: <20230926-topic-a643-v1-5-7af6937ac0a3@linaro.org> References: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> In-Reply-To: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephen Boyd , Akhil P Oommen X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1695752677; l=1149; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=OKCYVjhQ/19k9GeBxxh+l0sjJaWU5GkjdhxKB9u2/vs=; b=9SVEap5bj9/9iIFUrp99rqRpCkF1yJSJnavWYyJzILyjurm26Pij46Bw+/KnOwd6frqVCvagj hxwquK7i3gkByj7w1dl5dnEr24gj8ym5NJr5mweF32LNem2LLWjiRad X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= 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: , Cc: Rob Clark , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Luca Weiss , Konrad Dybcio , Marijn Suijten , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" GPU_SMMU SID 1 is meant for Adreno LPAC (Low Priority Async Compute). On platforms that support it (in firmware), it is necessary to describe that link, or Adreno register access will hang the board. Add that and fix up the SMR mask of SID 0, which seems to have been copypasted from another SoC. Fixes: 96c471970b7b ("arm64: dts: qcom: sc7280: Add gpu support") Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7280.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index c38ddf267ef5..0d96d1454c49 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2603,7 +2603,8 @@ gpu: gpu@3d00000 { "cx_mem", "cx_dbgc"; interrupts = ; - iommus = <&adreno_smmu 0 0x401>; + iommus = <&adreno_smmu 0 0x400>, + <&adreno_smmu 1 0x400>; operating-points-v2 = <&gpu_opp_table>; qcom,gmu = <&gmu>; interconnects = <&gem_noc MASTER_GFX3D 0 &mc_virt SLAVE_EBI1 0>; From patchwork Tue Sep 26 18:24:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13399534 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 D9DC5E7E65D for ; Tue, 26 Sep 2023 18:25:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0585910E41F; Tue, 26 Sep 2023 18:25:07 +0000 (UTC) Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4157910E420 for ; Tue, 26 Sep 2023 18:24:54 +0000 (UTC) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2bff776fe0bso157829461fa.0 for ; Tue, 26 Sep 2023 11:24:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695752692; x=1696357492; 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=zKAfj40wX2rYb9qZjVM1hdFI0nJkjq0ie36nV/sob5U=; b=hT2ZBTOUukqDUQwprg3h4mfI9Z2psY3WmdV9Tlx+0h++8ItZHfI64gQysFW3vaiZR8 tuQ+pavxEUrS+EjOCsSqXYjzFkoF8HP3ymSmvHviTtWEBdfSB5T7IvJ8wDKhz4nVz+8K K/zAzEeRojS+koMOBphhn9z8cybLAUb6PB6rKVGzRTfzqvzDgW1B1Cz6HiUGBblm30mD V97lBOB9P7sJ0WVN3chqlGbe3VhZl7o5+qxxKoiLFBCIjECwJdhf1PnOIFfsqhyUt+7n PvcCJfLUif8q3rPKWziykrwIP3hS+heKay4nwnr9P/mwl+WS8fQ9I6KkBTq+K0TAB+7g pQUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695752692; x=1696357492; 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=zKAfj40wX2rYb9qZjVM1hdFI0nJkjq0ie36nV/sob5U=; b=EpE3yqdgrRHhfiQS56XXODehafG5H9BN9m6fOvAj2g3Ga7nDDrz0DdpJ512wDAtMHf VzTe73qHVQIKsRD/0c0FWAlAgoGb5e2ZNmF6Xs0Fsc+Rpy9WoDdkeDiRt+PYiph5JpC8 cb1maQORhdsnSBydtLhvj+nkTq8RPkjrZ0ToKEnRGC4cQtnA1UzgV+jtrL9/dTN5UDzt wZWobbZaKHDrwqZ3FeCq72buf8Z1Xbq2enHYzde2sPRhUhdL3kn6hhvZmaumqAFFETZ4 +T2PIr9iytVmudrTkc6xQknK8PfmdaFrBmoJXnPRg6pSzdJeG83B+K+i06rydNG6+6+V IzHw== X-Gm-Message-State: AOJu0YwWhF0TFgSah4Z4LkUCHtA+seqe0OO3VW5IiSV5wc5YWwLSvZlQ CY1n3JcUp44rOJlm01ZsPt3XaA== X-Google-Smtp-Source: AGHT+IFEOjsJYPfc1unWH5iDo2ktLsd6gTLh2AKJS4VABLvGaC7NWjan6T+Fe2gwP9NdJvAjyY+giw== X-Received: by 2002:a05:6512:318d:b0:4fd:f84f:83c1 with SMTP id i13-20020a056512318d00b004fdf84f83c1mr10394815lfe.64.1695752692402; Tue, 26 Sep 2023 11:24:52 -0700 (PDT) Received: from [10.167.154.1] (178235177023.dynamic-4-waw-k-1-1-0.vectranet.pl. [178.235.177.23]) by smtp.gmail.com with ESMTPSA id f19-20020a056402151300b0053090e2afafsm7020643edw.22.2023.09.26.11.24.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 11:24:52 -0700 (PDT) From: Konrad Dybcio Date: Tue, 26 Sep 2023 20:24:41 +0200 Subject: [PATCH 6/7] arm64: dts: qcom: sc7280: Mark Adreno SMMU as DMA coherent MIME-Version: 1.0 Message-Id: <20230926-topic-a643-v1-6-7af6937ac0a3@linaro.org> References: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> In-Reply-To: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephen Boyd , Akhil P Oommen X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1695752677; l=676; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=Hpz3dGOzkgvsLU7CVLEOv6AKepEoumYODOZQCFrh/Q4=; b=j5r+TqjW4AL2kSlLuLWqK7jEIUZkSCZmLEB7jrljedUKqzufTLJ82XEyKjXd1g+Xdn85ktzDP aNUnRkQeTI7Aooar0OseWXWM8mz1d5aWQL5knIH/Qmhu93CpmvmbPvp X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= 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: , Cc: Rob Clark , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Luca Weiss , Konrad Dybcio , Marijn Suijten , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The SMMUs on sc7280 are cache-coherent. APPS_SMMU is marked as such, mark the GPU one as well. Signed-off-by: Konrad Dybcio Reviewed-by: Akhil P Oommen --- arch/arm64/boot/dts/qcom/sc7280.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 0d96d1454c49..edaca6c2cf8c 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2783,6 +2783,7 @@ adreno_smmu: iommu@3da0000 { "gpu_cc_hub_aon_clk"; power-domains = <&gpucc GPU_CC_CX_GDSC>; + dma-coherent; }; remoteproc_mpss: remoteproc@4080000 { From patchwork Tue Sep 26 18:24:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13399533 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 DBBFCE7E657 for ; Tue, 26 Sep 2023 18:25:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C577910E048; Tue, 26 Sep 2023 18:25:06 +0000 (UTC) Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA62410E41E for ; Tue, 26 Sep 2023 18:24:55 +0000 (UTC) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-52fe27898e9so11363870a12.0 for ; Tue, 26 Sep 2023 11:24:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695752694; x=1696357494; 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=gcsTNpsjbN2SKqWT86OIi6rzpyQaQonBZGDEar8VbjY=; b=cz9tx9i+2pWWUfcvKbiVzglo5IAxUXaK1SSTSlxMFb41/75iqRvKrQhowL4h1JWRCx NYFjiYh0gbq8iuwrICGWiffNa9KaUh5R/KdtdpOz0p+DaGg9citjY7Jn2/SGzolzlsPV WtjkVgsqKXCzUnjOzdTO5kJeJtqnLOFDatEEf6xnQV3AmwQIXv3auoCkcQ+S0H7fixdK w1Ea0OSs/niS2xS3eaElmaGavYvVd2p3V3iRcd7t3kUGeEHqS55WqVd/cO2tEKgkHSh/ ZLy68ujXbYXFO7GHfyxH9Xkn1oC6GQlKsWMFn5brGQiJgeE1sQQjiMUMX8Jh8zRY473Z TWqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695752694; x=1696357494; 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=gcsTNpsjbN2SKqWT86OIi6rzpyQaQonBZGDEar8VbjY=; b=MOcI3v+8JCOVuEhSNuxr8dDVeKXXflA5mjDtV/kbo2KTMGtoTVP40jD88nYe9Z/5ZV xH7olyMNgRBVdoSP6Up8bZF2eZRhAwhK8kilxAQ4psc4yIYivv1x90chPVQbHo6QLwu7 NU/2Psp1IPO9RcXhj93kri68z3upexoLk+dbV/yz+W8C7Dwj4tXEMOYIffkHENlMjgAm 8wMniBFP3gcrdQFYXyVqbu/PH+SJdMcqMX+dXtz8u5PCzEsV0VVs6CoKXDp1B3NaMQV/ 94u4v88vcgjiOaMjwRC1Lg4HOXcLlPNsC2JdEs9yw2M5ox8kbDena62m+ym9KxqURaAa Gjug== X-Gm-Message-State: AOJu0YydS/9k40efjOqondRI64jFOR8sPJx8c9NtVjNXXW4eluTPkJ6E YX6d+w3jf94KPS0KiOt/rRcmfw== X-Google-Smtp-Source: AGHT+IHSDS5XqFLTJ3Fj4mnDdxfJXQcOrG9mYsIt1RG52uxZWsc1JdF5u15aBVAjCYJy3NW7NDbP+g== X-Received: by 2002:aa7:da8b:0:b0:52a:66c0:1e9b with SMTP id q11-20020aa7da8b000000b0052a66c01e9bmr8454988eds.30.1695752694412; Tue, 26 Sep 2023 11:24:54 -0700 (PDT) Received: from [10.167.154.1] (178235177023.dynamic-4-waw-k-1-1-0.vectranet.pl. [178.235.177.23]) by smtp.gmail.com with ESMTPSA id f19-20020a056402151300b0053090e2afafsm7020643edw.22.2023.09.26.11.24.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 11:24:54 -0700 (PDT) From: Konrad Dybcio Date: Tue, 26 Sep 2023 20:24:42 +0200 Subject: [PATCH 7/7] arm64: dts: qcom: sc7280: Add 0xac Adreno speed bin MIME-Version: 1.0 Message-Id: <20230926-topic-a643-v1-7-7af6937ac0a3@linaro.org> References: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> In-Reply-To: <20230926-topic-a643-v1-0-7af6937ac0a3@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephen Boyd , Akhil P Oommen X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1695752677; l=2100; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=9BePAqziunVu9kZivYgvv/caBkDoTl2qS9g1hj02Wgg=; b=DftHVsKPD4gXQnOXwv6J08JDe4kPe9q61Uq+Yk6OGVwbAalLbxGFp7JSs/NLklUN8hzuG4ORl P20Q6ZH69KsAaETW8eBjDpCidhznk2dyYWm7+g8ddSZevjirhjhF8yS X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= 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: , Cc: Rob Clark , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Luca Weiss , Konrad Dybcio , Marijn Suijten , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" A643 (A635 speedbin 0xac) tops out at 812 MHz. Fill in the opp-supported-hw appropriately. Note that fuseval 0xac is referred to as speedbin 1 downstream, but that was already in use upstream, so 2 was chosen instead. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7280.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index edaca6c2cf8c..ccc2dd6c45de 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2626,14 +2626,14 @@ opp-315000000 { opp-hz = /bits/ 64 <315000000>; opp-level = ; opp-peak-kBps = <1804000>; - opp-supported-hw = <0x03>; + opp-supported-hw = <0x07>; }; opp-450000000 { opp-hz = /bits/ 64 <450000000>; opp-level = ; opp-peak-kBps = <4068000>; - opp-supported-hw = <0x03>; + opp-supported-hw = <0x07>; }; /* Only applicable for SKUs which has 550Mhz as Fmax */ @@ -2648,28 +2648,28 @@ opp-550000000-1 { opp-hz = /bits/ 64 <550000000>; opp-level = ; opp-peak-kBps = <6832000>; - opp-supported-hw = <0x02>; + opp-supported-hw = <0x06>; }; opp-608000000 { opp-hz = /bits/ 64 <608000000>; opp-level = ; opp-peak-kBps = <8368000>; - opp-supported-hw = <0x02>; + opp-supported-hw = <0x06>; }; opp-700000000 { opp-hz = /bits/ 64 <700000000>; opp-level = ; opp-peak-kBps = <8532000>; - opp-supported-hw = <0x02>; + opp-supported-hw = <0x06>; }; opp-812000000 { opp-hz = /bits/ 64 <812000000>; opp-level = ; opp-peak-kBps = <8532000>; - opp-supported-hw = <0x02>; + opp-supported-hw = <0x06>; }; opp-840000000 {