From: Eric Anholt <eric@anholt.net>
Date: Fri, 15 Feb 2008 21:16:01 +0000 (-0800)
Subject: [915] Revert broken context creation change from IS_915 commit.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=19420e6c2592e8a31e2ead4bccebc1a9ccca52b1;p=mesa.git

[915] Revert broken context creation change from IS_915 commit.

The IS_945 case was left to fall through to the 830 case, along with the
not-recognized-at-all case, making that dead code.
---

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index d91bb38e30d..2392c2c49cc 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -645,9 +645,11 @@ intelCreateContext(const __GLcontextModes * mesaVis,
    intelScreenPrivate *intelScreen = (intelScreenPrivate *) sPriv->private;
 
 #ifdef I915
-   if (IS_915(intelScreen->deviceID)) {
-      return i915CreateContext(mesaVis, driContextPriv,
+   if (IS_9XX(intelScreen->deviceID)) {
+      if (!IS_965(intelScreen->deviceID)) {
+	 return i915CreateContext(mesaVis, driContextPriv,
 				  sharedContextPrivate);
+      }
    } else {
       return i830CreateContext(mesaVis, driContextPriv, sharedContextPrivate);
    }