From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 27 Sep 2013 21:31:07 +0000 (+1000)
Subject: drm/nouveau/device: use an additional bit from NV_PMC_BOOT_0 to identify chipset
X-Git-Tag: v3.13-rc8~13^2~76
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd5b84ac3ca410ed531fb4e1038b907cfc5e1351;p=platform%2Fkernel%2Flinux-stable.git

drm/nouveau/device: use an additional bit from NV_PMC_BOOT_0 to identify chipset

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

diff --git a/drivers/gpu/drm/nouveau/core/engine/device/base.c b/drivers/gpu/drm/nouveau/core/engine/device/base.c
index de1e9ec..1485d7c 100644
--- a/drivers/gpu/drm/nouveau/core/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/core/engine/device/base.c
@@ -158,9 +158,9 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
 		iounmap(map);
 
 		/* determine chipset and derive architecture from it */
-		if ((boot0 & 0x0f000000) > 0) {
-			device->chipset = (boot0 & 0xff00000) >> 20;
-			switch (device->chipset & 0xf0) {
+		if ((boot0 & 0x1f000000) > 0) {
+			device->chipset = (boot0 & 0x1ff00000) >> 20;
+			switch (device->chipset & 0x1f0) {
 			case 0x10: {
 				if (0x461 & (1 << (device->chipset & 0xf)))
 					device->card_type = NV_10;