diff options
| author | Rex Zhu <[email protected]> | 2018-07-27 09:00:02 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2018-08-27 16:09:53 +0000 |
| commit | 3fded222f4bf7f4c56ef4854872a39a4de08f7a8 (patch) | |
| tree | 44d0835e37d14d7227257ab58a5fa9e449091a85 /drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | |
| parent | drm/amdgpu: Ctrl gfx off via amdgpu_gfx_off_ctrl (diff) | |
| download | kernel-3fded222f4bf7f4c56ef4854872a39a4de08f7a8.tar.gz kernel-3fded222f4bf7f4c56ef4854872a39a4de08f7a8.zip | |
drm/amdgpu: Disable gfx off if VCN is busy
this patch is a workaround for the gpu hang
at video begin/end time if gfx off is enabled.
Reviewed-by: Hawking Zhang <[email protected]>
Signed-off-by: Rex Zhu <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index fd654a4406db..76e59a6e8311 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -217,6 +217,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work) fences += amdgpu_fence_count_emitted(&adev->vcn.ring_jpeg); if (fences == 0) { + amdgpu_gfx_off_ctrl(adev, true); if (adev->pm.dpm_enabled) amdgpu_dpm_enable_uvd(adev, false); else @@ -233,6 +234,7 @@ void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring) bool set_clocks = !cancel_delayed_work_sync(&adev->vcn.idle_work); if (set_clocks) { + amdgpu_gfx_off_ctrl(adev, false); if (adev->pm.dpm_enabled) amdgpu_dpm_enable_uvd(adev, true); else |