From patchwork Wed Jun 28 20:35:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 114042 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9194597vqr; Wed, 28 Jun 2023 13:37:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ZcYQX8yu+J/ZtXw8Dv20e1JzDK0/crqZm3J56UVzk950Q1wNlM/eJkEDr61fhZ9k1D0so X-Received: by 2002:a05:6a00:24cf:b0:676:2a5c:7bc5 with SMTP id d15-20020a056a0024cf00b006762a5c7bc5mr11990919pfv.1.1687984656202; Wed, 28 Jun 2023 13:37:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687984656; cv=none; d=google.com; s=arc-20160816; b=0OzWqj/+L5DFOc/deD/zEqypXo1neeJxFQQnf35J/RTa49bu3em53cYmYzRtrIUr9I 9rAYic2HmirCCTIgmoLY2r9LZvNRJaqsO3QEkeINCbfd3q0DxlVlFsiosbDvvCUycbQ0 GK0SZMS7ctDhSIsYk9ONm5hyPfR/lh3Z2vZ6PcAQ6bmHZyL5sJlaRCPEAR2T8SlJEaCT 6PVGXr4+25MsDzc5IY+mwbVd6lu4uBzNyfrpOBc2Wu85w14T6Cw8vSXGvuicSRmAw818 1l96Hn6FqN7THbueYosnQlc5y6aNbWEfjS8Ok7SqVLMvqEZbuNiCMVshDa1VpIgtRi95 JWiQ== 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=DkM6eACK+l7KK09aC4iRvpEN0T6pFUWvLy8n57wVeSY=; fh=y5CufWdCvRG/D46wPUQAs6a5TaO9Xg7IL+UXm/FDyGE=; b=P5e7FTFH5vjm/5PfmnUXNg8fiO3spKu/i9AuErecgtDlEPUrPO3Oh6k0ndKYPifXga CYAeNZhqChQWtvkoZX6jmP6pUzLXgnXyqXqR/E19yItvSv0NuE2OP7pBrcjyl8KIjc5n pv826RzauRUFbSpWxNNktmcLbuXnHJqrRtWlRCu6NoujLbjeWgPcy78Dl78WC7W9cAx/ nsPWDQggrXS4pKkXd/G8MpIiAR0AyLkL/jrfA58FMcexV4UgN3UAGBv6s54bZNeJE7z6 9t8ORyeK/P+BZhyT7sU3EHz8DdBmMVGdIGvWyCZ9kArrHnQaXTYfv1qVks70fLmN51CA iCQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Wk87rACL; 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 bw9-20020a056a00408900b00666b7377d65si8169078pfb.389.2023.06.28.13.37.22; Wed, 28 Jun 2023 13:37:36 -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=Wk87rACL; 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 S232102AbjF1UgM (ORCPT + 99 others); Wed, 28 Jun 2023 16:36:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232056AbjF1Ufi (ORCPT ); Wed, 28 Jun 2023 16:35:38 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7ADB62113 for ; Wed, 28 Jun 2023 13:35:37 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-4fb7373dd35so1830283e87.1 for ; Wed, 28 Jun 2023 13:35:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687984535; x=1690576535; 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=DkM6eACK+l7KK09aC4iRvpEN0T6pFUWvLy8n57wVeSY=; b=Wk87rACLpnAT+qXyvw65l5SaJkF7pt8Q2vfYNiidfMn/ez+0hqT4ECXI4GXSY4YEzn pbIus18/SVFGIoizV7WukfwTK+rZcf+IO9dGfzl/ajO2NyB9m8Vcced6Yyuk9/CRU2hz 9DYQEgsFIMKEFGvkvQfu9PMYu8+97CuRODHAYACzu/Xai9W1EAuw/yRuWTUrf92a7QfE bsOxTFamvXGjBPKiamdrrv76NFLZvEfyZ7/67o+JBPu8KfvrpKZjy6nsD1oCV6nDc6cG W7ZgZum4RcrCCK1NQuRUTq0LY+AM0Gx1GR/zEPDWffQwXI5T1jizrUjMGEV/HC3kHsPy sYOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687984535; x=1690576535; 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=DkM6eACK+l7KK09aC4iRvpEN0T6pFUWvLy8n57wVeSY=; b=SpbFkpQy6DrCDa8ZAfWgTRq3IQBFOsyJXY1sA5eNHW7nm4BD6o4H0pM+k8CWqbyAAt AIS5LQOy5UjaaCQJ03+BB4T0+ssdxPBOmDYXfpLcbR2yrSlfqOjZshCcwdwe7wZ7IcwE oFShkUURAsOi+IER5BrmGTtsBb2LcEYXVNX79OmgocRff3o/M9UUcJ/9Id1fuWWKQ7X3 76X9jQDnPX6Sg9hqlfriqHvTJcCXJVJcrFUUFisLjIe7VnA2uBUJtfAvdmwHY5BtPJr9 siZIvsPomc6z7hKZOw6GnYdGIc31DVZIjlSWaCJ9f8HtxnYqEyhaVT+r3ffKiwcr0VhA a5Fg== X-Gm-Message-State: AC+VfDy+s6XOYebvMgepsJ8E4gQSSKpTdsDiUdvnEf6vc2jz9bk3/gsk v4oID3PGM2rQLPBmi0uP87Na/g== X-Received: by 2002:a05:6512:239a:b0:4f8:6ac4:1aa9 with SMTP id c26-20020a056512239a00b004f86ac41aa9mr1045562lfv.21.1687984535651; Wed, 28 Jun 2023 13:35:35 -0700 (PDT) Received: from [192.168.1.101] (abyk82.neoplus.adsl.tpnet.pl. [83.9.30.82]) by smtp.gmail.com with ESMTPSA id m25-20020a056512015900b004fb86c89fa1sm753363lfo.135.2023.06.28.13.35.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 13:35:35 -0700 (PDT) From: Konrad Dybcio Date: Wed, 28 Jun 2023 22:35:07 +0200 Subject: [PATCH 07/14] drm/msm/a6xx: Bail out early if setting GPU OOB fails MIME-Version: 1.0 Message-Id: <20230628-topic-a7xx_drmmsm-v1-7-a7f4496e0c12@linaro.org> References: <20230628-topic-a7xx_drmmsm-v1-0-a7f4496e0c12@linaro.org> In-Reply-To: <20230628-topic-a7xx_drmmsm-v1-0-a7f4496e0c12@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1687984524; l=937; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=9J73aF30PI34nc92bobMmRBFeW3h6sk6+9cqWlv0aIs=; b=zmnxv1qkjjq2p1yEjeUi56tWX0E0Ek0pCy6wtN2JzIoG/ilSwtPl8RZ6guWx36wWuEwoXknCU FGScjwrujijAbVyqz0v4cw90pj4jSl6z7zz5YuNJkRicoA68Kcs0n7N 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?1769980198926027348?= X-GMAIL-MSGID: =?utf-8?q?1769980198926027348?= If the GMU can't guarantee the required resources are up, trying to bring up the GPU is a lost cause. Return early if setting GPU OOB fails. Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index c1c76fe288b2..7c8345ae1a30 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -1201,7 +1201,9 @@ static int hw_init(struct msm_gpu *gpu) if (!adreno_has_gmu_wrapper(adreno_gpu)) { /* Make sure the GMU keeps the GPU on while we set it up */ - a6xx_gmu_set_oob(&a6xx_gpu->gmu, GMU_OOB_GPU_SET); + ret = a6xx_gmu_set_oob(&a6xx_gpu->gmu, GMU_OOB_GPU_SET); + if (ret) + return ret; } /* Clear GBIF halt in case GX domain was not collapsed */