From: Alex Deucher <alexander.deucher@amd.com>
Date: Wed, 28 Aug 2013 22:24:00 +0000 (-0400)
Subject: drm/radeon: check the return value of uvd_v1_0_start in uvd_v1_0_init
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=a7f28f0f55ce484ef6047fa1f42d57daaeb1b634;p=deliverable%2Flinux.git

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 76ca669f0c8e..3426be9aa38a 100644
--- 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);