drm/radeon: check the return value of uvd_v1_0_start in uvd_v1_0_init

No need to try the ring tests if starting the UVD block failed.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>

diff --git a/drivers/gpu/drm/radeon/uvd_v1_0.c b/drivers/gpu/drm/radeon/uvd_v1_0.c
index 76ca669f0c8ee1555eb9e8c705f1e74e89f47961..3426be9aa38af1e90107f43ddf312608a0295cd7 100644 (file)
--- a/drivers/gpu/drm/radeon/uvd_v1_0.c
+++ b/drivers/gpu/drm/radeon/uvd_v1_0.c
@@ -85,7 +85,9 @@ int uvd_v1_0_init(struct radeon_device *rdev)
        /* raise clocks while booting up the VCPU */
        radeon_set_uvd_clocks(rdev, 53300, 40000);
 
-       uvd_v1_0_start(rdev);
+       r = uvd_v1_0_start(rdev);
+       if (r)
+               goto done;
 
        ring->ready = true;
        r = radeon_ring_test(rdev, R600_RING_TYPE_UVD_INDEX, ring);