[AMD Official Use Only]
Different from the 1st patch(for amdgpu_gfx_off_ctrl) of the series, "cancel_delayed_work_sync(&adev->uvd.idle_work)" will be called on like amdgpu_uvd_ring_begin_use(). Under this case, does it make any difference from previous implementation "schedule_delayed_work"? Suppose the sequence is as below:
* Ring begin use * Ring end use --> mod_delayed_work() : queue a new delayed work, right? * Ring begin use (within 1s) --> cancel_delayed_work_sync() will cancel the work submitted above, right? * Ring end use --> mod_delayed_work(): queue another new scheduled work, same as previous "schedule_delayed_work"?
BR Evan From: amd-gfx amd-gfx-bounces@lists.freedesktop.org On Behalf Of Koenig, Christian Sent: Thursday, August 12, 2021 5:34 AM To: Michel Dänzer michel@daenzer.net; Deucher, Alexander Alexander.Deucher@amd.com Cc: Liu, Leo Leo.Liu@amd.com; Zhu, James James.Zhu@amd.com; amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org Subject: AW: [PATCH 2/2] drm/amdgpu: Use mod_delayed_work in JPEG/UVD/VCE/VCN ring_end_use hooks
NAK to at least this patch.
Since activating power management while submitting work is problematic cancel_delayed_work() must have been called during begin use or otherwise we have a serious coding problem in the first place.
So this change shouldn't make a difference and I suggest to really stick with schedule_delayed_work().
Maybe add a comment how this works?
Need to take a closer look at the first patch when I'm back from vacation, but it could be that this applies there as well.
Regards, Christian.
________________________________ Von: Michel Dänzer <michel@daenzer.netmailto:michel@daenzer.net> Gesendet: Mittwoch, 11. August 2021 18:52 An: Deucher, Alexander <Alexander.Deucher@amd.commailto:Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.commailto:Christian.Koenig@amd.com> Cc: Liu, Leo <Leo.Liu@amd.commailto:Leo.Liu@amd.com>; Zhu, James <James.Zhu@amd.commailto:James.Zhu@amd.com>; amd-gfx@lists.freedesktop.orgmailto:amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.orgmailto:amd-gfx@lists.freedesktop.org>; dri-devel@lists.freedesktop.orgmailto:dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.orgmailto:dri-devel@lists.freedesktop.org> Betreff: [PATCH 2/2] drm/amdgpu: Use mod_delayed_work in JPEG/UVD/VCE/VCN ring_end_use hooks
From: Michel Dänzer <mdaenzer@redhat.commailto:mdaenzer@redhat.com>
In contrast to schedule_delayed_work, this pushes back the work if it was already scheduled before. Specific behaviour change:
Before:
The scheduled work ran ~1 second after the first time ring_end_use was called, even if the ring was used again during that second.
After:
The scheduled work runs ~1 second after the last time ring_end_use is called.
Inspired by the corresponding change in amdgpu_gfx_off_ctrl. While I haven't run into specific issues in this case, the new behaviour makes more sense to me.
Signed-off-by: Michel Dänzer <mdaenzer@redhat.commailto:mdaenzer@redhat.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c index 8996cb4ed57a..2c0040153f6c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c @@ -110,7 +110,7 @@ void amdgpu_jpeg_ring_begin_use(struct amdgpu_ring *ring) void amdgpu_jpeg_ring_end_use(struct amdgpu_ring *ring) { atomic_dec(&ring->adev->jpeg.total_submission_cnt); - schedule_delayed_work(&ring->adev->jpeg.idle_work, JPEG_IDLE_TIMEOUT); + mod_delayed_work(system_wq, &ring->adev->jpeg.idle_work, JPEG_IDLE_TIMEOUT); }
int amdgpu_jpeg_dec_ring_test_ring(struct amdgpu_ring *ring) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index 0f576f294d8a..b6b1d7eeb8e5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -1283,7 +1283,7 @@ void amdgpu_uvd_ring_begin_use(struct amdgpu_ring *ring) void amdgpu_uvd_ring_end_use(struct amdgpu_ring *ring) { if (!amdgpu_sriov_vf(ring->adev)) - schedule_delayed_work(&ring->adev->uvd.idle_work, UVD_IDLE_TIMEOUT); + mod_delayed_work(system_wq, &ring->adev->uvd.idle_work, UVD_IDLE_TIMEOUT); }
/** diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index 1ae7f824adc7..2253c18a6688 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c @@ -401,7 +401,7 @@ void amdgpu_vce_ring_begin_use(struct amdgpu_ring *ring) void amdgpu_vce_ring_end_use(struct amdgpu_ring *ring) { if (!amdgpu_sriov_vf(ring->adev)) - schedule_delayed_work(&ring->adev->vce.idle_work, VCE_IDLE_TIMEOUT); + mod_delayed_work(system_wq, &ring->adev->vce.idle_work, VCE_IDLE_TIMEOUT); }
/** diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c index 284bb42d6c86..d5937ab5ac80 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c @@ -1874,7 +1874,7 @@ void vcn_v1_0_set_pg_for_begin_use(struct amdgpu_ring *ring, bool set_clocks)
void vcn_v1_0_ring_end_use(struct amdgpu_ring *ring) { - schedule_delayed_work(&ring->adev->vcn.idle_work, VCN_IDLE_TIMEOUT); + mod_delayed_work(system_wq, &ring->adev->vcn.idle_work, VCN_IDLE_TIMEOUT); mutex_unlock(&ring->adev->vcn.vcn1_jpeg1_workaround); }
-- 2.32.0