diff --git a/src/nouveau/codegen/lib/Makefile b/src/gallium/drivers/nouveau/codegen/lib/Makefile
similarity index 100%
rename from src/nouveau/codegen/lib/Makefile
rename to src/gallium/drivers/nouveau/codegen/lib/Makefile
diff --git a/src/nouveau/codegen/lib/gf100.asm b/src/gallium/drivers/nouveau/codegen/lib/gf100.asm
similarity index 100%
rename from src/nouveau/codegen/lib/gf100.asm
rename to src/gallium/drivers/nouveau/codegen/lib/gf100.asm
diff --git a/src/nouveau/codegen/lib/gf100.asm.h b/src/gallium/drivers/nouveau/codegen/lib/gf100.asm.h
similarity index 100%
rename from src/nouveau/codegen/lib/gf100.asm.h
rename to src/gallium/drivers/nouveau/codegen/lib/gf100.asm.h
diff --git a/src/nouveau/codegen/lib/gk104.asm b/src/gallium/drivers/nouveau/codegen/lib/gk104.asm
similarity index 100%
rename from src/nouveau/codegen/lib/gk104.asm
rename to src/gallium/drivers/nouveau/codegen/lib/gk104.asm
diff --git a/src/nouveau/codegen/lib/gk104.asm.h b/src/gallium/drivers/nouveau/codegen/lib/gk104.asm.h
similarity index 100%
rename from src/nouveau/codegen/lib/gk104.asm.h
rename to src/gallium/drivers/nouveau/codegen/lib/gk104.asm.h
diff --git a/src/nouveau/codegen/lib/gk110.asm b/src/gallium/drivers/nouveau/codegen/lib/gk110.asm
similarity index 100%
rename from src/nouveau/codegen/lib/gk110.asm
rename to src/gallium/drivers/nouveau/codegen/lib/gk110.asm
diff --git a/src/nouveau/codegen/lib/gk110.asm.h b/src/gallium/drivers/nouveau/codegen/lib/gk110.asm.h
similarity index 100%
rename from src/nouveau/codegen/lib/gk110.asm.h
rename to src/gallium/drivers/nouveau/codegen/lib/gk110.asm.h
diff --git a/src/nouveau/codegen/lib/gm107.asm b/src/gallium/drivers/nouveau/codegen/lib/gm107.asm
similarity index 100%
rename from src/nouveau/codegen/lib/gm107.asm
rename to src/gallium/drivers/nouveau/codegen/lib/gm107.asm
diff --git a/src/nouveau/codegen/lib/gm107.asm.h b/src/gallium/drivers/nouveau/codegen/lib/gm107.asm.h
similarity index 100%
rename from src/nouveau/codegen/lib/gm107.asm.h
rename to src/gallium/drivers/nouveau/codegen/lib/gm107.asm.h
diff --git a/src/nouveau/codegen/meson.build b/src/gallium/drivers/nouveau/codegen/meson.build
similarity index 100%
rename from src/nouveau/codegen/meson.build
rename to src/gallium/drivers/nouveau/codegen/meson.build
diff --git a/src/nouveau/codegen/nv50_ir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
diff --git a/src/nouveau/codegen/nv50_ir.h b/src/gallium/drivers/nouveau/codegen/nv50_ir.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir.h
diff --git a/src/nouveau/codegen/nv50_ir_bb.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_bb.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp
diff --git a/src/nouveau/codegen/nv50_ir_build_util.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_build_util.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_build_util.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_build_util.cpp
diff --git a/src/nouveau/codegen/nv50_ir_build_util.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_build_util.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_build_util.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_build_util.h
diff --git a/src/nouveau/codegen/nv50_ir_driver.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_driver.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h
diff --git a/src/nouveau/codegen/nv50_ir_emit_gk110.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_emit_gk110.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
diff --git a/src/nouveau/codegen/nv50_ir_emit_gm107.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_emit_gm107.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp
diff --git a/src/nouveau/codegen/nv50_ir_emit_gv100.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_emit_gv100.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.cpp
diff --git a/src/nouveau/codegen/nv50_ir_emit_gv100.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_emit_gv100.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.h
diff --git a/src/nouveau/codegen/nv50_ir_emit_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_emit_nv50.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp
diff --git a/src/nouveau/codegen/nv50_ir_emit_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_emit_nvc0.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
diff --git a/src/nouveau/codegen/nv50_ir_from_nir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_from_nir.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
diff --git a/src/nouveau/codegen/nv50_ir_graph.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_graph.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_graph.cpp
diff --git a/src/nouveau/codegen/nv50_ir_graph.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_graph.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_graph.h
diff --git a/src/nouveau/codegen/nv50_ir_inlines.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_inlines.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_inlines.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_inlines.h
diff --git a/src/nouveau/codegen/nv50_ir_lowering_gm107.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gm107.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_lowering_gm107.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gm107.cpp
diff --git a/src/nouveau/codegen/nv50_ir_lowering_gm107.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gm107.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_lowering_gm107.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gm107.h
diff --git a/src/nouveau/codegen/nv50_ir_lowering_gv100.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gv100.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_lowering_gv100.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gv100.cpp
diff --git a/src/nouveau/codegen/nv50_ir_lowering_gv100.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gv100.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_lowering_gv100.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gv100.h
diff --git a/src/nouveau/codegen/nv50_ir_lowering_helper.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_helper.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_lowering_helper.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_helper.cpp
diff --git a/src/nouveau/codegen/nv50_ir_lowering_helper.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_helper.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_lowering_helper.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_helper.h
diff --git a/src/nouveau/codegen/nv50_ir_lowering_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_lowering_nv50.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp
diff --git a/src/nouveau/codegen/nv50_ir_lowering_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
diff --git a/src/nouveau/codegen/nv50_ir_lowering_nvc0.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_lowering_nvc0.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.h
diff --git a/src/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_peephole.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
diff --git a/src/nouveau/codegen/nv50_ir_print.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_print.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp
diff --git a/src/nouveau/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_ra.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
diff --git a/src/nouveau/codegen/nv50_ir_sched_gm107.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_sched_gm107.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_sched_gm107.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_sched_gm107.h
diff --git a/src/nouveau/codegen/nv50_ir_serialize.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_serialize.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_serialize.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_serialize.cpp
diff --git a/src/nouveau/codegen/nv50_ir_ssa.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_ssa.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_ssa.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_ssa.cpp
diff --git a/src/nouveau/codegen/nv50_ir_target.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_target.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_target.cpp
diff --git a/src/nouveau/codegen/nv50_ir_target.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_target.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_target.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_target.h
diff --git a/src/nouveau/codegen/nv50_ir_target_gm107.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_gm107.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_target_gm107.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_target_gm107.cpp
diff --git a/src/nouveau/codegen/nv50_ir_target_gm107.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_gm107.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_target_gm107.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_target_gm107.h
diff --git a/src/nouveau/codegen/nv50_ir_target_gv100.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_gv100.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_target_gv100.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_target_gv100.cpp
diff --git a/src/nouveau/codegen/nv50_ir_target_gv100.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_gv100.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_target_gv100.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_target_gv100.h
diff --git a/src/nouveau/codegen/nv50_ir_target_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_target_nv50.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp
diff --git a/src/nouveau/codegen/nv50_ir_target_nv50.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_target_nv50.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.h
diff --git a/src/nouveau/codegen/nv50_ir_target_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_target_nvc0.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp
diff --git a/src/nouveau/codegen/nv50_ir_target_nvc0.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_target_nvc0.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.h
diff --git a/src/nouveau/codegen/nv50_ir_util.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_util.cpp
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_util.cpp
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_util.cpp
diff --git a/src/nouveau/codegen/nv50_ir_util.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_util.h
similarity index 100%
rename from src/nouveau/codegen/nv50_ir_util.h
rename to src/gallium/drivers/nouveau/codegen/nv50_ir_util.h
diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build
index 5537fe5f1c6..018130a63ac 100644
--- a/src/gallium/drivers/nouveau/meson.build
+++ b/src/gallium/drivers/nouveau/meson.build
@@ -1,6 +1,8 @@
 # Copyright © 2017 Dylan Baker
 # SPDX-License-Identifier: MIT
 
+subdir('codegen')
+
 files_libnouveau = files(
   'nouveau_buffer.c',
   'nouveau_buffer.h',
diff --git a/src/nouveau/meson.build b/src/nouveau/meson.build
index 5468334f299..89b50de511b 100644
--- a/src/nouveau/meson.build
+++ b/src/nouveau/meson.build
@@ -13,7 +13,6 @@ if with_tools.contains('drm-shim')
   subdir('drm-shim')
 endif
 
-subdir('codegen')
 if with_nouveau_vk
   subdir('mme')
   subdir('vulkan')