From patchwork Thu Feb 23 12:06: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: 60939 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp275614wrd; Thu, 23 Feb 2023 04:08:37 -0800 (PST) X-Google-Smtp-Source: AK7set+SNQYlWg0QQs29vcVJapP0OqCsdT3V8xZXhIDNF/xX+UtKBV5kMQUXi79dZl/jQoCC3jye X-Received: by 2002:a17:906:10a:b0:8b1:78bc:3103 with SMTP id 10-20020a170906010a00b008b178bc3103mr21417014eje.7.1677154117550; Thu, 23 Feb 2023 04:08:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677154117; cv=none; d=google.com; s=arc-20160816; b=v39TgfzC1EoQ/Hsb44d644Enozg3mCPRbKpZKZgZ9iIIRhd2vYS7AAf1BRJjjqdyzS l4Aj4srNn320LkvCdZBOFmIYXdCM2gLQdF5RA2rNRThIegtC7It1w16VwpeGLhL2fBrw QDFw6GW0tcigPH1FANGW5Wm1+NQy8NEOU+M8dySzhLvdqRUp+Qxx3OdBm5Nfj1/luYGg lcgX5b6lB3duxwD/R+M4pWW5G1M+qOIYTt/n2NbInQAhb/fmKZb7sZLKTRrwbAi1mTr0 vl57G4h14KseilK+Dg6aYIMqvt3uBg6hUJ5nkpLozeMWTEuzhebybsjaAl0KzMYp3/oQ BJ6A== 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=C2DkiOzFvqlB7+TWcEMrrrEcX0lZ3dVU5NgfPePd3XY=; b=zk7EsfgcDVPNmDMh1A3UVUeCAA8m9vlV6175rypFgLMVnmIQ1mTQeQyOR03iv0xU2O INp4JsYwLG9dZNT3/RAWugStkiqBl524Kmd/PeOIBJH6/nPqm/zRHJZmn54xRoW9DTtd wgzbE2zZRA7DcxFgvezMQ8q2u/7ICxeLXY4YMgEkN2STSBm9M+Lrdu6rDZfQTg/YbMvO DaAVgJt2xbvetQPehPgNF2JuqIViX+Qf22/iDYsNDLAXcIvlWAcpaABw0oG+EjSGSGr5 BYDxjVq013CswEXuPWPssIhx3yitzlTn8pcVJZvjU9un380fvsSgkGEVAFaw423sMxdi VArQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=efFeIEoR; 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 hz6-20020a1709072ce600b008ede8c6eecasi2638049ejc.146.2023.02.23.04.08.13; Thu, 23 Feb 2023 04:08:37 -0800 (PST) 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=efFeIEoR; 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 S233803AbjBWMHK (ORCPT + 99 others); Thu, 23 Feb 2023 07:07:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233963AbjBWMHE (ORCPT ); Thu, 23 Feb 2023 07:07:04 -0500 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 AB28D54543 for ; Thu, 23 Feb 2023 04:06:54 -0800 (PST) Received: by mail-lj1-x235.google.com with SMTP id h3so4564863lja.12 for ; Thu, 23 Feb 2023 04:06:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=C2DkiOzFvqlB7+TWcEMrrrEcX0lZ3dVU5NgfPePd3XY=; b=efFeIEoRxtiwlRt4E84hxWjWFgZ8KMsAJkCidihuG+M3eZe7QV62rT5onTi9rAglPM HSxhPLUpgWlsnU/R2rCa452wWwxrWYayL092HzdLdt3653XgJo2wweouLP2L7HAuVUcT Cww+HYGkwT/z6qg/+52NeomA9jThkbIxBtzKJJccWGCq0FREgvqohMzFH3wJE+pbsAo/ jzElWjR6zZ4y8yXBiTvCYJsbMDgPRI+3zHwhVEDpSnQ8tACNh/PuBblokUvHytT2pkEc t/hV7lheaBUeGCWz8KRnXT6TnMCB9EKl4y3PI1PCbmXAkjpA/97OK9ulpOByP3wxyCVb eirg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=C2DkiOzFvqlB7+TWcEMrrrEcX0lZ3dVU5NgfPePd3XY=; b=q3izP5rWTG3QPr0NyJo+s8yQ/psVpHEFspzeoTfrpTJ6rqD55ZrkIKmEUDaSpJTGU3 0dLvFULsuTe8JHqlN62kwER+8JunX8SbQX1rkKiiyX+nn7DV4aQjXXt1u52Va1hgNZLz xvruXIvk6tyduZPu33/NoT5U8kEH012Kl5XZQUws7/re8/GUK7Zf7LUHaQx6Z2GlzYeu XVqZrWQ/AbEgzH7RfJt+jVTwY+3vpP7IS8x6gC7nzeTP3NhCWD9tLi1iGhFJQGEaJRKT H36lKp5hCA1ShccLO261TM8ZKxPU+CF3SwvqjP4Kzen4MvYbAjwJpyjO20uFV4PYL+fM bncg== X-Gm-Message-State: AO0yUKUV5lONIREvVBh+hABM376fGK+RCDHmk9UAo5AJ2mugDCaDkowk TX2Mvwy+lC2VMuiv5KulK8X8+A== X-Received: by 2002:a2e:a0d7:0:b0:290:6af2:2aac with SMTP id f23-20020a2ea0d7000000b002906af22aacmr3936791ljm.28.1677154014119; Thu, 23 Feb 2023 04:06:54 -0800 (PST) Received: from [192.168.1.101] (abxi151.neoplus.adsl.tpnet.pl. [83.9.2.151]) by smtp.gmail.com with ESMTPSA id h23-20020a2ea497000000b0029599744c02sm414838lji.75.2023.02.23.04.06.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 04:06:53 -0800 (PST) From: Konrad Dybcio Date: Thu, 23 Feb 2023 13:06:40 +0100 Subject: [PATCH v3 06/15] drm/msm/a6xx: Remove both GBIF and RBBM GBIF halt on hw init MIME-Version: 1.0 Message-Id: <20230223-topic-gmuwrapper-v3-6-5be55a336819@linaro.org> References: <20230223-topic-gmuwrapper-v3-0-5be55a336819@linaro.org> In-Reply-To: <20230223-topic-gmuwrapper-v3-0-5be55a336819@linaro.org> 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 , Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1677154003; l=1251; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=rP7wPgzCBRL4O8RjqZW82yCjEqeUwKMvFLJUSz0sk4w=; b=t1dDTvbESCNHgHAYmBv6IMnTLBnwneLOTRz1mF8VO3Y2mx1isDo8k3MOwjLqk/aVELjI0UZ5VVbf aPLaEhokA/k0s+GpA7f0O2MxMoiZNsGLLyrtJRa30jB5kDjx7zqA 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 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?1758623555626540937?= X-GMAIL-MSGID: =?utf-8?q?1758623555626540937?= Currently we're only deasserting REG_A6XX_RBBM_GBIF_HALT, but we also need REG_A6XX_GBIF_HALT to be set to 0. For GMU-equipped GPUs this is done in a6xx_bus_clear_pending_transactions(), but for the GMU-less ones we have to do it *somewhere*. Unhalting both side by side sounds like a good plan and it won't cause any issues if it's unnecessary. Also, add a memory barrier to ensure it's gone through. Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index d8e7ef181e39..a8b727b82389 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -1029,8 +1029,12 @@ static int hw_init(struct msm_gpu *gpu) } /* Clear GBIF halt in case GX domain was not collapsed */ - if (a6xx_has_gbif(adreno_gpu)) + if (a6xx_has_gbif(adreno_gpu)) { + gpu_write(gpu, REG_A6XX_GBIF_HALT, 0); gpu_write(gpu, REG_A6XX_RBBM_GBIF_HALT, 0); + /* Let's make extra sure that the GPU can access the memory.. */ + mb(); + } gpu_write(gpu, REG_A6XX_RBBM_SECVID_TSB_CNTL, 0);