diff options
author | Christian König <deathsimple@vodafone.de> | 2012-07-07 06:47:58 -0400 |
---|---|---|
committer | Christian König <deathsimple@vodafone.de> | 2012-07-17 04:33:01 -0400 |
commit | 04eb2206d8022dc4a1eadb5e9cc5122c84959881 (patch) | |
tree | 9ff53292fea4cd2161d1ebde8407b71dd2720285 /drivers/gpu/drm/radeon/si.c | |
parent | c6105f249a637e1bb2b04b1cad7feaf507d06e8c (diff) |
drm/radeon: move radeon_ib_ring_tests out of chipset code
Making it easier to control when it is executed.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/si.c')
-rw-r--r-- | drivers/gpu/drm/radeon/si.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 2b691abef4f7..f61b550f9efd 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c | |||
@@ -3756,27 +3756,6 @@ static int si_startup(struct radeon_device *rdev) | |||
3756 | return r; | 3756 | return r; |
3757 | } | 3757 | } |
3758 | 3758 | ||
3759 | r = radeon_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]); | ||
3760 | if (r) { | ||
3761 | DRM_ERROR("radeon: failed testing IB (%d) on CP ring 0\n", r); | ||
3762 | rdev->accel_working = false; | ||
3763 | return r; | ||
3764 | } | ||
3765 | |||
3766 | r = radeon_ib_test(rdev, CAYMAN_RING_TYPE_CP1_INDEX, &rdev->ring[CAYMAN_RING_TYPE_CP1_INDEX]); | ||
3767 | if (r) { | ||
3768 | DRM_ERROR("radeon: failed testing IB (%d) on CP ring 1\n", r); | ||
3769 | rdev->accel_working = false; | ||
3770 | return r; | ||
3771 | } | ||
3772 | |||
3773 | r = radeon_ib_test(rdev, CAYMAN_RING_TYPE_CP2_INDEX, &rdev->ring[CAYMAN_RING_TYPE_CP2_INDEX]); | ||
3774 | if (r) { | ||
3775 | DRM_ERROR("radeon: failed testing IB (%d) on CP ring 2\n", r); | ||
3776 | rdev->accel_working = false; | ||
3777 | return r; | ||
3778 | } | ||
3779 | |||
3780 | r = radeon_vm_manager_init(rdev); | 3759 | r = radeon_vm_manager_init(rdev); |
3781 | if (r) { | 3760 | if (r) { |
3782 | dev_err(rdev->dev, "vm manager initialization failed (%d).\n", r); | 3761 | dev_err(rdev->dev, "vm manager initialization failed (%d).\n", r); |