48 files changed, 125 insertions, 125 deletions

diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 351bbf4fa60..e75c1866832 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -90,7 +90,7 @@ endif
 
 ## v3d
 if HAVE_GALLIUM_V3D
-SUBDIRS += drivers/vc5 winsys/vc5/drm
+SUBDIRS += drivers/v3d winsys/v3d/drm
 endif
 
 ## virgl
diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h
index c494848888d..7eefa6e42ec 100644
--- a/src/gallium/auxiliary/target-helpers/drm_helper.h
+++ b/src/gallium/auxiliary/target-helpers/drm_helper.h
@@ -311,7 +311,7 @@ pipe_vc4_create_screen(int fd, const struct pipe_screen_config *config)
 #endif
 
 #ifdef GALLIUM_V3D
-#include "vc5/drm/vc5_drm_public.h"
+#include "v3d/drm/v3d_drm_public.h"
 
 struct pipe_screen *
 pipe_v3d_create_screen(int fd, const struct pipe_screen_config *config)
diff --git a/src/gallium/drivers/vc5/.editorconfig b/src/gallium/drivers/v3d/.editorconfig
index 5a9f3c041a4..5a9f3c041a4 100644
--- a/src/gallium/drivers/vc5/.editorconfig
+++ b/src/gallium/drivers/v3d/.editorconfig
diff --git a/src/gallium/drivers/vc5/Automake.inc b/src/gallium/drivers/v3d/Automake.inc
index 612bc21615e..7cf8ae7cd8b 100644
--- a/src/gallium/drivers/vc5/Automake.inc
+++ b/src/gallium/drivers/v3d/Automake.inc
@@ -3,8 +3,8 @@ if HAVE_GALLIUM_V3D
 TARGET_DRIVERS += v3d
 TARGET_CPPFLAGS += -DGALLIUM_V3D
 TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/winsys/vc5/drm/libv3ddrm.la \
-	$(top_builddir)/src/gallium/drivers/vc5/libv3d.la \
+	$(top_builddir)/src/gallium/winsys/v3d/drm/libv3ddrm.la \
+	$(top_builddir)/src/gallium/drivers/v3d/libv3d.la \
 	$(top_builddir)/src/broadcom/libbroadcom.la
 
 if !HAVE_GALLIUM_VC4
diff --git a/src/gallium/drivers/vc5/Makefile.am b/src/gallium/drivers/v3d/Makefile.am
index 2b4c364c24e..2b4c364c24e 100644
--- a/src/gallium/drivers/vc5/Makefile.am
+++ b/src/gallium/drivers/v3d/Makefile.am
diff --git a/src/gallium/drivers/v3d/Makefile.sources b/src/gallium/drivers/v3d/Makefile.sources
new file mode 100644
index 00000000000..c81ccb42013
--- /dev/null
+++ b/src/gallium/drivers/v3d/Makefile.sources
@@ -0,0 +1,36 @@
+C_SOURCES := \
+	v3d_blit.c \
+	v3d_bufmgr.c \
+	v3d_bufmgr.h \
+	v3d_cl.c \
+	v3d_cl.h \
+	v3d_context.c \
+	v3d_context.h \
+	v3d_fence.c \
+	v3d_formats.c \
+	v3d_format_table.h \
+	v3d_job.c \
+	v3d_program.c \
+	v3d_query.c \
+	v3d_resource.c \
+	v3d_resource.h \
+	v3d_screen.c \
+	v3d_screen.h \
+	v3d_simulator.c \
+	v3d_simulator_wrapper.cpp \
+	v3d_simulator_wrapper.h \
+	v3d_tiling.c \
+	v3d_tiling.h \
+	v3d_uniforms.c \
+	$()
+
+V3D_PER_VERSION_SOURCES = \
+	v3dx_context.h \
+	v3dx_draw.c \
+	v3dx_emit.c \
+	v3dx_format_table.c \
+	v3dx_job.c \
+	v3dx_rcl.c \
+	v3dx_simulator.c \
+	v3dx_state.c \
+	$()
diff --git a/src/gallium/drivers/vc5/meson.build b/src/gallium/drivers/v3d/meson.build
index 63460dc443f..38021515eda 100644
--- a/src/gallium/drivers/vc5/meson.build
+++ b/src/gallium/drivers/v3d/meson.build
@@ -19,37 +19,37 @@
 # SOFTWARE.
 
 files_libv3d = files(
-  'vc5_blit.c',
-  'vc5_bufmgr.c',
-  'vc5_bufmgr.h',
-  'vc5_cl.c',
-  'vc5_cl.h',
-  'vc5_context.c',
-  'vc5_context.h',
-  'vc5_fence.c',
-  'vc5_formats.c',
-  'vc5_job.c',
-  'vc5_program.c',
-  'vc5_query.c',
-  'vc5_resource.c',
-  'vc5_resource.h',
-  'vc5_screen.c',
-  'vc5_screen.h',
-  'vc5_simulator.c',
-  'vc5_simulator_wrapper.cpp',
-  'vc5_tiling.c',
-  'vc5_tiling.h',
-  'vc5_uniforms.c',
+  'v3d_blit.c',
+  'v3d_bufmgr.c',
+  'v3d_bufmgr.h',
+  'v3d_cl.c',
+  'v3d_cl.h',
+  'v3d_context.c',
+  'v3d_context.h',
+  'v3d_fence.c',
+  'v3d_formats.c',
+  'v3d_job.c',
+  'v3d_program.c',
+  'v3d_query.c',
+  'v3d_resource.c',
+  'v3d_resource.h',
+  'v3d_screen.c',
+  'v3d_screen.h',
+  'v3d_simulator.c',
+  'v3d_simulator_wrapper.cpp',
+  'v3d_tiling.c',
+  'v3d_tiling.h',
+  'v3d_uniforms.c',
 )
 
 files_per_version = files(
+  'v3dx_draw.c',
+  'v3dx_emit.c',
   'v3dx_format_table.c',
   'v3dx_job.c',
+  'v3dx_rcl.c',
   'v3dx_simulator.c',
-  'vc5_draw.c',
-  'vc5_emit.c',
-  'vc5_rcl.c',
-  'vc5_state.c',
+  'v3dx_state.c',
 )
 
 v3dv3_c_args = []
diff --git a/src/gallium/drivers/vc5/vc5_blit.c b/src/gallium/drivers/v3d/v3d_blit.c
index 66f530723f2..7c67d4561ba 100644
--- a/src/gallium/drivers/vc5/vc5_blit.c
+++ b/src/gallium/drivers/v3d/v3d_blit.c
@@ -24,7 +24,7 @@
 #include "util/u_format.h"
 #include "util/u_surface.h"
 #include "util/u_blitter.h"
-#include "vc5_context.h"
+#include "v3d_context.h"
 
 #if 0
 static struct pipe_surface *
diff --git a/src/gallium/drivers/vc5/vc5_bufmgr.c b/src/gallium/drivers/v3d/v3d_bufmgr.c
index 2773df3cf2f..ef2a5fa07be 100644
--- a/src/gallium/drivers/vc5/vc5_bufmgr.c
+++ b/src/gallium/drivers/v3d/v3d_bufmgr.c
@@ -32,8 +32,8 @@
 #include "util/u_memory.h"
 #include "util/ralloc.h"
 
-#include "vc5_context.h"
-#include "vc5_screen.h"
+#include "v3d_context.h"
+#include "v3d_screen.h"
 
 #ifdef HAVE_VALGRIND
 #include <valgrind.h>
diff --git a/src/gallium/drivers/vc5/vc5_bufmgr.h b/src/gallium/drivers/v3d/v3d_bufmgr.h
index cca2b22874f..4519a206026 100644
--- a/src/gallium/drivers/vc5/vc5_bufmgr.h
+++ b/src/gallium/drivers/v3d/v3d_bufmgr.h
@@ -28,7 +28,7 @@
 #include "util/u_hash_table.h"
 #include "util/u_inlines.h"
 #include "util/list.h"
-#include "vc5_screen.h"
+#include "v3d_screen.h"
 
 struct vc5_context;
 
diff --git a/src/gallium/drivers/vc5/vc5_cl.c b/src/gallium/drivers/v3d/v3d_cl.c
index a10c1649e0d..2ffb7ea9a2c 100644
--- a/src/gallium/drivers/vc5/vc5_cl.c
+++ b/src/gallium/drivers/v3d/v3d_cl.c
@@ -23,7 +23,7 @@
 
 #include "util/u_math.h"
 #include "util/ralloc.h"
-#include "vc5_context.h"
+#include "v3d_context.h"
 /* The branching packets are the same across V3D versions. */
 #define V3D_VERSION 33
 #include "broadcom/common/v3d_macros.h"
diff --git a/src/gallium/drivers/vc5/vc5_cl.h b/src/gallium/drivers/v3d/v3d_cl.h
index 7025b5a672b..7025b5a672b 100644
--- a/src/gallium/drivers/vc5/vc5_cl.h
+++ b/src/gallium/drivers/v3d/v3d_cl.h
diff --git a/src/gallium/drivers/vc5/vc5_context.c b/src/gallium/drivers/v3d/v3d_context.c
index b6d1234879b..cb37eba3841 100644
--- a/src/gallium/drivers/vc5/vc5_context.c
+++ b/src/gallium/drivers/v3d/v3d_context.c
@@ -34,9 +34,9 @@
 #include "indices/u_primconvert.h"
 #include "pipe/p_screen.h"
 
-#include "vc5_screen.h"
-#include "vc5_context.h"
-#include "vc5_resource.h"
+#include "v3d_screen.h"
+#include "v3d_context.h"
+#include "v3d_resource.h"
 
 void
 vc5_flush(struct pipe_context *pctx)
diff --git a/src/gallium/drivers/vc5/vc5_context.h b/src/gallium/drivers/v3d/v3d_context.h
index 5df02b3907d..7c17eccd47e 100644
--- a/src/gallium/drivers/vc5/vc5_context.h
+++ b/src/gallium/drivers/v3d/v3d_context.h
@@ -37,15 +37,15 @@
 #include "util/slab.h"
 #include "xf86drm.h"
 #include "v3d_drm.h"
-#include "vc5_screen.h"
+#include "v3d_screen.h"
 
 struct vc5_job;
 struct vc5_bo;
 void vc5_job_add_bo(struct vc5_job *job, struct vc5_bo *bo);
 
-#include "vc5_bufmgr.h"
-#include "vc5_resource.h"
-#include "vc5_cl.h"
+#include "v3d_bufmgr.h"
+#include "v3d_resource.h"
+#include "v3d_cl.h"
 
 #ifdef USE_V3D_SIMULATOR
 #define using_vc5_simulator true
diff --git a/src/gallium/drivers/vc5/vc5_fence.c b/src/gallium/drivers/v3d/v3d_fence.c
index 731dd6db908..54bce562403 100644
--- a/src/gallium/drivers/vc5/vc5_fence.c
+++ b/src/gallium/drivers/v3d/v3d_fence.c
@@ -36,8 +36,8 @@
 
 #include "util/u_inlines.h"
 
-#include "vc5_context.h"
-#include "vc5_bufmgr.h"
+#include "v3d_context.h"
+#include "v3d_bufmgr.h"
 
 struct vc5_fence {
         struct pipe_reference reference;
diff --git a/src/gallium/drivers/vc5/vc5_format_table.h b/src/gallium/drivers/v3d/v3d_format_table.h
index 8b8011351a1..8b8011351a1 100644
--- a/src/gallium/drivers/vc5/vc5_format_table.h
+++ b/src/gallium/drivers/v3d/v3d_format_table.h
diff --git a/src/gallium/drivers/vc5/vc5_formats.c b/src/gallium/drivers/v3d/v3d_formats.c
index b65b7cdbe71..8424b368cf4 100644
--- a/src/gallium/drivers/vc5/vc5_formats.c
+++ b/src/gallium/drivers/v3d/v3d_formats.c
@@ -34,8 +34,8 @@
 
 #include "util/macros.h"
 
-#include "vc5_context.h"
-#include "vc5_format_table.h"
+#include "v3d_context.h"
+#include "v3d_format_table.h"
 
 static const struct vc5_format *
 get_format(const struct v3d_device_info *devinfo, enum pipe_format f)
diff --git a/src/gallium/drivers/vc5/vc5_job.c b/src/gallium/drivers/v3d/v3d_job.c
index 7973b9e6829..85c64df34ca 100644
--- a/src/gallium/drivers/vc5/vc5_job.c
+++ b/src/gallium/drivers/v3d/v3d_job.c
@@ -27,7 +27,7 @@
  */
 
 #include <xf86drm.h>
-#include "vc5_context.h"
+#include "v3d_context.h"
 /* The OQ/semaphore packets are the same across V3D versions. */
 #define V3D_VERSION 33
 #include "broadcom/cle/v3dx_pack.h"
diff --git a/src/gallium/drivers/vc5/vc5_program.c b/src/gallium/drivers/v3d/v3d_program.c
index 23d2d73a2dc..ce2e0be8ed2 100644
--- a/src/gallium/drivers/vc5/vc5_program.c
+++ b/src/gallium/drivers/v3d/v3d_program.c
@@ -33,7 +33,7 @@
 #include "compiler/nir/nir_builder.h"
 #include "nir/tgsi_to_nir.h"
 #include "compiler/v3d_compiler.h"
-#include "vc5_context.h"
+#include "v3d_context.h"
 #include "broadcom/cle/v3d_packet_v33_pack.h"
 #include "mesa/state_tracker/st_glsl_types.h"
 
diff --git a/src/gallium/drivers/vc5/vc5_query.c b/src/gallium/drivers/v3d/v3d_query.c
index 9aa80cf536a..f645544bedf 100644
--- a/src/gallium/drivers/vc5/vc5_query.c
+++ b/src/gallium/drivers/v3d/v3d_query.c
@@ -33,7 +33,7 @@
  * do the calculations in software at draw time.
  */
 
-#include "vc5_context.h"
+#include "v3d_context.h"
 #include "broadcom/cle/v3d_packet_v33_pack.h"
 
 struct vc5_query
diff --git a/src/gallium/drivers/vc5/vc5_resource.c b/src/gallium/drivers/v3d/v3d_resource.c
index 3c2ed270770..1cd3f1949a2 100644
--- a/src/gallium/drivers/vc5/vc5_resource.c
+++ b/src/gallium/drivers/v3d/v3d_resource.c
@@ -33,10 +33,10 @@
 #include "util/u_format_zs.h"
 
 #include "drm_fourcc.h"
-#include "vc5_screen.h"
-#include "vc5_context.h"
-#include "vc5_resource.h"
-#include "vc5_tiling.h"
+#include "v3d_screen.h"
+#include "v3d_context.h"
+#include "v3d_resource.h"
+#include "v3d_tiling.h"
 #include "broadcom/cle/v3d_packet_v33_pack.h"
 
 static void
diff --git a/src/gallium/drivers/vc5/vc5_resource.h b/src/gallium/drivers/v3d/v3d_resource.h
index 2af355354ab..dc68f803e90 100644
--- a/src/gallium/drivers/vc5/vc5_resource.h
+++ b/src/gallium/drivers/v3d/v3d_resource.h
@@ -25,7 +25,7 @@
 #ifndef VC5_RESOURCE_H
 #define VC5_RESOURCE_H
 
-#include "vc5_screen.h"
+#include "v3d_screen.h"
 #include "util/u_transfer.h"
 
 /* A UIFblock is a 256-byte region of memory that's 256-byte aligned.  These
diff --git a/src/gallium/drivers/vc5/vc5_screen.c b/src/gallium/drivers/v3d/v3d_screen.c
index 9b367857322..95e6a6907f4 100644
--- a/src/gallium/drivers/vc5/vc5_screen.c
+++ b/src/gallium/drivers/v3d/v3d_screen.c
@@ -34,9 +34,9 @@
 #include "util/ralloc.h"
 
 #include <xf86drm.h>
-#include "vc5_screen.h"
-#include "vc5_context.h"
-#include "vc5_resource.h"
+#include "v3d_screen.h"
+#include "v3d_context.h"
+#include "v3d_resource.h"
 #include "compiler/v3d_compiler.h"
 
 static const char *
diff --git a/src/gallium/drivers/vc5/vc5_screen.h b/src/gallium/drivers/v3d/v3d_screen.h
index 975bfe01a75..975bfe01a75 100644
--- a/src/gallium/drivers/vc5/vc5_screen.h
+++ b/src/gallium/drivers/v3d/v3d_screen.h
diff --git a/src/gallium/drivers/vc5/vc5_simulator.c b/src/gallium/drivers/v3d/v3d_simulator.c
index 4a1650074c4..86e4ed3be3d 100644
--- a/src/gallium/drivers/vc5/vc5_simulator.c
+++ b/src/gallium/drivers/v3d/v3d_simulator.c
@@ -54,10 +54,10 @@
 #include "util/set.h"
 #include "util/u_memory.h"
 #include "util/u_mm.h"
-#include "vc5_simulator_wrapper.h"
+#include "v3d_simulator_wrapper.h"
 
-#include "vc5_screen.h"
-#include "vc5_context.h"
+#include "v3d_screen.h"
+#include "v3d_context.h"
 
 /** Global (across GEM fds) state for the simulator */
 static struct vc5_simulator_state {
diff --git a/src/gallium/drivers/vc5/vc5_simulator_wrapper.cpp b/src/gallium/drivers/v3d/v3d_simulator_wrapper.cpp
index bee3ce70bfd..7b04ded2b53 100644
--- a/src/gallium/drivers/vc5/vc5_simulator_wrapper.cpp
+++ b/src/gallium/drivers/v3d/v3d_simulator_wrapper.cpp
@@ -24,12 +24,12 @@
 /** @file
  *
  * Wraps bits of the V3D simulator interface in a C interface for the
- * vc5_simulator.c code to use.
+ * v3d_simulator.c code to use.
  */
 
 #ifdef USE_V3D_SIMULATOR
 
-#include "vc5_simulator_wrapper.h"
+#include "v3d_simulator_wrapper.h"
 
 #define V3D_TECH_VERSION 3
 #define V3D_REVISION 3
diff --git a/src/gallium/drivers/vc5/vc5_simulator_wrapper.h b/src/gallium/drivers/v3d/v3d_simulator_wrapper.h
index 8b5dca15ed9..8b5dca15ed9 100644
--- a/src/gallium/drivers/vc5/vc5_simulator_wrapper.h
+++ b/src/gallium/drivers/v3d/v3d_simulator_wrapper.h
diff --git a/src/gallium/drivers/vc5/vc5_tiling.c b/src/gallium/drivers/v3d/v3d_tiling.c
index cbd86d5566a..f9c4a342184 100644
--- a/src/gallium/drivers/vc5/vc5_tiling.c
+++ b/src/gallium/drivers/v3d/v3d_tiling.c
@@ -28,9 +28,9 @@
  */
 
 #include <stdint.h>
-#include "vc5_screen.h"
-#include "vc5_context.h"
-#include "vc5_tiling.h"
+#include "v3d_screen.h"
+#include "v3d_context.h"
+#include "v3d_tiling.h"
 
 /** Return the width in pixels of a 64-byte microtile. */
 uint32_t
diff --git a/src/gallium/drivers/vc5/vc5_tiling.h b/src/gallium/drivers/v3d/v3d_tiling.h
index d3cf48c4527..d3cf48c4527 100644
--- a/src/gallium/drivers/vc5/vc5_tiling.h
+++ b/src/gallium/drivers/v3d/v3d_tiling.h
diff --git a/src/gallium/drivers/vc5/vc5_uniforms.c b/src/gallium/drivers/v3d/v3d_uniforms.c
index 03b6d8381c1..c7a39b50a74 100644
--- a/src/gallium/drivers/vc5/vc5_uniforms.c
+++ b/src/gallium/drivers/v3d/v3d_uniforms.c
@@ -24,7 +24,7 @@
 #include "util/u_pack_color.h"
 #include "util/format_srgb.h"
 
-#include "vc5_context.h"
+#include "v3d_context.h"
 #include "compiler/v3d_compiler.h"
 #include "broadcom/cle/v3d_packet_v33_pack.h"
 
diff --git a/src/gallium/drivers/vc5/v3dx_context.h b/src/gallium/drivers/v3d/v3dx_context.h
index 538aed68be0..faeda2c0fbb 100644
--- a/src/gallium/drivers/vc5/v3dx_context.h
+++ b/src/gallium/drivers/v3d/v3dx_context.h
@@ -23,7 +23,7 @@
  */
 
 /* This file generates the per-v3d-version function prototypes.  It must only
- * be included from vc5_context.h.
+ * be included from v3d_context.h.
  */
 
 struct v3d_hw;
diff --git a/src/gallium/drivers/vc5/vc5_draw.c b/src/gallium/drivers/v3d/v3dx_draw.c
index ecb1aa37831..03ee6b2b196 100644
--- a/src/gallium/drivers/vc5/vc5_draw.c
+++ b/src/gallium/drivers/v3d/v3dx_draw.c
@@ -29,9 +29,9 @@
 #include "util/u_upload_mgr.h"
 #include "indices/u_primconvert.h"
 
-#include "vc5_context.h"
-#include "vc5_resource.h"
-#include "vc5_cl.h"
+#include "v3d_context.h"
+#include "v3d_resource.h"
+#include "v3d_cl.h"
 #include "broadcom/compiler/v3d_compiler.h"
 #include "broadcom/common/v3d_macros.h"
 #include "broadcom/cle/v3dx_pack.h"
diff --git a/src/gallium/drivers/vc5/vc5_emit.c b/src/gallium/drivers/v3d/v3dx_emit.c
index cb8af953300..e2aba356de4 100644
--- a/src/gallium/drivers/vc5/vc5_emit.c
+++ b/src/gallium/drivers/v3d/v3dx_emit.c
@@ -23,7 +23,7 @@
 
 #include "util/u_format.h"
 #include "util/u_half.h"
-#include "vc5_context.h"
+#include "v3d_context.h"
 #include "broadcom/common/v3d_macros.h"
 #include "broadcom/cle/v3dx_pack.h"
 #include "broadcom/compiler/v3d_compiler.h"
diff --git a/src/gallium/drivers/vc5/v3dx_format_table.c b/src/gallium/drivers/v3d/v3dx_format_table.c
index cc356fc3811..458488119c7 100644
--- a/src/gallium/drivers/vc5/v3dx_format_table.c
+++ b/src/gallium/drivers/v3d/v3dx_format_table.c
@@ -23,10 +23,10 @@
 
 #include "util/u_format.h"
 
-#include "vc5_context.h"
+#include "v3d_context.h"
 #include "broadcom/cle/v3dx_pack.h"
 #include "broadcom/common/v3d_macros.h"
-#include "vc5_format_table.h"
+#include "v3d_format_table.h"
 
 #define SWIZ(x,y,z,w) {          \
         PIPE_SWIZZLE_##x, \
diff --git a/src/gallium/drivers/vc5/v3dx_job.c b/src/gallium/drivers/v3d/v3dx_job.c
index ca3831c75bb..5e1a345b170 100644
--- a/src/gallium/drivers/vc5/v3dx_job.c
+++ b/src/gallium/drivers/v3d/v3dx_job.c
@@ -27,7 +27,7 @@
  * kernel.
  */
 
-#include "vc5_context.h"
+#include "v3d_context.h"
 #include "broadcom/cle/v3dx_pack.h"
 
 void v3dX(bcl_epilogue)(struct vc5_context *vc5, struct vc5_job *job)
diff --git a/src/gallium/drivers/vc5/vc5_rcl.c b/src/gallium/drivers/v3d/v3dx_rcl.c
index 7d32d9ad0ea..3801d03ecee 100644
--- a/src/gallium/drivers/vc5/vc5_rcl.c
+++ b/src/gallium/drivers/v3d/v3dx_rcl.c
@@ -22,8 +22,8 @@
  */
 
 #include "util/u_format.h"
-#include "vc5_context.h"
-#include "vc5_tiling.h"
+#include "v3d_context.h"
+#include "v3d_tiling.h"
 #include "broadcom/common/v3d_macros.h"
 #include "broadcom/cle/v3dx_pack.h"
 
diff --git a/src/gallium/drivers/vc5/v3dx_simulator.c b/src/gallium/drivers/v3d/v3dx_simulator.c
index 1162869be27..ee8b6f2b9fd 100644
--- a/src/gallium/drivers/vc5/v3dx_simulator.c
+++ b/src/gallium/drivers/v3d/v3dx_simulator.c
@@ -33,9 +33,9 @@
 
 #ifdef USE_V3D_SIMULATOR
 
-#include "vc5_screen.h"
-#include "vc5_context.h"
-#include "vc5_simulator_wrapper.h"
+#include "v3d_screen.h"
+#include "v3d_context.h"
+#include "v3d_simulator_wrapper.h"
 
 #define HW_REGISTER_RO(x) (x)
 #define HW_REGISTER_RW(x) (x)
diff --git a/src/gallium/drivers/vc5/vc5_state.c b/src/gallium/drivers/v3d/v3dx_state.c
index 0ed0acd16ac..e992796a218 100644
--- a/src/gallium/drivers/vc5/vc5_state.c
+++ b/src/gallium/drivers/v3d/v3dx_state.c
@@ -31,8 +31,8 @@
 #include "util/u_half.h"
 #include "util/u_helpers.h"
 
-#include "vc5_context.h"
-#include "vc5_tiling.h"
+#include "v3d_context.h"
+#include "v3d_tiling.h"
 #include "broadcom/common/v3d_macros.h"
 #include "broadcom/cle/v3dx_pack.h"
 
diff --git a/src/gallium/drivers/vc5/Makefile.sources b/src/gallium/drivers/vc5/Makefile.sources
deleted file mode 100644
index 36fcc0b90be..00000000000
--- a/src/gallium/drivers/vc5/Makefile.sources
+++ /dev/null
@@ -1,36 +0,0 @@
-C_SOURCES := \
-	vc5_blit.c \
-	vc5_bufmgr.c \
-	vc5_bufmgr.h \
-	vc5_cl.c \
-	vc5_cl.h \
-	vc5_context.c \
-	vc5_context.h \
-	vc5_fence.c \
-	vc5_formats.c \
-	vc5_format_table.h \
-	vc5_job.c \
-	vc5_program.c \
-	vc5_query.c \
-	vc5_resource.c \
-	vc5_resource.h \
-	vc5_screen.c \
-	vc5_screen.h \
-	vc5_simulator.c \
-	vc5_simulator_wrapper.cpp \
-	vc5_simulator_wrapper.h \
-	vc5_tiling.c \
-	vc5_tiling.h \
-	vc5_uniforms.c \
-	$()
-
-V3D_PER_VERSION_SOURCES = \
-	v3dx_context.h \
-	v3dx_format_table.c \
-	v3dx_job.c \
-	v3dx_simulator.c \
-	vc5_draw.c \
-	vc5_emit.c \
-	vc5_rcl.c \
-	vc5_state.c \
-	$()
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index a93bf32139b..561af9d339c 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -95,8 +95,8 @@ else
   driver_pl111 = declare_dependency()
 endif
 if with_gallium_v3d
-  subdir('winsys/vc5/drm')
-  subdir('drivers/vc5')
+  subdir('winsys/v3d/drm')
+  subdir('drivers/v3d')
 else
   driver_v3d = declare_dependency()
 endif
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index a0778b64e58..a857b5129fd 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -76,8 +76,8 @@ include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
 
 include $(top_srcdir)/src/gallium/drivers/tegra/Automake.inc
 
+include $(top_srcdir)/src/gallium/drivers/v3d/Automake.inc
 include $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/vc5/Automake.inc
 include $(top_srcdir)/src/gallium/drivers/pl111/Automake.inc
 
 include $(top_srcdir)/src/gallium/drivers/virgl/Automake.inc
diff --git a/src/gallium/winsys/vc5/drm/Android.mk b/src/gallium/winsys/v3d/drm/Android.mk
index 4cdd969c268..4cdd969c268 100644
--- a/src/gallium/winsys/vc5/drm/Android.mk
+++ b/src/gallium/winsys/v3d/drm/Android.mk
diff --git a/src/gallium/winsys/vc5/drm/Makefile.am b/src/gallium/winsys/v3d/drm/Makefile.am
index ac2ef23bb64..ac2ef23bb64 100644
--- a/src/gallium/winsys/vc5/drm/Makefile.am
+++ b/src/gallium/winsys/v3d/drm/Makefile.am
diff --git a/src/gallium/winsys/v3d/drm/Makefile.sources b/src/gallium/winsys/v3d/drm/Makefile.sources
new file mode 100644
index 00000000000..1fdeefbcbee
--- /dev/null
+++ b/src/gallium/winsys/v3d/drm/Makefile.sources
@@ -0,0 +1,3 @@
+C_SOURCES := \
+	v3d_drm_public.h \
+	v3d_drm_winsys.c
diff --git a/src/gallium/winsys/vc5/drm/meson.build b/src/gallium/winsys/v3d/drm/meson.build
index 401aff8f47d..e5d7b12d1df 100644
--- a/src/gallium/winsys/vc5/drm/meson.build
+++ b/src/gallium/winsys/v3d/drm/meson.build
@@ -20,7 +20,7 @@
 
 libv3dwinsys = static_library(
   'v3dwinsys',
-  files('vc5_drm_winsys.c'),
+  files('v3d_drm_winsys.c'),
   include_directories : [
     inc_src, inc_include,
     inc_gallium, inc_gallium_aux, inc_gallium_drivers,
diff --git a/src/gallium/winsys/vc5/drm/vc5_drm_public.h b/src/gallium/winsys/v3d/drm/v3d_drm_public.h
index 46aed9d4e18..46aed9d4e18 100644
--- a/src/gallium/winsys/vc5/drm/vc5_drm_public.h
+++ b/src/gallium/winsys/v3d/drm/v3d_drm_public.h
diff --git a/src/gallium/winsys/vc5/drm/vc5_drm_winsys.c b/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c
index 9849ef4e006..63b7a5717f5 100644
--- a/src/gallium/winsys/vc5/drm/vc5_drm_winsys.c
+++ b/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c
@@ -24,9 +24,9 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "vc5_drm_public.h"
+#include "v3d_drm_public.h"
 
-#include "vc5/vc5_screen.h"
+#include "v3d/v3d_screen.h"
 
 struct pipe_screen *
 v3d_drm_screen_create(int fd)
diff --git a/src/gallium/winsys/vc5/drm/Makefile.sources b/src/gallium/winsys/vc5/drm/Makefile.sources
deleted file mode 100644
index ea7566f8dc6..00000000000
--- a/src/gallium/winsys/vc5/drm/Makefile.sources
+++ /dev/null
@@ -1,3 +0,0 @@
-C_SOURCES := \
-	vc5_drm_public.h \
-	vc5_drm_winsys.c