diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2009-10-22 21:55:22 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2009-10-22 21:56:32 +1000 |
| commit | eebf4b5299a880f4cdf8a916b4e1ca0bd79a6f07 (patch) | |
| tree | d08daaedebea921a7c3ea2cd77fa8716f31522b4 | |
| parent | 511bd5f32b67f903b590f00f7ccf8132127ef2e4 (diff) | |
nv50: support 3D class 0x8597, remove redundant unknown chipset detection
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_screen.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c index 0bd5487695..63dce0f4c2 100644 --- a/src/gallium/drivers/nv50/nv50_screen.c +++ b/src/gallium/drivers/nv50/nv50_screen.c @@ -218,7 +218,16 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev) tesla_class = NV54TCL; break; case 0xa0: - tesla_class = NVA0TCL; + switch (chipset) { + case 0xa0: + case 0xaa: + case 0xac: + tesla_class = NVA0TCL; + break; + default: + tesla_class = 0x8597; + break; + } break; default: NOUVEAU_ERR("Not a known NV50 chipset: NV%02x\n", chipset); @@ -226,12 +235,6 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev) return NULL; } - if (tesla_class == 0) { - NOUVEAU_ERR("Unknown G8x chipset: NV%02x\n", chipset); - nv50_screen_destroy(pscreen); - return NULL; - } - ret = nouveau_grobj_alloc(chan, 0xbeef5097, tesla_class, &screen->tesla); if (ret) { |