| From 4a1132a023eb48cf10522d84c5908d43b612c041 Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Mon, 23 Sep 2013 10:38:26 -0400 |
| Subject: drm/radeon: disable tests/benchmarks if accel is disabled |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| commit 4a1132a023eb48cf10522d84c5908d43b612c041 upstream. |
| |
| The tests are only usable if the acceleration engines have |
| been successfully initialized. |
| |
| Based on an initial patch from: Alex Ivanov <gnidorah@p0n4ik.tk> |
| |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/radeon/radeon_device.c | 15 ++++++++++++--- |
| 1 file changed, 12 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/gpu/drm/radeon/radeon_device.c |
| +++ b/drivers/gpu/drm/radeon/radeon_device.c |
| @@ -1196,13 +1196,22 @@ int radeon_device_init(struct radeon_dev |
| return r; |
| } |
| if ((radeon_testing & 1)) { |
| - radeon_test_moves(rdev); |
| + if (rdev->accel_working) |
| + radeon_test_moves(rdev); |
| + else |
| + DRM_INFO("radeon: acceleration disabled, skipping move tests\n"); |
| } |
| if ((radeon_testing & 2)) { |
| - radeon_test_syncing(rdev); |
| + if (rdev->accel_working) |
| + radeon_test_syncing(rdev); |
| + else |
| + DRM_INFO("radeon: acceleration disabled, skipping sync tests\n"); |
| } |
| if (radeon_benchmarking) { |
| - radeon_benchmark(rdev, radeon_benchmarking); |
| + if (rdev->accel_working) |
| + radeon_benchmark(rdev, radeon_benchmarking); |
| + else |
| + DRM_INFO("radeon: acceleration disabled, skipping benchmarks\n"); |
| } |
| return 0; |
| } |
