Mesa (amdgpu): Revert "radeon/llvm: require LLVM 3.6.1 because it has stable VI support"

[Marek Olšák]

Module: Mesa
Branch: amdgpu
Commit: 475dc8a1fa1a641add9e807c3f6a7b88bb6ebf60
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=475dc8a1fa1a641add9e807c3f6a7b88bb6ebf60

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Jun 16 15:35:08 2015 +0200

Revert "radeon/llvm: require LLVM 3.6.1 because it has stable VI support"

This reverts commit 4b8787ac1c511af4c222bf0f152d55d7c98cd4aa.

---

 configure.ac                                  |    2 +-
 src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index e6e9d9e..6e52d43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2052,7 +2052,7 @@ radeon_llvm_check() {
     if test "x$enable_gallium_llvm" != "xyes"; then
         AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
     fi
-    llvm_check_version_for "3" "6" "1" $1
+    llvm_check_version_for "3" "4" "2" $1 
     if test true && $LLVM_CONFIG --targets-built | grep -qvw 'R600' ; then
         AC_MSG_ERROR([LLVM R600 Target not enabled.  You can enable it when building the LLVM
                       sources with the --enable-experimental-targets=R600
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
index 5651fdb..8776dfd 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
@@ -186,6 +186,13 @@ static boolean do_winsys_init(struct amdgpu_winsys *ws)
       goto fail;
    }
 
+   /* LLVM 3.6 is required for VI. */
+   if (ws->info.chip_class >= VI && HAVE_LLVM < 0x0306) {
+      fprintf(stderr, "amdgpu: LLVM 3.6 is required, got LLVM %i.%i.\n",
+              HAVE_LLVM >> 8, HAVE_LLVM & 255);
+      goto fail;
+   }
+
    /* family and rev_id are for addrlib */
    switch (ws->info.family) {
    case CHIP_BONAIRE: