diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build
index c16288ad61e..2cc695efc2f 100644
--- a/src/gallium/drivers/radeonsi/meson.build
+++ b/src/gallium/drivers/radeonsi/meson.build
@@ -63,31 +63,32 @@ files_libradeonsi = files(
   'si_texture.c',
   'si_utrace.c',
   'si_utrace.h',
-  'si_video.h',
-  'si_video.c',
   'si_vpe.c',
   'si_vpe.h',
-  'si_video_dec.h',
-  'si_video_dec.c',
-  'radeon_uvd_enc.c',
-  'radeon_uvd_enc.h',
-  'radeon_vce.c',
-  'radeon_vce.h',
-  'radeon_vcn.h',
-  'radeon_vcn.c',
-  'radeon_vcn_enc.c',
-  'radeon_vcn_enc.h',
-  'radeon_vcn_enc_1_2.c',
-  'radeon_vcn_enc_2_0.c',
-  'radeon_vcn_enc_3_0.c',
-  'radeon_vcn_enc_4_0.c',
-  'radeon_vcn_enc_5_0.c',
-  'radeon_bitstream.h',
-  'radeon_bitstream.c',
   'gfx/si_gfx.h',
   'mm/si_mm.h',
+  'mm/radeon_bitstream.c',
+  'mm/radeon_bitstream.h',
+  'mm/radeon_uvd_enc.c',
+  'mm/radeon_uvd_enc.h',
+  'mm/radeon_vce.c',
+  'mm/radeon_vce.h',
+  'mm/radeon_vcn_enc_1_2.c',
+  'mm/radeon_vcn_enc_2_0.c',
+  'mm/radeon_vcn_enc_3_0.c',
+  'mm/radeon_vcn_enc_4_0.c',
+  'mm/radeon_vcn_enc_5_0.c',
+  'mm/radeon_vcn_enc.c',
+  'mm/radeon_vcn_enc.h',
+  'mm/radeon_vcn.c',
+  'mm/radeon_vcn.h',
   'mm/si_mm_context.c',
   'mm/si_mm_screen.c',
+  'mm/si_mm.h',
+  'mm/si_video_dec.c',
+  'mm/si_video_dec.h',
+  'mm/si_video.c',
+  'mm/si_video.h',
 )
 
 radeonsi_include_dirs = [inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common,
diff --git a/src/gallium/drivers/radeonsi/radeon_bitstream.c b/src/gallium/drivers/radeonsi/mm/radeon_bitstream.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_bitstream.c
rename to src/gallium/drivers/radeonsi/mm/radeon_bitstream.c
diff --git a/src/gallium/drivers/radeonsi/radeon_bitstream.h b/src/gallium/drivers/radeonsi/mm/radeon_bitstream.h
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_bitstream.h
rename to src/gallium/drivers/radeonsi/mm/radeon_bitstream.h
diff --git a/src/gallium/drivers/radeonsi/radeon_uvd_enc.c b/src/gallium/drivers/radeonsi/mm/radeon_uvd_enc.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_uvd_enc.c
rename to src/gallium/drivers/radeonsi/mm/radeon_uvd_enc.c
diff --git a/src/gallium/drivers/radeonsi/radeon_uvd_enc.h b/src/gallium/drivers/radeonsi/mm/radeon_uvd_enc.h
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_uvd_enc.h
rename to src/gallium/drivers/radeonsi/mm/radeon_uvd_enc.h
diff --git a/src/gallium/drivers/radeonsi/radeon_vce.c b/src/gallium/drivers/radeonsi/mm/radeon_vce.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_vce.c
rename to src/gallium/drivers/radeonsi/mm/radeon_vce.c
diff --git a/src/gallium/drivers/radeonsi/radeon_vce.h b/src/gallium/drivers/radeonsi/mm/radeon_vce.h
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_vce.h
rename to src/gallium/drivers/radeonsi/mm/radeon_vce.h
diff --git a/src/gallium/drivers/radeonsi/radeon_vcn.c b/src/gallium/drivers/radeonsi/mm/radeon_vcn.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_vcn.c
rename to src/gallium/drivers/radeonsi/mm/radeon_vcn.c
diff --git a/src/gallium/drivers/radeonsi/radeon_vcn.h b/src/gallium/drivers/radeonsi/mm/radeon_vcn.h
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_vcn.h
rename to src/gallium/drivers/radeonsi/mm/radeon_vcn.h
diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc.c b/src/gallium/drivers/radeonsi/mm/radeon_vcn_enc.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_vcn_enc.c
rename to src/gallium/drivers/radeonsi/mm/radeon_vcn_enc.c
diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc.h b/src/gallium/drivers/radeonsi/mm/radeon_vcn_enc.h
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_vcn_enc.h
rename to src/gallium/drivers/radeonsi/mm/radeon_vcn_enc.h
diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c b/src/gallium/drivers/radeonsi/mm/radeon_vcn_enc_1_2.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c
rename to src/gallium/drivers/radeonsi/mm/radeon_vcn_enc_1_2.c
diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_2_0.c b/src/gallium/drivers/radeonsi/mm/radeon_vcn_enc_2_0.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_vcn_enc_2_0.c
rename to src/gallium/drivers/radeonsi/mm/radeon_vcn_enc_2_0.c
diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_3_0.c b/src/gallium/drivers/radeonsi/mm/radeon_vcn_enc_3_0.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_vcn_enc_3_0.c
rename to src/gallium/drivers/radeonsi/mm/radeon_vcn_enc_3_0.c
diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c b/src/gallium/drivers/radeonsi/mm/radeon_vcn_enc_4_0.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c
rename to src/gallium/drivers/radeonsi/mm/radeon_vcn_enc_4_0.c
diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_5_0.c b/src/gallium/drivers/radeonsi/mm/radeon_vcn_enc_5_0.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_vcn_enc_5_0.c
rename to src/gallium/drivers/radeonsi/mm/radeon_vcn_enc_5_0.c
diff --git a/src/gallium/drivers/radeonsi/si_video.c b/src/gallium/drivers/radeonsi/mm/si_video.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_video.c
rename to src/gallium/drivers/radeonsi/mm/si_video.c
diff --git a/src/gallium/drivers/radeonsi/si_video.h b/src/gallium/drivers/radeonsi/mm/si_video.h
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_video.h
rename to src/gallium/drivers/radeonsi/mm/si_video.h
diff --git a/src/gallium/drivers/radeonsi/si_video_dec.c b/src/gallium/drivers/radeonsi/mm/si_video_dec.c
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_video_dec.c
rename to src/gallium/drivers/radeonsi/mm/si_video_dec.c
diff --git a/src/gallium/drivers/radeonsi/si_video_dec.h b/src/gallium/drivers/radeonsi/mm/si_video_dec.h
similarity index 100%
rename from src/gallium/drivers/radeonsi/si_video_dec.h
rename to src/gallium/drivers/radeonsi/mm/si_video_dec.h