[PATCH v2] drm/amdgpu: disable gfxoff if VCN is busy

[Chen, Jiansong (Simon)]

[AMD Official Use Only - Internal Distribution Only]

Please ignore the change.

-----Original Message-----
From: Jiansong Chen <Jiansong.Chen at amd.com>
Sent: Friday, October 30, 2020 10:57 PM
To: amd-gfx at lists.freedesktop.org
Cc: Zhang, Hawking <Hawking.Zhang at amd.com>; Zhu, James <James.Zhu at amd.com>; Liu, Leo <Leo.Liu at amd.com>; Zhou1, Tao <Tao.Zhou1 at amd.com>; Chen, Jiansong (Simon) <Jiansong.Chen at amd.com>
Subject: [PATCH v2] drm/amdgpu: disable gfxoff if VCN is busy

Toggle on/off gfxoff during video playback to fix gpu hang.

v2: change sequence to be more compatible with original code.

Signed-off-by: Jiansong Chen <Jiansong.Chen at amd.com>
Change-Id: I5b938c446884268c2cda0801121a53da980e603a
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 277a8435dd06..ef0878e848de 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 {
@@ -370,7 +371,9 @@ void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring)
 struct amdgpu_device *adev = ring->adev;

 atomic_inc(&adev->vcn.total_submission_cnt);
-cancel_delayed_work_sync(&adev->vcn.idle_work);
+
+if (!cancel_delayed_work_sync(&adev->vcn.idle_work);)
+amdgpu_gfx_off_ctrl(adev, false);

 mutex_lock(&adev->vcn.vcn_pg_lock);
 amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN,
--
2.25.1