From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 3 Oct 2013 02:33:16 +0000 (-0700)
Subject: 3.4-stable patches
X-Git-Tag: v3.0.99~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57cd2b8ce6501f7a5eaf256aad459748bba3c498;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	drm-radeon-disable-tests-benchmarks-if-accel-is-disabled.patch
---

diff --git a/queue-3.4/drm-radeon-disable-tests-benchmarks-if-accel-is-disabled.patch b/queue-3.4/drm-radeon-disable-tests-benchmarks-if-accel-is-disabled.patch
new file mode 100644
index 00000000000..1361d4a8649
--- /dev/null
+++ b/queue-3.4/drm-radeon-disable-tests-benchmarks-if-accel-is-disabled.patch
@@ -0,0 +1,49 @@
+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
+@@ -835,13 +835,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;
+ }
diff --git a/queue-3.4/series b/queue-3.4/series
index 2b70987db0e..86951c11d0f 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -8,3 +8,4 @@ usb-core-devio.c-don-t-reject-control-message-to-endpoint-with-wrong-direction-b
 dm-snapshot-workaround-for-a-false-positive-lockdep-warning.patch
 dm-snapshot-fix-performance-degradation-due-to-small-hash-size.patch
 drm-i915-dp-increase-i2c-over-aux-retry-interval-on-aux-defer.patch
+drm-radeon-disable-tests-benchmarks-if-accel-is-disabled.patch