Mesa (master): kmsro: Extend to include armada-drm
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Apr 11 15:53:48 UTC 2019
Module: Mesa
Branch: master
Commit: 3dd2001993409d08e7b0fbc9d817e4a2181b52b1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3dd2001993409d08e7b0fbc9d817e4a2181b52b1
Author: Lubomir Rintel <lkundrak at v3.sk>
Date: Thu Mar 21 22:19:34 2019 +0100
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 at v3.sk>
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/gallium/drivers/kmsro/Android.mk | 1 +
src/gallium/targets/dri/meson.build | 1 +
src/gallium/targets/dri/target.c | 1 +
3 files changed, 3 insertions(+)
diff --git a/src/gallium/drivers/kmsro/Android.mk b/src/gallium/drivers/kmsro/Android.mk
index 78340f56e46..4189c9bd6ec 100644
--- 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 3101c7bd90d..5b4b4bc1ab7 100644
--- 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 ec657de277d..bae2f1ed002 100644
--- 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
More information about the mesa-commit
mailing list