From 2b636243265f0f09b7fd8d42046119222a63cad4 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 7 Aug 2012 12:05:35 -0700
Subject: intel: In the i915 driver, the chipset cannot be i965

In the i965 dirver, the chipset must be i965.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
---
 src/mesa/drivers/dri/intel/intel_screen.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/mesa/drivers/dri')

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index f3592af621a..cdae702adf5 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -733,20 +733,17 @@ intelCreateContext(gl_api api,
 
 #ifdef I915
    if (IS_9XX(intelScreen->deviceID)) {
-      if (!IS_965(intelScreen->deviceID)) {
-	 success = i915CreateContext(api, mesaVis, driContextPriv,
-				     sharedContextPrivate);
-      }
+      success = i915CreateContext(api, mesaVis, driContextPriv,
+                                  sharedContextPrivate);
    } else {
       intelScreen->no_vbo = true;
       success = i830CreateContext(mesaVis, driContextPriv,
 				  sharedContextPrivate);
    }
 #else
-   if (IS_965(intelScreen->deviceID))
-      success = brwCreateContext(api, mesaVis,
-			      driContextPriv,
-			      sharedContextPrivate);
+   success = brwCreateContext(api, mesaVis,
+                             driContextPriv,
+                             sharedContextPrivate);
 #endif
 
    if (success) {
-- 
cgit v1.2.3