drm/radeon: fix UVD suspend error
Subsystems (2)
PATCH 1/1 drm/radeon: fix UVD suspend error
I met a bug recently and the kernel log:
[ 330.171875] radeon 0000:03:00.0: couldn't schedule ib [ 330.175781] [drm:radeon_uvd_suspend [radeon]] *ERROR* Error destroying UVD (-22)!
In radeon drivers, using UVD suspend is as follows:
if (rdev->has_uvd) {
uvd_v1_0_fini(rdev);
radeon_uvd_suspend(rdev);
}In radeon_ib_schedule function, we check the 'ring->ready' state, but in uvd_v1_0_fini funciton, we've cleared the ready state. So, just modify the suspend code flow to fix error.
--- drivers/gpu/drm/radeon/cik.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 2 +- drivers/gpu/drm/radeon/ni.c | 2 +- drivers/gpu/drm/radeon/r600.c | 2 +- drivers/gpu/drm/radeon/rv770.c | 2 +- drivers/gpu/drm/radeon/si.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/cik.c +1 -1
@@ -8517,8 +8517,8 @@ int cik_suspend(struct radeon_device *rdev)cik_cp_enable (rdev, false);cik_sdma_enable (rdev, false);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }if (rdev->has_vce)radeon_vce_suspend (rdev);
drivers/gpu/drm/radeon/evergreen.c +1 -1
@@ -5156,8 +5156,8 @@ int evergreen_suspend(struct radeon_device *rdev)radeon_pm_suspend (rdev);radeon_audio_fini (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }r700_cp_stop (rdev);r600_dma_stop (rdev);
drivers/gpu/drm/radeon/ni.c +1 -1
@@ -2323,8 +2323,8 @@ int cayman_suspend(struct radeon_device *rdev)cayman_cp_enable (rdev, false);cayman_dma_stop (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }evergreen_irq_suspend (rdev);radeon_wb_disable (rdev);
drivers/gpu/drm/radeon/r600.c +1 -1
@@ -3232,8 +3232,8 @@ int r600_suspend(struct radeon_device *rdev)radeon_audio_fini (rdev);r600_cp_stop (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }r600_irq_suspend (rdev);radeon_wb_disable (rdev);
drivers/gpu/drm/radeon/rv770.c +1 -1
@@ -1894,8 +1894,8 @@ int rv770_suspend(struct radeon_device *rdev)radeon_pm_suspend (rdev);radeon_audio_fini (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }r700_cp_stop (rdev);r600_dma_stop (rdev);
drivers/gpu/drm/radeon/si.c +1 -1
@@ -6800,8 +6800,8 @@ int si_suspend(struct radeon_device *rdev)si_cp_enable (rdev, false);cayman_dma_stop (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }if (rdev->has_vce)radeon_vce_suspend (rdev);
Signature · 1 line
2.20.1
Quoted 7 lines · Qiang Ma
I met a bug recently and the kernel log:
[ 330.171875] radeon 0000:03:00.0: couldn't schedule ib [ 330.175781] [drm:radeon_uvd_suspend [radeon]] *ERROR* Error destroying UVD (-22)!In radeon drivers, using UVD suspend is as follows:
Quoted 8 lines
if (rdev->has_uvd) { uvd_v1_0_fini(rdev); radeon_uvd_suspend(rdev); }In
radeon_ib_schedulefunction, we check the 'ring->ready' state, but inuvd_v1_0_finifunciton, we've cleared the ready state. So, just modify the suspend code flow to fix error.
It seems reasonable to me. The suspend sends the destroy message if there is still incomplete job, so it should be before the fini which stops the hardware.
The series are:
Quoted 95 lines
Signed-off-by Qiang Ma <[email protected]>--- drivers/gpu/drm/radeon/cik.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 2 +- drivers/gpu/drm/radeon/ni.c | 2 +- drivers/gpu/drm/radeon/r600.c | 2 +- drivers/gpu/drm/radeon/rv770.c | 2 +- drivers/gpu/drm/radeon/si.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/radeon/cik.c +1
-1@@ -8517,8 +8517,8 @@ int cik_suspend(struct radeon_device *rdev)cik_cp_enable (rdev, false);cik_sdma_enable (rdev, false);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }if (rdev->has_vce)radeon_vce_suspend (rdev);drivers/gpu/drm/radeon/evergreen.c +1
-1@@ -5156,8 +5156,8 @@ int evergreen_suspend(struct radeon_device *rdev)radeon_pm_suspend (rdev);radeon_audio_fini (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }r700_cp_stop (rdev);r600_dma_stop (rdev);drivers/gpu/drm/radeon/ni.c +1
-1@@ -2323,8 +2323,8 @@ int cayman_suspend(struct radeon_device *rdev)cayman_cp_enable (rdev, false);cayman_dma_stop (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }evergreen_irq_suspend (rdev);radeon_wb_disable (rdev);drivers/gpu/drm/radeon/r600.c +1
-1@@ -3232,8 +3232,8 @@ int r600_suspend(struct radeon_device *rdev)radeon_audio_fini (rdev);r600_cp_stop (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }r600_irq_suspend (rdev);radeon_wb_disable (rdev);drivers/gpu/drm/radeon/rv770.c +1
-1@@ -1894,8 +1894,8 @@ int rv770_suspend(struct radeon_device *rdev)radeon_pm_suspend (rdev);radeon_audio_fini (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }r700_cp_stop (rdev);r600_dma_stop (rdev);drivers/gpu/drm/radeon/si.c +1
-1@@ -6800,8 +6800,8 @@ int si_suspend(struct radeon_device *rdev)si_cp_enable (rdev, false);cayman_dma_stop (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }if (rdev->has_vce)radeon_vce_suspend (rdev);
Alex Deucher
AppliedApplied. Thanks!
Quoted 123 lines · Leo Liu
Quoted 7 lines · Qiang Ma
I met a bug recently and the kernel log:
[ 330.171875] radeon 0000:03:00.0: couldn't schedule ib [ 330.175781] [drm:radeon_uvd_suspend [radeon]] *ERROR* Error destroying UVD (-22)!In radeon drivers, using UVD suspend is as follows:
Quoted 8 lines
if (rdev->has_uvd) { uvd_v1_0_fini(rdev); radeon_uvd_suspend(rdev); }In
radeon_ib_schedulefunction, we check the 'ring->ready' state, but inuvd_v1_0_finifunciton, we've cleared the ready state. So, just modify the suspend code flow to fix error.It seems reasonable to me. The suspend sends the destroy message if there is still incomplete job, so it should be before the fini which stops the hardware.
The series are:
Reviewed-by Leo Liu <[email protected]>Quoted 95 lines
Signed-off-by Qiang Ma <[email protected]>--- drivers/gpu/drm/radeon/cik.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 2 +- drivers/gpu/drm/radeon/ni.c | 2 +- drivers/gpu/drm/radeon/r600.c | 2 +- drivers/gpu/drm/radeon/rv770.c | 2 +- drivers/gpu/drm/radeon/si.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/radeon/cik.c +1
-1@@ -8517,8 +8517,8 @@ int cik_suspend(struct radeon_device *rdev)cik_cp_enable (rdev, false);cik_sdma_enable (rdev, false);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }if (rdev->has_vce)radeon_vce_suspend (rdev);drivers/gpu/drm/radeon/evergreen.c +1
-1@@ -5156,8 +5156,8 @@ int evergreen_suspend(struct radeon_device *rdev)radeon_pm_suspend (rdev);radeon_audio_fini (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }r700_cp_stop (rdev);r600_dma_stop (rdev);drivers/gpu/drm/radeon/ni.c +1
-1@@ -2323,8 +2323,8 @@ int cayman_suspend(struct radeon_device *rdev)cayman_cp_enable (rdev, false);cayman_dma_stop (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }evergreen_irq_suspend (rdev);radeon_wb_disable (rdev);drivers/gpu/drm/radeon/r600.c +1
-1@@ -3232,8 +3232,8 @@ int r600_suspend(struct radeon_device *rdev)radeon_audio_fini (rdev);r600_cp_stop (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }r600_irq_suspend (rdev);radeon_wb_disable (rdev);drivers/gpu/drm/radeon/rv770.c +1
-1@@ -1894,8 +1894,8 @@ int rv770_suspend(struct radeon_device *rdev)radeon_pm_suspend (rdev);radeon_audio_fini (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }r700_cp_stop (rdev);r600_dma_stop (rdev);drivers/gpu/drm/radeon/si.c +1
-1@@ -6800,8 +6800,8 @@ int si_suspend(struct radeon_device *rdev)si_cp_enable (rdev, false);cayman_dma_stop (rdev);if (rdev->has_uvd) { -uvd_v1_0_fini (rdev);radeon_uvd_suspend (rdev); +uvd_v1_0_fini (rdev); }if (rdev->has_vce)radeon_vce_suspend (rdev);