Mesa (9.1): dri/nouveau: NV17_3D class is not available for NV1a chipset

[Ian Romanick]

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

Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date:   Sat Feb 16 23:25:08 2013 +0100

dri/nouveau: NV17_3D class is not available for NV1a chipset

Should fix https://bugs.freedesktop.org/show_bug.cgi?id=60510

Note: this is a candidate for the stable branches

Acked-by: Francisco Jerez <currojerez at riseup.net>
(cherry picked from commit f4ebcd133b9c952fc57ce6d5df8bce8e2282d868)

---

 src/mesa/drivers/dri/nouveau/nv10_context.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/nouveau/nv10_context.c b/src/mesa/drivers/dri/nouveau/nv10_context.c
index 7eda4e0..4ffc4ef 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_context.c
@@ -469,7 +469,7 @@ nv10_context_create(struct nouveau_screen *screen, const struct gl_config *visua
 		goto fail;
 
 	/* 3D engine. */
-	if (context_chipset(ctx) >= 0x17)
+	if (context_chipset(ctx) >= 0x17 && context_chipset(ctx) != 0x1a)
 		celsius_class = NV17_3D_CLASS;
 	else if (context_chipset(ctx) >= 0x11)
 		celsius_class = NV15_3D_CLASS;