diff --git a/src/amd/common/amd_family.c b/src/amd/common/amd_family.c
index 4de42c28d41..ce401119496 100644
--- a/src/amd/common/amd_family.c
+++ b/src/amd/common/amd_family.c
@@ -9,6 +9,10 @@
 #include "util/macros.h"
 #include "ac_gpu_info.h"
 
+#if AMD_LLVM_AVAILABLE
+#include <llvm/Config/llvm-config.h>
+#endif
+
 const char *ac_get_family_name(enum radeon_family family)
 {
    switch (family) {
@@ -208,7 +212,11 @@ const char *ac_get_llvm_processor_name(enum radeon_family family)
    case CHIP_MI200:
       return "gfx90a";
    case CHIP_GFX940:
-      return "gfx940";
+      return
+#if AMD_LLVM_AVAILABLE
+             LLVM_VERSION_MAJOR >= 17 ? "gfx942" :
+#endif
+             "gfx940";
    case CHIP_NAVI10:
       return "gfx1010";
    case CHIP_NAVI12:
diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build
index c8b17fb4341..a90b8e28bd3 100644
--- a/src/amd/common/meson.build
+++ b/src/amd/common/meson.build
@@ -126,7 +126,7 @@ libamd_common = static_library(
   include_directories : [
     inc_include, inc_src, inc_amd,
   ],
-  dependencies : [
+  dependencies : [dep_llvm.partial_dependency(compile_args: true, includes: true)] + [
     dep_thread, dep_elf, dep_libdrm_amdgpu, dep_valgrind,
     idep_mesautil, idep_nir_headers, idep_nir
   ],