* [PATCH] drm/amdgpu: force exit gfxoff on sdma resume for rmb s0ix
@ 2021-09-26 13:10 Prike Liang
2021-09-27 15:16 ` Alex Deucher
0 siblings, 1 reply; 4+ messages in thread
From: Prike Liang @ 2021-09-26 13:10 UTC (permalink / raw)
To: amd-gfx; +Cc: Alexander.Deucher, ray.huang, Prike Liang
In the s2idle stress test sdma resume fail occasionally,in the
failed case GPU is in the gfxoff state.This issue may introduce
by FSDL miss handle doorbell S/R and now temporary fix the issue
by forcing exit gfxoff for sdma resume.
Signed-off-by: Prike Liang <Prike.Liang@amd.com>
---
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index e4a96e7e386d..81906955ef52 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
@@ -868,6 +868,12 @@ static int sdma_v5_2_start(struct amdgpu_device *adev)
msleep(1000);
}
+ /* TODO: check whether can submit a doorbell request to raise
+ * a doorbell fence to exit gfxoff.
+ */
+ if (adev->in_s0ix)
+ amdgpu_gfx_off_ctrl(adev, false);
+
sdma_v5_2_soft_reset(adev);
/* unhalt the MEs */
sdma_v5_2_enable(adev, true);
@@ -876,6 +882,8 @@ static int sdma_v5_2_start(struct amdgpu_device *adev)
/* start the gfx rings and rlc compute queues */
r = sdma_v5_2_gfx_resume(adev);
+ if (adev->in_s0ix)
+ amdgpu_gfx_off_ctrl(adev, true);
if (r)
return r;
r = sdma_v5_2_rlc_resume(adev);
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu: force exit gfxoff on sdma resume for rmb s0ix
2021-09-26 13:10 [PATCH] drm/amdgpu: force exit gfxoff on sdma resume for rmb s0ix Prike Liang
@ 2021-09-27 15:16 ` Alex Deucher
0 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2021-09-27 15:16 UTC (permalink / raw)
To: Prike Liang; +Cc: amd-gfx list, Deucher, Alexander, Huang Rui
On Sun, Sep 26, 2021 at 9:14 AM Prike Liang <Prike.Liang@amd.com> wrote:
>
> In the s2idle stress test sdma resume fail occasionally,in the
> failed case GPU is in the gfxoff state.This issue may introduce
> by FSDL miss handle doorbell S/R and now temporary fix the issue
> by forcing exit gfxoff for sdma resume.
>
> Signed-off-by: Prike Liang <Prike.Liang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
> index e4a96e7e386d..81906955ef52 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
> @@ -868,6 +868,12 @@ static int sdma_v5_2_start(struct amdgpu_device *adev)
> msleep(1000);
> }
>
> + /* TODO: check whether can submit a doorbell request to raise
> + * a doorbell fence to exit gfxoff.
> + */
> + if (adev->in_s0ix)
> + amdgpu_gfx_off_ctrl(adev, false);
> +
> sdma_v5_2_soft_reset(adev);
> /* unhalt the MEs */
> sdma_v5_2_enable(adev, true);
> @@ -876,6 +882,8 @@ static int sdma_v5_2_start(struct amdgpu_device *adev)
>
> /* start the gfx rings and rlc compute queues */
> r = sdma_v5_2_gfx_resume(adev);
> + if (adev->in_s0ix)
> + amdgpu_gfx_off_ctrl(adev, true);
> if (r)
> return r;
> r = sdma_v5_2_rlc_resume(adev);
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] drm/amdgpu: force exit gfxoff on sdma resume for rmb s0ix
@ 2021-09-24 5:18 Prike Liang
2021-09-24 5:55 ` Liang, Prike
0 siblings, 1 reply; 4+ messages in thread
From: Prike Liang @ 2021-09-24 5:18 UTC (permalink / raw)
To: amd-gfx; +Cc: Alexander.Deucher, ray.huang, Prike Liang
In the s2idle stress test sdma resume fail occasionally,in the
failed case GPU is in the gfxoff state.This issue may introduce
by FSDL miss handle doorbell S/R and now temporary fix the issue
by forcing exit gfxoff for sdma resume.
Signed-off-by: Prike Liang <Prike.Liang@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index 24b0195..af759ab 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -7608,6 +7608,14 @@ static int gfx_v10_0_suspend(void *handle)
static int gfx_v10_0_resume(void *handle)
{
+ struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+ /* TODO: check whether can submit a doorbell request to raise
+ * a doorbell fence to exit gfxoff.
+ */
+ if (adev->in_s0ix)
+ amdgpu_gfx_off_ctrl(adev, false);
+
return gfx_v10_0_hw_init(handle);
}
@@ -7819,6 +7827,9 @@ static int gfx_v10_0_late_init(void *handle)
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
int r;
+ if (adev->in_s0ix)
+ amdgpu_gfx_off_ctrl(adev, true);
+
r = amdgpu_irq_get(adev, &adev->gfx.priv_reg_irq, 0);
if (r)
return r;
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [PATCH] drm/amdgpu: force exit gfxoff on sdma resume for rmb s0ix
2021-09-24 5:18 Prike Liang
@ 2021-09-24 5:55 ` Liang, Prike
0 siblings, 0 replies; 4+ messages in thread
From: Liang, Prike @ 2021-09-24 5:55 UTC (permalink / raw)
To: amd-gfx; +Cc: Deucher, Alexander, Huang, Ray
[Public]
Hold on there's still need further check the gfxoff control residence and will update the patch.
Thanks,
Prike
> -----Original Message-----
> From: Liang, Prike <Prike.Liang@amd.com>
> Sent: Friday, September 24, 2021 1:18 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Huang, Ray
> <Ray.Huang@amd.com>; Liang, Prike <Prike.Liang@amd.com>
> Subject: [PATCH] drm/amdgpu: force exit gfxoff on sdma resume for rmb
> s0ix
>
> In the s2idle stress test sdma resume fail occasionally,in the failed case GPU
> is in the gfxoff state.This issue may introduce by FSDL miss handle doorbell
> S/R and now temporary fix the issue by forcing exit gfxoff for sdma resume.
>
> Signed-off-by: Prike Liang <Prike.Liang@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> index 24b0195..af759ab 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> @@ -7608,6 +7608,14 @@ static int gfx_v10_0_suspend(void *handle)
>
> static int gfx_v10_0_resume(void *handle) {
> + struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> +
> + /* TODO: check whether can submit a doorbell request to raise
> + * a doorbell fence to exit gfxoff.
> + */
> + if (adev->in_s0ix)
> + amdgpu_gfx_off_ctrl(adev, false);
> +
> return gfx_v10_0_hw_init(handle);
> }
>
> @@ -7819,6 +7827,9 @@ static int gfx_v10_0_late_init(void *handle)
> struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> int r;
>
> + if (adev->in_s0ix)
> + amdgpu_gfx_off_ctrl(adev, true);
> +
> r = amdgpu_irq_get(adev, &adev->gfx.priv_reg_irq, 0);
> if (r)
> return r;
> --
> 2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-09-27 15:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-26 13:10 [PATCH] drm/amdgpu: force exit gfxoff on sdma resume for rmb s0ix Prike Liang
2021-09-27 15:16 ` Alex Deucher
-- strict thread matches above, loose matches on Subject: below --
2021-09-24 5:18 Prike Liang
2021-09-24 5:55 ` Liang, Prike
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).