summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/radeon/r100.c
diff options
context:
space:
mode:
authorChristian König <deathsimple@vodafone.de>2012-05-02 13:11:12 (GMT)
committerDave Airlie <airlied@redhat.com>2012-05-03 08:16:10 (GMT)
commit7bd560e8852deab1977ca73d9820d8d36a283d5e (patch)
treeaf61769cdec156f6e8bc66e18681d21f0f45eec2 /drivers/gpu/drm/radeon/r100.c
parentec1a6cce779d66e11de91aeccb89473fc9fb9b0c (diff)
downloadlinux-fsl-qoriq-7bd560e8852deab1977ca73d9820d8d36a283d5e.tar.xz
drm/radeon: use central function for IB testing
Removing all the different error messages and having just one standard behaviour over all chipset generations. Signed-off-by: Christian König <deathsimple@vodafone.de> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
-rw-r--r--drivers/gpu/drm/radeon/r100.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index a0b44a5..825f117 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -3968,12 +3968,9 @@ static int r100_startup(struct radeon_device *rdev)
if (r)
return r;
- r = radeon_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]);
- if (r) {
- dev_err(rdev->dev, "failed testing IB (%d).\n", r);
- rdev->accel_working = false;
+ r = radeon_ib_ring_tests(rdev);
+ if (r)
return r;
- }
return 0;
}