From patchwork Fri May 19 13:29:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 96427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1241672vqo; Fri, 19 May 2023 06:37:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7YcGrIUaDt5AyJ7U+kQX/ctjjdIoLvCDGmroLjRnzwVKjAgDlg9WaNqZ4HLbD53h/QFsbp X-Received: by 2002:a17:902:c14a:b0:1ad:d1ab:9cc9 with SMTP id 10-20020a170902c14a00b001add1ab9cc9mr2911736plj.12.1684503420397; Fri, 19 May 2023 06:37:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684503420; cv=none; d=google.com; s=arc-20160816; b=swodH1PfsfYGrVeYbPdIWCpNiAYj2t6exup8qbdNnuXDPIiQ8/EMJ5MU+naSutXv3Z hWArrlpAYDzNXuQv8F1N6nmTBsCn76BYDoNXxVo/pmPdMLh8GVHa5dwTZtP0orwU1mqY OFC7W2r55Q7NDPqzg7dhiNh6b0WGhrdjwRsiWbq5V3rr9bTlgkrqdnXsQ9iEhJ+fmcjx Wo3Q/4pHA0OC8u0Xgsx+jPsiqyd95O35L8PRQZUD8SQiY6exE8gV0KDAosCpLScWGxcd hoASb02gPOggEg7DtSkVyjL5km2lkSW/8RwcA06t4G/Q93HriXnaxmd5uGkqiO2ygl2x MFZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=CoLKDA4nls3CGbrXvxh61SjvP4v8d9SGkB682PI8Y9w=; b=A4I9gndHFuAc/lXo8Brvp2Bt/y/3rEoaGEsvGl0wn/TJjhbDkDqUAsXjjQNfuhcuX7 dypeHnepSIJf1HMPoywvgUuuvqC3KhQSNO0b5BPSq7X5C2DIAMqxNgvtZNpoSjcD2WdW f+sGai/gxg9krkDOTLDcRnAiEMma/xlVdOfi2c6NOVQbJ1wADEbXGTymvvQ0hwTUCbRF SpCuWfJFQHyOL4a2QBoZeB6WGQiUBoG+e0ebmRbaOkiUdRe76UMp5xDEynsjqUQb+IfD CF1tJxceq8VnftN0TJkMVe0tI/WwrYGtWaYed+vj+3Fegi0JxyxLUxTZawNKcJo7sYWQ IFpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z2m27kLS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l12-20020a170902d34c00b001adc73620a0si3548273plk.410.2023.05.19.06.36.47; Fri, 19 May 2023 06:37:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z2m27kLS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231947AbjESN3m (ORCPT + 99 others); Fri, 19 May 2023 09:29:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231803AbjESN31 (ORCPT ); Fri, 19 May 2023 09:29:27 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D6A312C for ; Fri, 19 May 2023 06:29:26 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2ac836f4447so35929881fa.2 for ; Fri, 19 May 2023 06:29:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684502964; x=1687094964; 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=CoLKDA4nls3CGbrXvxh61SjvP4v8d9SGkB682PI8Y9w=; b=Z2m27kLSE1/hw4iXIE43fi41wpKcFGxK0Xnz1w3T0lvfvcVk7Le/dEr+zi+NGu1tJf /OKfe10DfnNwtrOoIjkKfQVAUfzj1PZRmT8MEw6tANJx9t9XoxSvsB/Go/dOwGpkfSvi Lb0vcRU1NXSqRbpzFuwYtJQ0M5MkGiPzGD+GpyLJGC+1otOlmpnKQzFzuijUnp610wRL f93k4HuHiZM1WfeSuOYffIrpdKQ6KwV4WkxxgEcPK/WPFMC9Qm6xJp2wwXU0SCVvOeZv yfA8zWafiXtaFx0IQYXhtZPOS1COVU+JOV6hYDyHf6fqP6pkl/A7YrypOO69nsxDmsXw PWbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684502964; x=1687094964; 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=CoLKDA4nls3CGbrXvxh61SjvP4v8d9SGkB682PI8Y9w=; b=CBQm3ek6NAamYpMxrSYJMp3Ewj463w/WVsZXPFiJ0TjxxXYuzLfutZNnIKycoeX4O9 c/rqryhkkmHgrbmtIpCRTaH5G9wo/NouHAifo+hr8pgABsr9yFuJu39kiJiGw0l/dE4z Ex81EaeZIEC6u1Vl++GTaA3Au8rB7LymMvizOhw5cyVUQG7ar4Bkphb7pAf7n3rEo9eC z0Cw3t0qslOdb62o0BgHPwfHvdIi3MBweUTIkfUEV0nFYisseEDYawZFEzmyCt62ezs1 wh6xdUNX0LAYUtepOzP0kj1rlOKJ7JjzjMYmGCtazp63W8yrUj/wtXCaxlwHM5RAsiID nqDQ== X-Gm-Message-State: AC+VfDwzti8HrxISLlq1xZprpq/KAElJ8LtglH/H8VjTaP2eSCkHdNMm NILcpOjzcbnqH9uOPqvgktwnAXUy/qZuJhLwzQA= X-Received: by 2002:a2e:8091:0:b0:2ad:fef4:94f8 with SMTP id i17-20020a2e8091000000b002adfef494f8mr797526ljg.6.1684502964590; Fri, 19 May 2023 06:29:24 -0700 (PDT) Received: from [192.168.1.101] (abxi58.neoplus.adsl.tpnet.pl. [83.9.2.58]) by smtp.gmail.com with ESMTPSA id q24-20020a2e9698000000b002ad92dff470sm821384lji.134.2023.05.19.06.29.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 06:29:24 -0700 (PDT) From: Konrad Dybcio Date: Fri, 19 May 2023 15:29:11 +0200 Subject: [PATCH v2 6/6] drm/msm/a6xx: Fix up GMU region reservations MIME-Version: 1.0 Message-Id: <20230517-topic-a7xx_prep-v2-6-5b9daa2b2cf0@linaro.org> References: <20230517-topic-a7xx_prep-v2-0-5b9daa2b2cf0@linaro.org> In-Reply-To: <20230517-topic-a7xx_prep-v2-0-5b9daa2b2cf0@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter Cc: Marijn Suijten , Jonathan Marek , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1684502955; l=1342; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=btUFgb1HmX4JzaeMKMcU2R1/tETWRJTF/5M21P54ufE=; b=uge7jhsa+6TMgVnbDiql/KjRMCa2Zb0JOe9R2GsPOzeoMYLsykOQCCB6qAuMi5PGNRRC++0uR dFwe/8HcIVVBFtJho3vrH41g3hspVEGRLxiuZX69M1/8Ix2IBah+mWC X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766329858161709372?= X-GMAIL-MSGID: =?utf-8?q?1766329858161709372?= Change the order of region allocations to make the addresses match downstream. This shouldn't matter very much, but helps eliminate one more difference when comparing register accesses. Also, make the log region 16K long. That's what it is, unconditionally on A6xx and A7xx. Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index 8004b582e45f..386c81e1a2f3 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -1614,13 +1614,13 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node) goto err_memory; } - /* Allocate memory for for the HFI queues */ - ret = a6xx_gmu_memory_alloc(gmu, &gmu->hfi, SZ_16K, 0, "hfi"); + /* Allocate memory for the GMU log region */ + ret = a6xx_gmu_memory_alloc(gmu, &gmu->log, SZ_16K, 0, "log"); if (ret) goto err_memory; - /* Allocate memory for the GMU log region */ - ret = a6xx_gmu_memory_alloc(gmu, &gmu->log, SZ_4K, 0, "log"); + /* Allocate memory for for the HFI queues */ + ret = a6xx_gmu_memory_alloc(gmu, &gmu->hfi, SZ_16K, 0, "hfi"); if (ret) goto err_memory;