* [PATCH] drm/amdgpu: disable gfxoff if VCN is busy @ 2020-10-30 11:37 Jiansong Chen 2020-10-30 11:43 ` Zhang, Hawking 2020-10-30 13:06 ` James Zhu 0 siblings, 2 replies; 4+ messages in thread From: Jiansong Chen @ 2020-10-30 11:37 UTC (permalink / raw) To: amd-gfx; +Cc: tao.zhou1, Jiansong Chen, james.zhu, leo.liu, hawking.zhang Toggle on/off gfxoff during video playback to fix gpu hang. Signed-off-by: Jiansong Chen <Jiansong.Chen@amd.com> Change-Id: I5b938c446884268c2cda0801121a53da980e603a --- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index 277a8435dd06..444b89413232 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -358,6 +358,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work) } if (!fences && !atomic_read(&adev->vcn.total_submission_cnt)) { + amdgpu_gfx_off_ctrl(adev, true); amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, AMD_PG_STATE_GATE); } else { @@ -368,13 +369,16 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work) void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring) { struct amdgpu_device *adev = ring->adev; + bool set_clocks = !cancel_delayed_work_sync(&adev->vcn.idle_work); atomic_inc(&adev->vcn.total_submission_cnt); - cancel_delayed_work_sync(&adev->vcn.idle_work); mutex_lock(&adev->vcn.vcn_pg_lock); - amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, - AMD_PG_STATE_UNGATE); + if (set_clocks) { + amdgpu_gfx_off_ctrl(adev, false); + amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, + AMD_PG_STATE_UNGATE); + } if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) { struct dpg_pause_state new_state; -- 2.25.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH] drm/amdgpu: disable gfxoff if VCN is busy 2020-10-30 11:37 [PATCH] drm/amdgpu: disable gfxoff if VCN is busy Jiansong Chen @ 2020-10-30 11:43 ` Zhang, Hawking 2020-10-30 13:06 ` James Zhu 1 sibling, 0 replies; 4+ messages in thread From: Zhang, Hawking @ 2020-10-30 11:43 UTC (permalink / raw) To: Chen, Jiansong (Simon), amd-gfx@lists.freedesktop.org Cc: Zhou1, Tao, Zhu, James, Liu, Leo, Chen, Jiansong (Simon) [AMD Public Use] Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Regards, Hawking -----Original Message----- From: Jiansong Chen <Jiansong.Chen@amd.com> Sent: Friday, October 30, 2020 19:37 To: amd-gfx@lists.freedesktop.org Cc: Zhang, Hawking <Hawking.Zhang@amd.com>; Zhu, James <James.Zhu@amd.com>; Liu, Leo <Leo.Liu@amd.com>; Zhou1, Tao <Tao.Zhou1@amd.com>; Chen, Jiansong (Simon) <Jiansong.Chen@amd.com> Subject: [PATCH] drm/amdgpu: disable gfxoff if VCN is busy Toggle on/off gfxoff during video playback to fix gpu hang. Signed-off-by: Jiansong Chen <Jiansong.Chen@amd.com> Change-Id: I5b938c446884268c2cda0801121a53da980e603a --- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index 277a8435dd06..444b89413232 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -358,6 +358,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work) } if (!fences && !atomic_read(&adev->vcn.total_submission_cnt)) { + amdgpu_gfx_off_ctrl(adev, true); amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, AMD_PG_STATE_GATE); } else { @@ -368,13 +369,16 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work) void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring) { struct amdgpu_device *adev = ring->adev; + bool set_clocks = !cancel_delayed_work_sync(&adev->vcn.idle_work); atomic_inc(&adev->vcn.total_submission_cnt); - cancel_delayed_work_sync(&adev->vcn.idle_work); mutex_lock(&adev->vcn.vcn_pg_lock); - amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, - AMD_PG_STATE_UNGATE); + if (set_clocks) { + amdgpu_gfx_off_ctrl(adev, false); + amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, + AMD_PG_STATE_UNGATE); + } if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) { struct dpg_pause_state new_state; -- 2.25.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu: disable gfxoff if VCN is busy 2020-10-30 11:37 [PATCH] drm/amdgpu: disable gfxoff if VCN is busy Jiansong Chen 2020-10-30 11:43 ` Zhang, Hawking @ 2020-10-30 13:06 ` James Zhu 2020-10-30 14:58 ` Chen, Jiansong (Simon) 1 sibling, 1 reply; 4+ messages in thread From: James Zhu @ 2020-10-30 13:06 UTC (permalink / raw) To: Jiansong Chen, amd-gfx; +Cc: tao.zhou1, james.zhu, leo.liu, hawking.zhang Hi Jiansong Pls check inline. thanks! James On 2020-10-30 7:37 a.m., Jiansong Chen wrote: > Toggle on/off gfxoff during video playback to fix > gpu hang. [JZ] It is a workaround, not a fix. Also Arcturus needn't this WA. > Signed-off-by: Jiansong Chen <Jiansong.Chen@amd.com> > Change-Id: I5b938c446884268c2cda0801121a53da980e603a > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c > index 277a8435dd06..444b89413232 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c > @@ -358,6 +358,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work) > } > > if (!fences && !atomic_read(&adev->vcn.total_submission_cnt)) { > + amdgpu_gfx_off_ctrl(adev, true); > amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, > AMD_PG_STATE_GATE); > } else { > @@ -368,13 +369,16 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work) > void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring) > { > struct amdgpu_device *adev = ring->adev; > + bool set_clocks = !cancel_delayed_work_sync(&adev->vcn.idle_work); > > atomic_inc(&adev->vcn.total_submission_cnt); > - cancel_delayed_work_sync(&adev->vcn.idle_work); > > mutex_lock(&adev->vcn.vcn_pg_lock); > - amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, > - AMD_PG_STATE_UNGATE); > + if (set_clocks) { > + amdgpu_gfx_off_ctrl(adev, false); [JZ] Move the above two lines before mutex_lock(&adev->vcn.vcn_pg_lock); Since it may cause S3 test failure. > + amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, > + AMD_PG_STATE_UNGATE); > + } > > if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) { > struct dpg_pause_state new_state; _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] drm/amdgpu: disable gfxoff if VCN is busy 2020-10-30 13:06 ` James Zhu @ 2020-10-30 14:58 ` Chen, Jiansong (Simon) 0 siblings, 0 replies; 4+ messages in thread From: Chen, Jiansong (Simon) @ 2020-10-30 14:58 UTC (permalink / raw) To: Zhu, James, amd-gfx@lists.freedesktop.org Cc: Zhou1, Tao, Liu, Leo, Zhang, Hawking [AMD Official Use Only - Internal Distribution Only] Hi James, Thanks for your input, v2 patch is sent out. Regards, Jiansong -----Original Message----- From: Zhu, James <James.Zhu@amd.com> Sent: Friday, October 30, 2020 9:06 PM To: Chen, Jiansong (Simon) <Jiansong.Chen@amd.com>; amd-gfx@lists.freedesktop.org Cc: Zhang, Hawking <Hawking.Zhang@amd.com>; Zhu, James <James.Zhu@amd.com>; Liu, Leo <Leo.Liu@amd.com>; Zhou1, Tao <Tao.Zhou1@amd.com> Subject: Re: [PATCH] drm/amdgpu: disable gfxoff if VCN is busy Hi Jiansong Pls check inline. thanks! James On 2020-10-30 7:37 a.m., Jiansong Chen wrote: > Toggle on/off gfxoff during video playback to fix gpu hang. [JZ] It is a workaround, not a fix. Also Arcturus needn't this WA. > Signed-off-by: Jiansong Chen <Jiansong.Chen@amd.com> > Change-Id: I5b938c446884268c2cda0801121a53da980e603a > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c > index 277a8435dd06..444b89413232 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c > @@ -358,6 +358,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work) > } > > if (!fences && !atomic_read(&adev->vcn.total_submission_cnt)) { > +amdgpu_gfx_off_ctrl(adev, true); > amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, > AMD_PG_STATE_GATE); > } else { > @@ -368,13 +369,16 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work) > void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring) > { > struct amdgpu_device *adev = ring->adev; > +bool set_clocks = !cancel_delayed_work_sync(&adev->vcn.idle_work); > > atomic_inc(&adev->vcn.total_submission_cnt); > -cancel_delayed_work_sync(&adev->vcn.idle_work); > > mutex_lock(&adev->vcn.vcn_pg_lock); > -amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, > - AMD_PG_STATE_UNGATE); > +if (set_clocks) { > +amdgpu_gfx_off_ctrl(adev, false); [JZ] Move the above two lines before mutex_lock(&adev->vcn.vcn_pg_lock); Since it may cause S3 test failure. > +amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, > +AMD_PG_STATE_UNGATE); > +} > > if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG){ > struct dpg_pause_state new_state; _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-30 14:58 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-10-30 11:37 [PATCH] drm/amdgpu: disable gfxoff if VCN is busy Jiansong Chen 2020-10-30 11:43 ` Zhang, Hawking 2020-10-30 13:06 ` James Zhu 2020-10-30 14:58 ` Chen, Jiansong (Simon)
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox