diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/gfx/si_blit.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_blit.c
rename to src/gallium/drivers/radeonsi/gfx/si_blit.c
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/gfx/si_compute.c
similarity index 99%
rename from src/gallium/drivers/radeonsi/si_compute.c
rename to src/gallium/drivers/radeonsi/gfx/si_compute.c
index edc9707a3a3..2daaee1a5af 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/gfx/si_compute.c
@@ -4,13 +4,12 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "gfx/si_gfx.h"
+#include "si_gfx.h"
 #include "ac_rtld.h"
 #include "nir/tgsi_to_nir.h"
 #include "ac_shader_util.h"
 #include "si_build_pm4.h"
 #include "si_shader_internal.h"
-#include "gfx/si_gfx.h"
 #include "util/u_memory.h"
 #include "util/u_upload_mgr.h"
 #include "si_tracepoints.h"
diff --git a/src/gallium/drivers/radeonsi/si_compute_blit.c b/src/gallium/drivers/radeonsi/gfx/si_compute_blit.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_compute_blit.c
rename to src/gallium/drivers/radeonsi/gfx/si_compute_blit.c
diff --git a/src/gallium/drivers/radeonsi/si_cp_reg_shadowing.c b/src/gallium/drivers/radeonsi/gfx/si_cp_reg_shadowing.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_cp_reg_shadowing.c
rename to src/gallium/drivers/radeonsi/gfx/si_cp_reg_shadowing.c
diff --git a/src/gallium/drivers/radeonsi/si_debug_gfx_compute.c b/src/gallium/drivers/radeonsi/gfx/si_debug_gfx_compute.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_debug_gfx_compute.c
rename to src/gallium/drivers/radeonsi/gfx/si_debug_gfx_compute.c
diff --git a/src/gallium/drivers/radeonsi/gfx/si_gfx.h b/src/gallium/drivers/radeonsi/gfx/si_gfx.h
index f71e4617c7e..04016a9a112 100644
--- a/src/gallium/drivers/radeonsi/gfx/si_gfx.h
+++ b/src/gallium/drivers/radeonsi/gfx/si_gfx.h
@@ -31,20 +31,20 @@ MESAPROC bool si_init_gfx_screen(struct si_screen *sscreen) TAILBT;
 MESAPROC void si_fini_gfx_screen(struct si_screen *sscreen) TAILV;
 
 /* si_shader_cache.c */
-MESAPROC void si_get_ir_cache_key(struct si_shader_selector *sel, bool ngg, bool es,
-                                  unsigned wave_size, unsigned char ir_blake3_cache_key[BLAKE3_KEY_LEN]) TAILV;
+void si_get_ir_cache_key(struct si_shader_selector *sel, bool ngg, bool es,
+                         unsigned wave_size, unsigned char ir_blake3_cache_key[BLAKE3_KEY_LEN]);
 
-MESAPROC bool si_init_shader_cache(struct si_screen *sscreen) TAILB;
+bool si_init_shader_cache(struct si_screen *sscreen);
 
-MESAPROC void si_init_screen_live_shader_cache(struct si_screen *sscreen) TAILV;
+void si_init_screen_live_shader_cache(struct si_screen *sscreen);
 
-MESAPROC void si_destroy_shader_cache(struct si_screen *sscreen) TAILV;
+void si_destroy_shader_cache(struct si_screen *sscreen);
 
-MESAPROC bool si_shader_cache_load_shader(struct si_screen *sscreen, unsigned char ir_blake3_cache_key[BLAKE3_KEY_LEN],
-                                          struct si_shader *shader) TAILB;
+bool si_shader_cache_load_shader(struct si_screen *sscreen, unsigned char ir_blake3_cache_key[BLAKE3_KEY_LEN],
+                                 struct si_shader *shader);
 
-MESAPROC void si_shader_cache_insert_shader(struct si_screen *sscreen, unsigned char ir_blake3_cache_key[BLAKE3_KEY_LEN],
-                                            struct si_shader *shader, bool insert_into_disk_cache) TAILV;
+void si_shader_cache_insert_shader(struct si_screen *sscreen, unsigned char ir_blake3_cache_key[BLAKE3_KEY_LEN],
+                                   struct si_shader *shader, bool insert_into_disk_cache);
 
 #ifdef __cplusplus
 }
diff --git a/src/gallium/drivers/radeonsi/si_mesh_shader.c b/src/gallium/drivers/radeonsi/gfx/si_mesh_shader.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_mesh_shader.c
rename to src/gallium/drivers/radeonsi/gfx/si_mesh_shader.c
diff --git a/src/gallium/drivers/radeonsi/si_nir_clamp_shadow_comparison_value.c b/src/gallium/drivers/radeonsi/gfx/si_nir_clamp_shadow_comparison_value.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_nir_clamp_shadow_comparison_value.c
rename to src/gallium/drivers/radeonsi/gfx/si_nir_clamp_shadow_comparison_value.c
diff --git a/src/gallium/drivers/radeonsi/si_nir_kill_outputs.c b/src/gallium/drivers/radeonsi/gfx/si_nir_kill_outputs.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_nir_kill_outputs.c
rename to src/gallium/drivers/radeonsi/gfx/si_nir_kill_outputs.c
diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c b/src/gallium/drivers/radeonsi/gfx/si_nir_lower_abi.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_nir_lower_abi.c
rename to src/gallium/drivers/radeonsi/gfx/si_nir_lower_abi.c
diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_color_flatshade_twoside.c b/src/gallium/drivers/radeonsi/gfx/si_nir_lower_color_flatshade_twoside.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_nir_lower_color_flatshade_twoside.c
rename to src/gallium/drivers/radeonsi/gfx/si_nir_lower_color_flatshade_twoside.c
diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_intrinsics_early.c b/src/gallium/drivers/radeonsi/gfx/si_nir_lower_intrinsics_early.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_nir_lower_intrinsics_early.c
rename to src/gallium/drivers/radeonsi/gfx/si_nir_lower_intrinsics_early.c
diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_polygon_stipple.c b/src/gallium/drivers/radeonsi/gfx/si_nir_lower_polygon_stipple.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_nir_lower_polygon_stipple.c
rename to src/gallium/drivers/radeonsi/gfx/si_nir_lower_polygon_stipple.c
diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_resource.c b/src/gallium/drivers/radeonsi/gfx/si_nir_lower_resource.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_nir_lower_resource.c
rename to src/gallium/drivers/radeonsi/gfx/si_nir_lower_resource.c
diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_vs_inputs.c b/src/gallium/drivers/radeonsi/gfx/si_nir_lower_vs_inputs.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_nir_lower_vs_inputs.c
rename to src/gallium/drivers/radeonsi/gfx/si_nir_lower_vs_inputs.c
diff --git a/src/gallium/drivers/radeonsi/si_nir_mark_divergent_texture_non_uniform.c b/src/gallium/drivers/radeonsi/gfx/si_nir_mark_divergent_texture_non_uniform.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_nir_mark_divergent_texture_non_uniform.c
rename to src/gallium/drivers/radeonsi/gfx/si_nir_mark_divergent_texture_non_uniform.c
diff --git a/src/gallium/drivers/radeonsi/si_nir_mediump.c b/src/gallium/drivers/radeonsi/gfx/si_nir_mediump.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_nir_mediump.c
rename to src/gallium/drivers/radeonsi/gfx/si_nir_mediump.c
diff --git a/src/gallium/drivers/radeonsi/si_nir_optim.c b/src/gallium/drivers/radeonsi/gfx/si_nir_optim.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_nir_optim.c
rename to src/gallium/drivers/radeonsi/gfx/si_nir_optim.c
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/gfx/si_shader.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader.c
rename to src/gallium/drivers/radeonsi/gfx/si_shader.c
diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/gfx/si_shader.h
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader.h
rename to src/gallium/drivers/radeonsi/gfx/si_shader.h
diff --git a/src/gallium/drivers/radeonsi/si_shader_aco.c b/src/gallium/drivers/radeonsi/gfx/si_shader_aco.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader_aco.c
rename to src/gallium/drivers/radeonsi/gfx/si_shader_aco.c
diff --git a/src/gallium/drivers/radeonsi/si_shader_args.c b/src/gallium/drivers/radeonsi/gfx/si_shader_args.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader_args.c
rename to src/gallium/drivers/radeonsi/gfx/si_shader_args.c
diff --git a/src/gallium/drivers/radeonsi/si_shader_binary.c b/src/gallium/drivers/radeonsi/gfx/si_shader_binary.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader_binary.c
rename to src/gallium/drivers/radeonsi/gfx/si_shader_binary.c
diff --git a/src/gallium/drivers/radeonsi/si_shader_info.c b/src/gallium/drivers/radeonsi/gfx/si_shader_info.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader_info.c
rename to src/gallium/drivers/radeonsi/gfx/si_shader_info.c
diff --git a/src/gallium/drivers/radeonsi/si_shader_info.h b/src/gallium/drivers/radeonsi/gfx/si_shader_info.h
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader_info.h
rename to src/gallium/drivers/radeonsi/gfx/si_shader_info.h
diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h b/src/gallium/drivers/radeonsi/gfx/si_shader_internal.h
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader_internal.h
rename to src/gallium/drivers/radeonsi/gfx/si_shader_internal.h
diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm.c b/src/gallium/drivers/radeonsi/gfx/si_shader_llvm.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader_llvm.c
rename to src/gallium/drivers/radeonsi/gfx/si_shader_llvm.c
diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm.h b/src/gallium/drivers/radeonsi/gfx/si_shader_llvm.h
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader_llvm.h
rename to src/gallium/drivers/radeonsi/gfx/si_shader_llvm.h
diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_gs.c b/src/gallium/drivers/radeonsi/gfx/si_shader_llvm_gs.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader_llvm_gs.c
rename to src/gallium/drivers/radeonsi/gfx/si_shader_llvm_gs.c
diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_ps.c b/src/gallium/drivers/radeonsi/gfx/si_shader_llvm_ps.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader_llvm_ps.c
rename to src/gallium/drivers/radeonsi/gfx/si_shader_llvm_ps.c
diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c b/src/gallium/drivers/radeonsi/gfx/si_shader_llvm_tess.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader_llvm_tess.c
rename to src/gallium/drivers/radeonsi/gfx/si_shader_llvm_tess.c
diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/gfx/si_shader_nir.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader_nir.c
rename to src/gallium/drivers/radeonsi/gfx/si_shader_nir.c
diff --git a/src/gallium/drivers/radeonsi/si_shader_variant_info.c b/src/gallium/drivers/radeonsi/gfx/si_shader_variant_info.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shader_variant_info.c
rename to src/gallium/drivers/radeonsi/gfx/si_shader_variant_info.c
diff --git a/src/gallium/drivers/radeonsi/si_shaderlib_nir.c b/src/gallium/drivers/radeonsi/gfx/si_shaderlib_nir.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_shaderlib_nir.c
rename to src/gallium/drivers/radeonsi/gfx/si_shaderlib_nir.c
diff --git a/src/gallium/drivers/radeonsi/si_sqtt.c b/src/gallium/drivers/radeonsi/gfx/si_sqtt.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_sqtt.c
rename to src/gallium/drivers/radeonsi/gfx/si_sqtt.c
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.cpp b/src/gallium/drivers/radeonsi/gfx/si_state_shaders.cpp
similarity index 99%
rename from src/gallium/drivers/radeonsi/si_state_shaders.cpp
rename to src/gallium/drivers/radeonsi/gfx/si_state_shaders.cpp
index b2fd0c01863..660c500db56 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.cpp
+++ b/src/gallium/drivers/radeonsi/gfx/si_state_shaders.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "gfx/si_gfx.h"
+#include "si_gfx.h"
 #include "ac_cmdbuf_cp.h"
 #include "ac_nir.h"
 #include "ac_shader_util.h"
diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build
index 2cc695efc2f..05ac717883d 100644
--- a/src/gallium/drivers/radeonsi/meson.build
+++ b/src/gallium/drivers/radeonsi/meson.build
@@ -43,16 +43,6 @@ files_libradeonsi = files(
   'si_public.h',
   'si_query.c',
   'si_query.h',
-  'si_nir_clamp_shadow_comparison_value.c',
-  'si_nir_kill_outputs.c',
-  'si_nir_lower_abi.c',
-  'si_nir_lower_intrinsics_early.c',
-  'si_nir_lower_polygon_stipple.c',
-  'si_nir_lower_color_flatshade_twoside.c',
-  'si_nir_lower_resource.c',
-  'si_nir_lower_vs_inputs.c',
-  'si_nir_mark_divergent_texture_non_uniform.c',
-  'si_nir_optim.c',
   'si_sdma_copy_image.c',
   'si_state.c',
   'si_state.h',
@@ -106,11 +96,11 @@ amd_common_libs = [libamd_common]
 
 if amd_with_llvm and with_gfx_compute
   files_libradeonsi += files(
-    'si_shader_llvm.c',
-    'si_shader_llvm.h',
-    'si_shader_llvm_gs.c',
-    'si_shader_llvm_ps.c',
-    'si_shader_llvm_tess.c',
+    'gfx/si_shader_llvm.c',
+    'gfx/si_shader_llvm.h',
+    'gfx/si_shader_llvm_gs.c',
+    'gfx/si_shader_llvm_ps.c',
+    'gfx/si_shader_llvm_tess.c',
   )
 
   radeonsi_include_dirs += [inc_amd_common_llvm]
@@ -121,29 +111,39 @@ endif
 radeonsi_gfx_libs = []
 if with_gfx_compute
   files_libradeonsi+= files(
-    'si_blit.c',
-    'si_cp_reg_shadowing.c',
-    'si_compute_blit.c',
-    'si_compute.c',
-    'si_debug_gfx_compute.c',
+    'gfx/si_blit.c',
+    'gfx/si_cp_reg_shadowing.c',
+    'gfx/si_compute_blit.c',
+    'gfx/si_compute.c',
+    'gfx/si_debug_gfx_compute.c',
     'gfx/si_gfx_context.c',
     'gfx/si_gfx_screen.c',
     'gfx/si_shader_cache.c',
-    'si_nir_mediump.c',
-    'si_mesh_shader.c',
-    'si_shader_aco.c',
-    'si_shader_args.c',
-    'si_shader_binary.c',
-    'si_shader_info.c',
-    'si_shader_info.h',
-    'si_shader_internal.h',
-    'si_shader_nir.c',
-    'si_shader_variant_info.c',
-    'si_shader.c',
-    'si_shader.h',
-    'si_shaderlib_nir.c',
-    'si_state_shaders.cpp',
-    'si_sqtt.c',
+    'gfx/si_nir_mediump.c',
+    'gfx/si_mesh_shader.c',
+    'gfx/si_shader_aco.c',
+    'gfx/si_shader_args.c',
+    'gfx/si_shader_binary.c',
+    'gfx/si_shader_info.c',
+    'gfx/si_shader_info.h',
+    'gfx/si_shader_internal.h',
+    'gfx/si_shader_nir.c',
+    'gfx/si_shader_variant_info.c',
+    'gfx/si_shader.c',
+    'gfx/si_shader.h',
+    'gfx/si_shaderlib_nir.c',
+    'gfx/si_state_shaders.cpp',
+    'gfx/si_sqtt.c',
+    'gfx/si_nir_clamp_shadow_comparison_value.c',
+    'gfx/si_nir_kill_outputs.c',
+    'gfx/si_nir_lower_abi.c',
+    'gfx/si_nir_lower_intrinsics_early.c',
+    'gfx/si_nir_lower_polygon_stipple.c',
+    'gfx/si_nir_lower_color_flatshade_twoside.c',
+    'gfx/si_nir_lower_resource.c',
+    'gfx/si_nir_lower_vs_inputs.c',
+    'gfx/si_nir_mark_divergent_texture_non_uniform.c',
+    'gfx/si_nir_optim.c',
     'si_test_dma_perf.c',
     'si_test_image_copy_region.c',
   )
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index b14aba06a13..0ad2c72edb0 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -7,7 +7,7 @@
 #ifndef SI_PIPE_H
 #define SI_PIPE_H
 
-#include "si_shader.h"
+#include "gfx/si_shader.h"
 #include "si_state.h"
 #include "winsys/radeon_winsys.h"
 #include "util/u_blitter.h"
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 4556063d578..5acaac3fea1 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -6,7 +6,7 @@
 
 #include "si_build_pm4.h"
 #include "si_query.h"
-#include "si_shader_internal.h"
+#include "gfx/si_shader_internal.h"
 #include "sid.h"
 #include "util/fast_idiv_by_const.h"
 #include "util/format/u_format.h"