From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 19 Nov 2012 00:18:25 +0000 (+1000)
Subject: drm/nvd0/disp: remove fetching of capabilities report
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=647bf61d0399515c526c125450cadaade79b1988;p=openwrt%2Fstaging%2Fblogic.git

drm/nvd0/disp: remove fetching of capabilities report

Unused, and caused a race with evo_sync().  Will revisit using it properly
later on.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
index d0920acea741..b444aa7a8ae8 100644
--- a/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -1863,14 +1863,8 @@ nvd0_display_init(struct drm_device *dev)
 	if (push) {
 		evo_mthd(push, 0x0088, 1);
 		evo_data(push, NvEvoSync);
-		evo_mthd(push, 0x0084, 1);
-		evo_data(push, 0x00000000);
-		evo_mthd(push, 0x0084, 1);
-		evo_data(push, 0x80000000);
-		evo_mthd(push, 0x008c, 1);
-		evo_data(push, 0x00000000);
 		evo_kick(push, nvd0_mast(dev));
-		return 0;
+		return evo_sync(dev);
 	}
 
 	return -EBUSY;