kmsro: Extend to include armada-drm

This allows using the Marvell Armada display controllers (with the
armada drm modesetting driver) along with the render-only drivers,
such as Etnaviv on an OLPC XO-1.75 laptop.

v2:
- Add to Android.mk too

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/gallium/drivers/kmsro/Android.mk b/src/gallium/drivers/kmsro/Android.mk
index 78340f56e4653bf3ce6a63485335a58c68641b03..4189c9bd6ecf683ab44741d94e9781ee3ed06890 100644 (file)
--- a/src/gallium/drivers/kmsro/Android.mk
+++ b/src/gallium/drivers/kmsro/Android.mk
@@ -34,6 +34,7 @@ include $(GALLIUM_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 ifneq ($(HAVE_GALLIUM_KMSRO),)
+GALLIUM_TARGET_DRIVERS += armada-drm
 GALLIUM_TARGET_DRIVERS += exynos
 GALLIUM_TARGET_DRIVERS += hx8357d
 GALLIUM_TARGET_DRIVERS += ili9225

diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index 3101c7bd90dddf59510aa1d1a01054205b59a865..5b4b4bc1ab777e3ae214d5e7ab3fb4b07ebdcd22 100644 (file)
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -66,6 +66,7 @@ libgallium_dri = shared_library(
 )
 
 foreach d : [[with_gallium_kmsro, [
+               'armada-drm_dri.so',
                'exynos_dri.so',
                'hx8357d_dri.so',
                'ili9225_dri.so',

diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/target.c
index ec657de277dfb4f5ecc65c19cc8d19c7053b1446..bae2f1ed002d1b7ad2e415041430cdfa9be26d34 100644 (file)
--- a/src/gallium/targets/dri/target.c
+++ b/src/gallium/targets/dri/target.c
@@ -84,6 +84,7 @@ DEFINE_LOADER_DRM_ENTRYPOINT(panfrost)
 #endif
 
 #if defined(GALLIUM_ETNAVIV)
+DEFINE_LOADER_DRM_ENTRYPOINT(armada_drm)
 DEFINE_LOADER_DRM_ENTRYPOINT(imx_drm)
 DEFINE_LOADER_DRM_ENTRYPOINT(etnaviv)
 #endif