From: Eric Anholt
The vc4 driver can do prime sharing to many different KMS-only devices,
such as the various tinydrm drivers for SPI-attached displays. Rename the
driver away from "pl111" to represent what it will actually support:
various sorts of KMS displays with the renderonly layer used to attach a
GPU.
Acked-by: Emil Velikov
Signed-off-by: Rob Herring
---
.travis.yml | 2 +-
Android.mk | 4 ++--
Makefile.am | 2 +-
configure.ac | 16
meson.build | 8
meson_options.txt| 2 +-
src/gallium/Android.mk | 2 +-
src/gallium/Makefile.am | 4 ++--
.../auxiliary/pipe-loader/pipe_loader_drm.c | 2 +-
.../auxiliary/target-helpers/drm_helper.h| 12 ++--
.../auxiliary/target-helpers/drm_helper_public.h | 2 +-
src/gallium/drivers/{pl111 => kmsro}/Android.mk | 6 +++---
src/gallium/drivers/kmsro/Automake.inc | 9 +
src/gallium/drivers/{pl111 => kmsro}/Makefile.am | 4 ++--
.../drivers/{pl111 => kmsro}/Makefile.sources| 0
src/gallium/drivers/pl111/Automake.inc | 9 -
src/gallium/meson.build | 6 +++---
src/gallium/targets/dri/Makefile.am | 2 +-
src/gallium/targets/dri/meson.build | 4 ++--
src/gallium/targets/dri/target.c | 2 +-
.../winsys/{pl111 => kmsro}/drm/Android.mk | 2 +-
.../winsys/{pl111 => kmsro}/drm/Makefile.am | 4 ++--
src/gallium/winsys/kmsro/drm/Makefile.sources| 3 +++
.../drm/kmsro_drm_public.h} | 8
.../drm/kmsro_drm_winsys.c} | 6 +++---
.../winsys/{pl111 => kmsro}/drm/meson.build | 12 ++--
src/gallium/winsys/pl111/drm/Makefile.sources| 3 ---
27 files changed, 68 insertions(+), 68 deletions(-)
rename src/gallium/drivers/{pl111 => kmsro}/Android.mk (91%)
create mode 100644 src/gallium/drivers/kmsro/Automake.inc
rename src/gallium/drivers/{pl111 => kmsro}/Makefile.am (55%)
rename src/gallium/drivers/{pl111 => kmsro}/Makefile.sources (100%)
delete mode 100644 src/gallium/drivers/pl111/Automake.inc
rename src/gallium/winsys/{pl111 => kmsro}/drm/Android.mk (97%)
rename src/gallium/winsys/{pl111 => kmsro}/drm/Makefile.am (94%)
create mode 100644 src/gallium/winsys/kmsro/drm/Makefile.sources
rename src/gallium/winsys/{pl111/drm/pl111_drm_public.h =>
kmsro/drm/kmsro_drm_public.h} (89%)
rename src/gallium/winsys/{pl111/drm/pl111_drm_winsys.c =>
kmsro/drm/kmsro_drm_winsys.c} (92%)
rename src/gallium/winsys/{pl111 => kmsro}/drm/meson.build (87%)
delete mode 100644 src/gallium/winsys/pl111/drm/Makefile.sources
diff --git a/.travis.yml b/.travis.yml
index 67bbf592a901..6936699cfac3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -352,7 +352,7 @@ matrix:
- DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
- DRI_DRIVERS=""
- GALLIUM_ST="--enable-dri --disable-opencl --disable-xa
--disable-nine --disable-xvmc --disable-vdpau --disable-va
--disable-omx-bellagio --disable-gallium-osmesa"
--
GALLIUM_DRIVERS="i915,nouveau,pl111,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv,imx"
+-
GALLIUM_DRIVERS="i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv,imx"
- VULKAN_DRIVERS=""
- LIBUNWIND_FLAGS="--enable-libunwind"
addons:
diff --git a/Android.mk b/Android.mk
index 914854c27d63..1a0bdd1736cf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,7 @@
# BOARD_GPU_DRIVERS should be defined. The valid values are
#
# classic drivers: i915 i965
-# gallium drivers: swrast freedreno i915g nouveau pl111 r300g r600g radeonsi
vc4 virgl vmwgfx etnaviv imx
+# gallium drivers: swrast freedreno i915g nouveau kmsro r300g r600g radeonsi
vc4 virgl vmwgfx etnaviv imx
#
# The main target is libGLES_mesa. For each classic driver enabled, a DRI
# module will also be built. DRI modules will be loaded by libGLES_mesa.
@@ -52,7 +52,7 @@ gallium_drivers := \
freedreno.HAVE_GALLIUM_FREEDRENO \
i915g.HAVE_GALLIUM_I915 \
nouveau.HAVE_GALLIUM_NOUVEAU \
- pl111.HAVE_GALLIUM_PL111 \
+ kmsro.HAVE_GALLIUM_KMSRO \
r300g.HAVE_GALLIUM_R300 \
r600g.HAVE_GALLIUM_R600 \
radeonsi.HAVE_GALLIUM_RADEONSI \
diff --git a/Makefile.am b/Makefile.am
index 9e27db046e52..62c755aeca7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-libunwind \
--with-platforms=x11,wayland,drm,surfaceless \
--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast \
-
--with-gallium-drivers=i915,nouveau,r300,pl111,r600,radeonsi,freedreno,svga,swrast,vc4,tegra,virgl,swr,etnaviv,imx
