diff options
| author | Eric Anholt <[email protected]> | 2017-08-25 15:34:22 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2018-05-16 21:19:07 +0100 |
| commit | c4c488a2aeb24c0f468664c0cacd0d01111a4e46 (patch) | |
| tree | ad560d93a05e5eae1227775c9e1627e67256d1bd /src/gallium/targets/dri | |
| parent | 8a793d42f1ccef2c87053a1d9a130b49cfb2b84f (diff) | |
v3d: Rename the vc5_dri.so driver to v3d_dri.so.
This allows the driver to load against the merged kernel DRM driver. In
the process, rename most of the build system variables and gallium
plumbing functions.
Diffstat (limited to 'src/gallium/targets/dri')
| -rw-r--r-- | src/gallium/targets/dri/meson.build | 4 | ||||
| -rw-r--r-- | src/gallium/targets/dri/target.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index bdbd45839ad..e3202c99678 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -56,7 +56,7 @@ libgallium_dri = shared_library( dependencies : [ dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread, driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, - driver_pl111, driver_vc4, driver_vc5, driver_freedreno, driver_etnaviv, + driver_pl111, driver_v3d, driver_vc4, driver_freedreno, driver_etnaviv, driver_imx, driver_tegra, driver_i915, driver_svga, driver_virgl, driver_swr, ], @@ -68,8 +68,8 @@ foreach d : [[with_gallium_pl111, 'pl111_dri.so'], [with_gallium_freedreno, ['msm_dri.so', 'kgsl_dri.so']], [with_gallium_softpipe or with_gallium_swr, 'swrast_dri.so'], [with_gallium_softpipe and with_gallium_drisw_kms, 'kms_swrast_dri.so'], + [with_gallium_v3d, 'v3d_dri.so'], [with_gallium_vc4, 'vc4_dri.so'], - [with_gallium_vc5, 'vc5_dri.so'], [with_gallium_etnaviv, 'etnaviv_dri.so'], [with_gallium_imx, 'imx-drm_dri.so'], [with_gallium_tegra, 'tegra_dri.so'], diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/target.c index e09e7768711..835d125f21e 100644 --- a/src/gallium/targets/dri/target.c +++ b/src/gallium/targets/dri/target.c @@ -71,6 +71,10 @@ DEFINE_LOADER_DRM_ENTRYPOINT(kgsl) DEFINE_LOADER_DRM_ENTRYPOINT(virtio_gpu) #endif +#if defined(GALLIUM_V3D) +DEFINE_LOADER_DRM_ENTRYPOINT(v3d) +#endif + #if defined(GALLIUM_VC4) DEFINE_LOADER_DRM_ENTRYPOINT(vc4) #if defined(GALLIUM_PL111) @@ -78,10 +82,6 @@ DEFINE_LOADER_DRM_ENTRYPOINT(pl111) #endif #endif -#if defined(GALLIUM_VC5) -DEFINE_LOADER_DRM_ENTRYPOINT(vc5) -#endif - #if defined(GALLIUM_ETNAVIV) DEFINE_LOADER_DRM_ENTRYPOINT(imx_drm) DEFINE_LOADER_DRM_ENTRYPOINT(etnaviv) |