i965/bxt: Don't use brw_device_info_skl_early on BXT
authorNeil Roberts <neil@linux.intel.com>
Wed, 29 Jul 2015 16:40:37 +0000 (17:40 +0100)
committerNeil Roberts <neil@linux.intel.com>
Thu, 30 Jul 2015 10:45:27 +0000 (11:45 +0100)
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@whitecape.org>
src/mesa/drivers/dri/i965/brw_device_info.c

index 6fe6ea2eb560035b3700a82cd313ae48503089d6..2c5d778dbd2b8bef0a669674a380978d70b89cbf 100644 (file)
@@ -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;