OSDN Git Service

drm/radeon: move the IB test after the AGP fallback
authorChristian König <christian.koenig@amd.com>
Sun, 24 Aug 2014 12:52:46 +0000 (14:52 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 27 Aug 2014 16:47:48 +0000 (12:47 -0400)
Otherwise we won't test if the fallback to PCIe GART really worked.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/radeon_device.c

index a5d202a..b6aee40 100644 (file)
@@ -1397,10 +1397,6 @@ int radeon_device_init(struct radeon_device *rdev,
        if (r)
                return r;
 
-       r = radeon_ib_ring_tests(rdev);
-       if (r)
-               DRM_ERROR("ib ring test failed (%d).\n", r);
-
        r = radeon_gem_debugfs_init(rdev);
        if (r) {
                DRM_ERROR("registering gem debugfs failed (%d).\n", r);
@@ -1418,6 +1414,10 @@ int radeon_device_init(struct radeon_device *rdev,
                        return r;
        }
 
+       r = radeon_ib_ring_tests(rdev);
+       if (r)
+               DRM_ERROR("ib ring test failed (%d).\n", r);
+
        if ((radeon_testing & 1)) {
                if (rdev->accel_working)
                        radeon_test_moves(rdev);