From patchwork Mon Jun 19 16:44:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 110113 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3130959vqr; Mon, 19 Jun 2023 09:51:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5rZy+xQiJZ2bomSk4IrtSFIW1tpMLV3DCr4WrmDx8W4NPhqJdB1az+CtCvSSq5ezcd0V3N X-Received: by 2002:a05:6808:23c2:b0:39a:c1a0:7cbe with SMTP id bq2-20020a05680823c200b0039ac1a07cbemr8773668oib.12.1687193504525; Mon, 19 Jun 2023 09:51:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687193504; cv=none; d=google.com; s=arc-20160816; b=PmkYJKljd64f2TakPVGLP0hhi0F3874qD0wscM8o1HAkE7J7kplrATPspun3xtowzO 2icjDdAczY3hnqFB6HPD4QIED2isuJFxlhZBQuQlwXJsTsiDWjC9oxZGghn6urFMWm1B HJo1/flo1jXI5+f+KfJDi/WmZBvr4cXKgR2QbpDJpI64APu6q0ATTjjg0dN0K3oeXG4M Up+kQqKwQB42O0WYJVn1Pg8fxunBDn5E6ZOYa9cUkY7g+M6QFL/dsOLgs06RbtYtSWAs JQ+WFGAXIKBFWmHWxk8Gr5iepCz14KXERa2HrvMHLF5V5VDUzFJaqL7anbPwQa/IpogR ilsg== 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=pwTI7UHTcKqCvzBNFhABN4+E8WkvXM5Y1T6fiTPNJV4=; b=Ru69C+yaMwLMeYEQ+8n2sWlbCg5Img4/uEr3Iexkmiwchj3Loiimzg4/uV+ocoohAn oAD2cEqpnDjT/0gyyp5HH4GipgkF9lh5MBi/KMlD7yYIwHBNWq5P8r18vPSiYZCHZZnE QUM63onzQsEiWOqSSpgEtFuTIfgazA7YQ3A+G/StA3O7FLU91PLr6mQ4YYyqxl40vu3l 9jnmkECDErSUdSvLiDFZk3TONfqAW/OUpUVoWEZS6UwQhOwVvakGyIm7vuMe4ecU+r83 hjtMZd797WggI0S1DlNAJvppb9XBSpXW7aLHtAnJOB9+BfveIkBlP1+yEjwMqGz9XncT 981A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uWDRPGlk; 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 c131-20020a633589000000b0055397736c02si4457400pga.842.2023.06.19.09.51.32; Mon, 19 Jun 2023 09:51:44 -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=uWDRPGlk; 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 S231391AbjFSQos (ORCPT + 99 others); Mon, 19 Jun 2023 12:44:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232354AbjFSQof (ORCPT ); Mon, 19 Jun 2023 12:44:35 -0400 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CB93FA for ; Mon, 19 Jun 2023 09:44:32 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2b475b54253so21479051fa.2 for ; Mon, 19 Jun 2023 09:44:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687193070; x=1689785070; 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=pwTI7UHTcKqCvzBNFhABN4+E8WkvXM5Y1T6fiTPNJV4=; b=uWDRPGlkpBeSI/LuJhTMqC5Wp8EXBY00FHSn2a24QSiOQoPU8ZnRorKuroEvCfkisY qWglo6EE2TJmz74pSs/ARvKryOuN8tpbcJy80admJkQHB6332oLgu5DbFsqTT8vZTbzO F0JQxiqRYe1B/sxTSwjZnXyA0JzISYja8qI1LRwXOvdIYx960lThXyAP/tr+bN72pnbA TA1GxSwLily75nHtK/oLVzhdKQIXsbksz6rMOHHy9fDDo/p71xuhPsDcJ4ZWY8RP61HO mzWnR/qExMY8g96Nd/G/7dmLM0qr/WFvKjn24Tp73ZKisN8is//SseIooGRyco2k0znB MLtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687193070; x=1689785070; 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=pwTI7UHTcKqCvzBNFhABN4+E8WkvXM5Y1T6fiTPNJV4=; b=eViR4F7rxoy/cn3WJM8wW5FVFW36QmsVWYCk33lK7iXncyxb8bZtUaWp7mJz4BuTYG Fk2TChEpsNPDzguEzXnhFeu5CawTwYct3z/GbFJr0epYmUb46JMx3z4iCcb8DZv7YdFE FV7XvCwd2CEtj/csWtm1Z4eMSFutQKZmDQrL1DS1Ia8aTypaYcuXI+lrvmDFV8Ih6pda cs3wV8gPC7Ovkj/PGIgNWfQigkKyF3fOCQMc/vmQpo0S5rxhJ4JwCCPC3mftLZ/Q8R6R PtEsr65Gv0oxKkg87uzxNk+cnMNiVeJOG384LmakXM3WXavr6NutfwQ6PHLs2AgvuL2p THjw== X-Gm-Message-State: AC+VfDw9n5NICgsKMUkCSWQdYHlD0SVSi+6kU3LWLCYHG4gTtq6noU9A ZSwn2fOmwwn9yE1w4hA6sVdGIg== X-Received: by 2002:a19:9209:0:b0:4f8:6fe9:3c9c with SMTP id u9-20020a199209000000b004f86fe93c9cmr2010394lfd.49.1687193070620; Mon, 19 Jun 2023 09:44:30 -0700 (PDT) Received: from [192.168.1.101] (abyl242.neoplus.adsl.tpnet.pl. [83.9.31.242]) by smtp.gmail.com with ESMTPSA id d9-20020ac24c89000000b004f849605be7sm1774293lfl.292.2023.06.19.09.44.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 09:44:30 -0700 (PDT) From: Konrad Dybcio Date: Mon, 19 Jun 2023 18:44:26 +0200 Subject: [PATCH v3 6/6] drm/msm/a6xx: Fix up GMU region reservations MIME-Version: 1.0 Message-Id: <20230517-topic-a7xx_prep-v3-6-a3ce3725385b@linaro.org> References: <20230517-topic-a7xx_prep-v3-0-a3ce3725385b@linaro.org> In-Reply-To: <20230517-topic-a7xx_prep-v3-0-a3ce3725385b@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=1687193061; l=1342; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=yg0CsUYst1MC0yCvcYjryDQIsWMdtt76iHZrZNL17WI=; b=FknMc43zmZwkUD5y3nuDtPowX+jeCuLzVQmv1m9TogJq9v7mkOYVQ635wLUZM4nLlk2KbeTs6 AGZUKNJMwB2AHrgQwtbdu4Lzhm1KoBpZLUs9z8Px3BMlBD5HzvZt6f4 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 autolearn=ham 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?1769150616161487815?= X-GMAIL-MSGID: =?utf-8?q?1769150616161487815?= 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 55b12a8066ee..d682c1ed48db 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -1640,13 +1640,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;