aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r100.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
-rw-r--r--drivers/gpu/drm/radeon/r100.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index fcc23e4e0b3c..f2204cb1ccdf 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -3617,7 +3617,7 @@ int r100_ib_test(struct radeon_device *rdev)
3617 if (i < rdev->usec_timeout) { 3617 if (i < rdev->usec_timeout) {
3618 DRM_INFO("ib test succeeded in %u usecs\n", i); 3618 DRM_INFO("ib test succeeded in %u usecs\n", i);
3619 } else { 3619 } else {
3620 DRM_ERROR("radeon: ib test failed (sracth(0x%04X)=0x%08X)\n", 3620 DRM_ERROR("radeon: ib test failed (scratch(0x%04X)=0x%08X)\n",
3621 scratch, tmp); 3621 scratch, tmp);
3622 r = -EINVAL; 3622 r = -EINVAL;
3623 } 3623 }
@@ -3637,13 +3637,13 @@ int r100_ib_init(struct radeon_device *rdev)
3637 3637
3638 r = radeon_ib_pool_init(rdev); 3638 r = radeon_ib_pool_init(rdev);
3639 if (r) { 3639 if (r) {
3640 dev_err(rdev->dev, "failled initializing IB pool (%d).\n", r); 3640 dev_err(rdev->dev, "failed initializing IB pool (%d).\n", r);
3641 r100_ib_fini(rdev); 3641 r100_ib_fini(rdev);
3642 return r; 3642 return r;
3643 } 3643 }
3644 r = r100_ib_test(rdev); 3644 r = r100_ib_test(rdev);
3645 if (r) { 3645 if (r) {
3646 dev_err(rdev->dev, "failled testing IB (%d).\n", r); 3646 dev_err(rdev->dev, "failed testing IB (%d).\n", r);
3647 r100_ib_fini(rdev); 3647 r100_ib_fini(rdev);
3648 return r; 3648 return r;
3649 } 3649 }
@@ -3799,12 +3799,12 @@ static int r100_startup(struct radeon_device *rdev)
3799 /* 1M ring buffer */ 3799 /* 1M ring buffer */
3800 r = r100_cp_init(rdev, 1024 * 1024); 3800 r = r100_cp_init(rdev, 1024 * 1024);
3801 if (r) { 3801 if (r) {
3802 dev_err(rdev->dev, "failled initializing CP (%d).\n", r); 3802 dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
3803 return r; 3803 return r;
3804 } 3804 }
3805 r = r100_ib_init(rdev); 3805 r = r100_ib_init(rdev);
3806 if (r) { 3806 if (r) {
3807 dev_err(rdev->dev, "failled initializing IB (%d).\n", r); 3807 dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
3808 return r; 3808 return r;
3809 } 3809 }
3810 return 0; 3810 return 0;