Mesa (master): i965/bxt: Don't use brw_device_info_skl_early on BXT

[Neil Roberts]

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

Author: Neil Roberts <neil at linux.intel.com>
Date:   Wed Jul 29 17:40:37 2015 +0100

i965/bxt: Don't use brw_device_info_skl_early on BXT

Previously it could end up using the “SKL early” device on BXT
depending on the revision number. This would probably break things
because for example has_llc would be wrong.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/brw_device_info.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_device_info.c b/src/mesa/drivers/dri/i965/brw_device_info.c
index 6fe6ea2..2c5d778 100644
--- a/src/mesa/drivers/dri/i965/brw_device_info.c
+++ b/src/mesa/drivers/dri/i965/brw_device_info.c
@@ -365,7 +365,9 @@ brw_get_device_info(int devid, int revision)
       return NULL;
    }
 
-   if (devinfo->gen == 9 && (revision == 2 || revision == 3 || revision == -1))
+   if (devinfo->gen == 9 &&
+       !devinfo->is_broxton &&
+       (revision == 2 || revision == 3 || revision == -1))
       return &brw_device_info_skl_early;
 
    return devinfo;