mesa_radeonsi_patch.diff

diff --git a/configure.ac b/configure.ac
index 75b1de4..5d1f7ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2179,7 +2179,7 @@ if test "x$enable_gallium_llvm" = xyes; then
         if test -n "${LLVM_VERSION_MAJOR}"; then
             LLVM_VERSION_INT="${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}"
         else
-            LLVM_VERSION_INT=`echo $LLVM_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/\10\2/g'`
+            LLVM_VERSION_INT=`echo $LLVM_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\).*/\10\2/g'`
         fi
 
         LLVM_REQUIRED_VERSION_MAJOR="3"
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 8f9e6f5..d2aa98d 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -733,6 +733,7 @@ static void si_handle_env_var_force_family(struct si_screen *sscreen)
 {
        const char *family = debug_get_option("SI_FORCE_FAMILY", NULL);
        unsigned i;
+       sscreen->b.chip_class = sscreen->b.info.chip_class = VI;
 
        if (!family)
                return;