diff options
Diffstat (limited to 'src/gallium/drivers/nouveau/nvc0')
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_compute.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 10 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nve4_compute.c | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c index b49f1ae..ad287a2 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c @@ -35,7 +35,7 @@ nvc0_screen_compute_setup(struct nvc0_screen *screen, int ret; int i; - switch (dev->chipset & 0xf0) { + switch (dev->chipset & ~0xf) { case 0xc0: if (dev->chipset == 0xc8) obj_class = NVC8_COMPUTE_CLASS; diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index 62ab2a2..2c3a697 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -478,7 +478,7 @@ nvc0_screen_init_compute(struct nvc0_screen *screen) { screen->base.base.get_compute_param = nvc0_screen_get_compute_param; - switch (screen->base.device->chipset & 0xf0) { + switch (screen->base.device->chipset & ~0xf) { case 0xc0: case 0xd0: /* Using COMPUTE has weird effects on 3D state, we need to @@ -489,6 +489,7 @@ nvc0_screen_init_compute(struct nvc0_screen *screen) return 0; case 0xe0: case 0xf0: + case 0x100: return nve4_screen_compute_setup(screen, screen->base.pushbuf); default: return -1; @@ -550,6 +551,7 @@ nvc0_screen_create(struct nouveau_device *dev) case 0xd0: case 0xe0: case 0xf0: + case 0x100: break; default: return NULL; @@ -597,7 +599,8 @@ nvc0_screen_create(struct nouveau_device *dev) screen->base.fence.emit = nvc0_screen_fence_emit; screen->base.fence.update = nvc0_screen_fence_update; - switch (dev->chipset & 0xf0) { + switch (dev->chipset & ~0xf) { + case 0x100: case 0xf0: obj_class = NVF0_P2MF_CLASS; break; @@ -644,7 +647,8 @@ nvc0_screen_create(struct nouveau_device *dev) PUSH_DATAh(push, screen->fence.bo->offset + 16); PUSH_DATA (push, screen->fence.bo->offset + 16); - switch (dev->chipset & 0xf0) { + switch (dev->chipset & ~0xf) { + case 0x100: case 0xf0: obj_class = NVF0_3D_CLASS; break; diff --git a/src/gallium/drivers/nouveau/nvc0/nve4_compute.c b/src/gallium/drivers/nouveau/nvc0/nve4_compute.c index 06c914f..f243316 100644 --- a/src/gallium/drivers/nouveau/nvc0/nve4_compute.c +++ b/src/gallium/drivers/nouveau/nvc0/nve4_compute.c @@ -43,7 +43,8 @@ nve4_screen_compute_setup(struct nvc0_screen *screen, int ret; uint32_t obj_class; - switch (dev->chipset & 0xf0) { + switch (dev->chipset & ~0xf) { + case 0x100: case 0xf0: obj_class = NVF0_COMPUTE_CLASS; /* GK110 */ break; |