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.

Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Qiang Ma <maqianga@uniontech.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 81b4de7be9f2b2710fd437ff805330aa8b366589..5819737c21c678d3926ef8f9570fa05577123689 100644 (file)
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -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);

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index eeb590d2dec2e7a13644c9f28451f0dbfaea57c4..455f8036aa54acea5c36a57f25bb386206f8d291 100644 (file)
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -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);

diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 4a364ca7a1be71ae07beaa7de875e511a64272c8..927e5f42e97d018240b5204c9d0dd7339391292a 100644 (file)
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -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);

diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index ca3fcae2adb537539042b3e906659f8bd973a1e9..dd78fc4994024815e0758ad73aef807693a42496 100644 (file)
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -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);

diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index e592e57be1bb48da897378cf9359de7a3fd83901..38796af4fadd4d95478dc81ee5512b686aeade19 100644 (file)
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -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);

diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 013e44ed0f39a6f34ea4367f7a5640a0734adf96..8d5e4b25609d5f54571818ba064080bd6bcb9107 100644 (file)
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -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);