Mesa (amdgpu): winsys/amdgpu: require LLVM 3.6.1 for VI because of bug fixes there

[Marek Olšák]

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

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

winsys/amdgpu: require LLVM 3.6.1 for VI because of bug fixes there

Trivial.

---

 src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
index 8776dfd..78ce999 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
@@ -187,9 +187,11 @@ static boolean do_winsys_init(struct amdgpu_winsys *ws)
    }
 
    /* 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);
+   if (ws->info.chip_class >= VI &&
+       (HAVE_LLVM < 0x0306 ||
+        (HAVE_LLVM == 0x0306 && MESA_LLVM_VERSION_PATCH < 1))) {
+      fprintf(stderr, "amdgpu: LLVM 3.6.1 is required, got LLVM %i.%i.%i\n",
+              HAVE_LLVM >> 8, HAVE_LLVM & 255, MESA_LLVM_VERSION_PATCH);
       goto fail;
    }