From dd5b84ac3ca410ed531fb4e1038b907cfc5e1351 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Sat, 28 Sep 2013 07:31:07 +1000 Subject: [PATCH] drm/nouveau/device: use an additional bit from NV_PMC_BOOT_0 to identify chipset Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/core/engine/device/base.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/core/engine/device/base.c b/drivers/gpu/drm/nouveau/core/engine/device/base.c index de1e9eca0151..1485d7c352db 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; -- 2.34.1