Mesa (master): nv50: support 3D class 0x8597, remove redundant unknown chipset detection

Ben Skeggs darktama at kemper.freedesktop.org
Thu Oct 22 11:59:05 UTC 2009


Module: Mesa
Branch: master
Commit: eebf4b5299a880f4cdf8a916b4e1ca0bd79a6f07
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=eebf4b5299a880f4cdf8a916b4e1ca0bd79a6f07

Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Thu Oct 22 21:55:22 2009 +1000

nv50: support 3D class 0x8597, remove redundant unknown chipset detection

---

 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 0bd5487..63dce0f 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) {




More information about the mesa-commit mailing list