From: Akhil P Oommen <quic_akhilpo@quicinc.com>
To: freedreno <freedreno@lists.freedesktop.org>,
<dri-devel@lists.freedesktop.org>,
<linux-arm-msm@vger.kernel.org>, Rob Clark <robdclark@gmail.com>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
"Dmitry Baryshkov" <dmitry.baryshkov@linaro.org>
Cc: Matthias Kaehlcke <mka@chromium.org>,
Jonathan Marek <jonathan@marek.ca>,
Jordan Crouse <jordan@cosmicpenguin.net>,
Douglas Anderson <dianders@chromium.org>,
Akhil P Oommen <quic_akhilpo@quicinc.com>,
"Abhinav Kumar" <quic_abhinavk@quicinc.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Daniel Vetter <daniel@ffwll.ch>, David Airlie <airlied@linux.ie>,
Sean Paul <sean@poorly.run>, Wang Qing <wangqing@vivo.com>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v4 7/7] drm/msm/a6xx: Handle GMU prepare-slumber hfi failure
Date: Wed, 17 Aug 2022 20:44:20 +0530 [thread overview]
Message-ID: <20220817204224.v4.7.I54815c7c36b80d4725cd054e536365250454452f@changeid> (raw)
In-Reply-To: <1660749261-7602-1-git-send-email-quic_akhilpo@quicinc.com>
When prepare-slumber hfi fails, we should follow a6xx_gmu_force_off()
sequence.
Signed-off-by: Akhil P Oommen <quic_akhilpo@quicinc.com>
---
(no changes since v1)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
index db05942..3d00ef9 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
@@ -1082,7 +1082,11 @@ static void a6xx_gmu_shutdown(struct a6xx_gmu *gmu)
a6xx_bus_clear_pending_transactions(adreno_gpu);
/* tell the GMU we want to slumber */
- a6xx_gmu_notify_slumber(gmu);
+ ret = a6xx_gmu_notify_slumber(gmu);
+ if (ret) {
+ a6xx_gmu_force_off(gmu);
+ return;
+ }
ret = gmu_poll_timeout(gmu,
REG_A6XX_GPU_GMU_AO_GPU_CX_BUSY_STATUS, val,
--
2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Akhil P Oommen <quic_akhilpo@quicinc.com>
To: freedreno <freedreno@lists.freedesktop.org>,
<dri-devel@lists.freedesktop.org>,
<linux-arm-msm@vger.kernel.org>, Rob Clark <robdclark@gmail.com>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
"Dmitry Baryshkov" <dmitry.baryshkov@linaro.org>
Cc: Jonathan Marek <jonathan@marek.ca>,
Akhil P Oommen <quic_akhilpo@quicinc.com>,
linux-kernel@vger.kernel.org,
Abhinav Kumar <quic_abhinavk@quicinc.com>,
Douglas Anderson <dianders@chromium.org>,
Wang Qing <wangqing@vivo.com>, David Airlie <airlied@linux.ie>,
Matthias Kaehlcke <mka@chromium.org>,
Jordan Crouse <jordan@cosmicpenguin.net>,
Sean Paul <sean@poorly.run>,
Dan Carpenter <dan.carpenter@oracle.com>
Subject: [PATCH v4 7/7] drm/msm/a6xx: Handle GMU prepare-slumber hfi failure
Date: Wed, 17 Aug 2022 20:44:20 +0530 [thread overview]
Message-ID: <20220817204224.v4.7.I54815c7c36b80d4725cd054e536365250454452f@changeid> (raw)
In-Reply-To: <1660749261-7602-1-git-send-email-quic_akhilpo@quicinc.com>
When prepare-slumber hfi fails, we should follow a6xx_gmu_force_off()
sequence.
Signed-off-by: Akhil P Oommen <quic_akhilpo@quicinc.com>
---
(no changes since v1)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
index db05942..3d00ef9 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
@@ -1082,7 +1082,11 @@ static void a6xx_gmu_shutdown(struct a6xx_gmu *gmu)
a6xx_bus_clear_pending_transactions(adreno_gpu);
/* tell the GMU we want to slumber */
- a6xx_gmu_notify_slumber(gmu);
+ ret = a6xx_gmu_notify_slumber(gmu);
+ if (ret) {
+ a6xx_gmu_force_off(gmu);
+ return;
+ }
ret = gmu_poll_timeout(gmu,
REG_A6XX_GPU_GMU_AO_GPU_CX_BUSY_STATUS, val,
--
2.7.4
next prev parent reply other threads:[~2022-08-18 4:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-17 15:14 [PATCH v4 0/7] Improve GPU Recovery Akhil P Oommen
2022-08-17 15:14 ` Akhil P Oommen
2022-08-17 15:14 ` [PATCH v4 1/7] drm/msm: Remove unnecessary pm_runtime_get/put Akhil P Oommen
2022-08-17 15:14 ` Akhil P Oommen
2022-08-17 15:14 ` [PATCH v4 2/7] drm/msm: Take single rpm refcount on behalf of all submits Akhil P Oommen
2022-08-17 15:14 ` Akhil P Oommen
2022-08-17 15:14 ` [PATCH v4 3/7] drm/msm: Correct pm_runtime votes in recover worker Akhil P Oommen
2022-08-17 15:14 ` Akhil P Oommen
2022-08-17 15:14 ` [PATCH v4 4/7] drm/msm: Fix cx collapse issue during recovery Akhil P Oommen
2022-08-17 15:14 ` Akhil P Oommen
2022-08-17 15:14 ` [PATCH v4 5/7] drm/msm/a6xx: Ensure CX collapse during gpu recovery Akhil P Oommen
2022-08-17 15:14 ` Akhil P Oommen
2022-08-18 8:54 ` Philipp Zabel
2022-08-18 8:54 ` Philipp Zabel
2022-08-17 15:14 ` [PATCH v4 6/7] drm/msm/a6xx: Improve gpu recovery sequence Akhil P Oommen
2022-08-17 15:14 ` Akhil P Oommen
2022-08-17 15:14 ` Akhil P Oommen [this message]
2022-08-17 15:14 ` [PATCH v4 7/7] drm/msm/a6xx: Handle GMU prepare-slumber hfi failure Akhil P Oommen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220817204224.v4.7.I54815c7c36b80d4725cd054e536365250454452f@changeid \
--to=quic_akhilpo@quicinc.com \
--cc=airlied@linux.ie \
--cc=bjorn.andersson@linaro.org \
--cc=dan.carpenter@oracle.com \
--cc=daniel@ffwll.ch \
--cc=dianders@chromium.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=jonathan@marek.ca \
--cc=jordan@cosmicpenguin.net \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mka@chromium.org \
--cc=quic_abhinavk@quicinc.com \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
--cc=wangqing@vivo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.