aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r600.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
-rw-r--r--drivers/gpu/drm/radeon/r600.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 6b7a40b501c0..17fff7b6e591 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -1531,7 +1531,7 @@ int r600_resume(struct radeon_device *rdev)
1531 return r; 1531 return r;
1532 } 1532 }
1533 1533
1534 r = radeon_ib_test(rdev); 1534 r = r600_ib_test(rdev);
1535 if (r) { 1535 if (r) {
1536 DRM_ERROR("radeon: failled testing IB (%d).\n", r); 1536 DRM_ERROR("radeon: failled testing IB (%d).\n", r);
1537 return r; 1537 return r;
@@ -1562,7 +1562,6 @@ int r600_init(struct radeon_device *rdev)
1562{ 1562{
1563 int r; 1563 int r;
1564 1564
1565 rdev->new_init_path = true;
1566 r = radeon_dummy_page_init(rdev); 1565 r = radeon_dummy_page_init(rdev);
1567 if (r) 1566 if (r)
1568 return r; 1567 return r;
@@ -1653,7 +1652,7 @@ int r600_init(struct radeon_device *rdev)
1653 DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r); 1652 DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r);
1654 rdev->accel_working = false; 1653 rdev->accel_working = false;
1655 } 1654 }
1656 r = radeon_ib_test(rdev); 1655 r = r600_ib_test(rdev);
1657 if (r) { 1656 if (r) {
1658 DRM_ERROR("radeon: failled testing IB (%d).\n", r); 1657 DRM_ERROR("radeon: failled testing IB (%d).\n", r);
1659 rdev->accel_working = false; 1658 rdev->accel_working = false;