diff options
| author | Alex Deucher | 2013-08-29 00:24:00 +0200 |
|---|---|---|
| committer | Alex Deucher | 2013-08-30 22:31:13 +0200 |
| commit | a7f28f0f55ce484ef6047fa1f42d57daaeb1b634 (patch) | |
| tree | c6adf83390269b4a4fdc7dc7c1f24f3180ded5f3 /drivers/gpu | |
| parent | drm/radeon: split out radeon_uvd_resume from uvd_v4_2_resume (diff) | |
| download | kernel-qcow2-linux-a7f28f0f55ce484ef6047fa1f42d57daaeb1b634.tar.gz kernel-qcow2-linux-a7f28f0f55ce484ef6047fa1f42d57daaeb1b634.tar.xz kernel-qcow2-linux-a7f28f0f55ce484ef6047fa1f42d57daaeb1b634.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/uvd_v1_0.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |