diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-09-28 07:31:07 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-11-08 16:04:11 +1000 |
| commit | 4255118450f1324d58442267a87d740394c9da33 (patch) | |
| tree | 76b18fb0743cd96f5b276421c0e73cae310fab37 | |
| parent | f3f43c753f1e9296a50411b24d0fba2dd11635b5 (diff) | |
drm/nouveau/device: use an additional bit from NV_PMC_BOOT_0 to identify chipset
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/device/base.c | 6 |
1 files 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; |