|
 |
5394ba7 |
From b67e0a6a7409f9c1a12e573fb7d8d80ee455b103 Mon Sep 17 00:00:00 2001
|
|
|
5394ba7 |
From: Adam Jackson <ajax@redhat.com>
|
|
|
5394ba7 |
Date: Mon, 17 Jun 2013 09:59:34 -0400
|
|
|
5394ba7 |
Subject: [PATCH] drm/radeon: Disable writeback by default on ppc
|
|
|
5394ba7 |
|
|
|
5394ba7 |
At least on an IBM Power 720, this check passes, but several piglit
|
|
|
5394ba7 |
tests will reliably trigger GPU resets due to the ring buffer pointers
|
|
|
5394ba7 |
not being updated. There's probably a better way to limit this to just
|
|
|
5394ba7 |
affected machines though.
|
|
|
5394ba7 |
|
|
|
5394ba7 |
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
|
5394ba7 |
---
|
|
|
5394ba7 |
drivers/gpu/drm/radeon/r600_cp.c | 7 +++++++
|
|
|
5394ba7 |
drivers/gpu/drm/radeon/radeon_cp.c | 7 +++++++
|
|
|
5394ba7 |
drivers/gpu/drm/radeon/radeon_device.c | 4 ++--
|
|
|
5394ba7 |
drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
|
|
|
5394ba7 |
4 files changed, 17 insertions(+), 3 deletions(-)
|
|
|
5394ba7 |
|
|
|
5394ba7 |
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
|
|
|
5394ba7 |
index 1c51c08..ef28532 100644
|
|
|
5394ba7 |
--- a/drivers/gpu/drm/radeon/r600_cp.c
|
|
|
5394ba7 |
+++ b/drivers/gpu/drm/radeon/r600_cp.c
|
|
|
5394ba7 |
@@ -552,6 +552,13 @@ static void r600_test_writeback(drm_radeon_private_t *dev_priv)
|
|
|
5394ba7 |
dev_priv->writeback_works = 0;
|
|
|
5394ba7 |
DRM_INFO("writeback test failed\n");
|
|
|
5394ba7 |
}
|
|
|
5394ba7 |
+#if defined(__ppc__) || defined(__ppc64__)
|
|
|
5394ba7 |
+ /* the test might succeed on ppc, but it's usually not reliable */
|
|
|
5394ba7 |
+ if (radeon_no_wb == -1) {
|
|
|
5394ba7 |
+ radeon_no_wb = 1;
|
|
|
5394ba7 |
+ DRM_INFO("not trusting writeback test due to arch quirk\n");
|
|
|
5394ba7 |
+ }
|
|
|
5394ba7 |
+#endif
|
|
|
5394ba7 |
if (radeon_no_wb == 1) {
|
|
|
5394ba7 |
dev_priv->writeback_works = 0;
|
|
|
5394ba7 |
DRM_INFO("writeback forced off\n");
|
|
|
5394ba7 |
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
|
|
|
5394ba7 |
index efc4f64..a967b33 100644
|
|
|
5394ba7 |
--- a/drivers/gpu/drm/radeon/radeon_cp.c
|
|
|
5394ba7 |
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
|
|
|
5394ba7 |
@@ -892,6 +892,13 @@ static void radeon_test_writeback(drm_radeon_private_t * dev_priv)
|
|
|
5394ba7 |
dev_priv->writeback_works = 0;
|
|
|
5394ba7 |
DRM_INFO("writeback test failed\n");
|
|
|
5394ba7 |
}
|
|
|
5394ba7 |
+#if defined(__ppc__) || defined(__ppc64__)
|
|
|
5394ba7 |
+ /* the test might succeed on ppc, but it's usually not reliable */
|
|
|
5394ba7 |
+ if (radeon_no_wb == -1) {
|
|
|
5394ba7 |
+ radeon_no_wb = 1;
|
|
|
5394ba7 |
+ DRM_INFO("not trusting writeback test due to arch quirk\n");
|
|
|
5394ba7 |
+ }
|
|
|
5394ba7 |
+#endif
|
|
|
5394ba7 |
if (radeon_no_wb == 1) {
|
|
|
5394ba7 |
dev_priv->writeback_works = 0;
|
|
|
5394ba7 |
DRM_INFO("writeback forced off\n");
|
|
|
5394ba7 |
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
|
|
|
5394ba7 |
index 1899738..524046e 100644
|
|
|
5394ba7 |
--- a/drivers/gpu/drm/radeon/radeon_device.c
|
|
|
5394ba7 |
+++ b/drivers/gpu/drm/radeon/radeon_device.c
|
|
|
5394ba7 |
@@ -322,8 +322,8 @@ int radeon_wb_init(struct radeon_device *rdev)
|
|
|
5394ba7 |
/* disable event_write fences */
|
|
|
5394ba7 |
rdev->wb.use_event = false;
|
|
|
5394ba7 |
/* disabled via module param */
|
|
|
5394ba7 |
- if (radeon_no_wb == 1) {
|
|
|
5394ba7 |
- rdev->wb.enabled = false;
|
|
|
5394ba7 |
+ if (radeon_no_wb != -1) {
|
|
|
5394ba7 |
+ rdev->wb.enabled = !!radeon_no_wb;
|
|
|
5394ba7 |
} else {
|
|
|
5394ba7 |
if (rdev->flags & RADEON_IS_AGP) {
|
|
|
5394ba7 |
/* often unreliable on AGP */
|
|
|
5394ba7 |
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
|
|
|
5394ba7 |
index 094e7e5..04809d4 100644
|
|
|
5394ba7 |
--- a/drivers/gpu/drm/radeon/radeon_drv.c
|
|
|
5394ba7 |
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
|
|
|
5394ba7 |
@@ -146,7 +146,7 @@ static inline void radeon_register_atpx_handler(void) {}
|
|
|
5394ba7 |
static inline void radeon_unregister_atpx_handler(void) {}
|
|
|
5394ba7 |
#endif
|
|
|
5394ba7 |
|
|
|
5394ba7 |
-int radeon_no_wb;
|
|
|
5394ba7 |
+int radeon_no_wb = -1;
|
|
|
5394ba7 |
int radeon_modeset = -1;
|
|
|
5394ba7 |
int radeon_dynclks = -1;
|
|
|
5394ba7 |
int radeon_r4xx_atom = 0;
|
|
|
5394ba7 |
--
|
|
|
5394ba7 |
1.8.2.1
|
|
|
5394ba7 |
|