From 9a5f9a17ed2f6c8d0bc7238a885388ae3d6a4d41 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Thu, 6 Jan 2011 21:19:27 -0500
Subject: [PATCH] --- yaml --- r: 228874 b: refs/heads/master c:
 7d52785d2ac1a07bc012b76cb465c9a01d830a32 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_device.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a7db761cff77..9f25a54f1554 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ace9f7b168fef492f731ba60da5c76bc0776e6d
+refs/heads/master: 7d52785d2ac1a07bc012b76cb465c9a01d830a32
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_device.c b/trunk/drivers/gpu/drm/radeon/radeon_device.c
index e35343007229..26091d602b84 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_device.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_device.c
@@ -228,6 +228,11 @@ int radeon_wb_init(struct radeon_device *rdev)
 				rdev->wb.use_event = true;
 		}
 	}
+	/* always use writeback/events on NI */
+	if (ASIC_IS_DCE5(rdev)) {
+		rdev->wb.enabled = true;
+		rdev->wb.use_event = true;
+	}
 
 	dev_info(rdev->dev, "WB %sabled\n", rdev->wb.enabled ? "en" : "dis");