Module: Mesa Branch: master Commit: 8cfc17bdda31a381bfbaadc75f0d34dada0e8c91 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8cfc17bdda31a381bfbaadc75f0d34dada0e8c91
Author: Eric Anholt <[email protected]> Date: Mon Jan 28 09:51:41 2019 -0800 kmsro: Add the rest of the current set of tinydrm drivers. While I haven't tested them all, given that they're all using the same allocation paths and modifiers in the kernel they should be fine to use in the same way. v2: Rebase on other kmsro changes. v3: Skip repeated '[with_gallium_kmsro,' in the meson build. Acked-by: Alyssa Rosenzweig <[email protected]> --- src/gallium/drivers/kmsro/Android.mk | 8 +++++++- src/gallium/drivers/kmsro/Automake.inc | 8 +++++++- src/gallium/targets/dri/meson.build | 18 +++++++++++++----- src/gallium/targets/dri/target.c | 6 ++++++ 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/kmsro/Android.mk b/src/gallium/drivers/kmsro/Android.mk index 06062e244aa..dc5e2b2f553 100644 --- a/src/gallium/drivers/kmsro/Android.mk +++ b/src/gallium/drivers/kmsro/Android.mk @@ -34,8 +34,14 @@ include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) ifneq ($(HAVE_GALLIUM_KMSRO),) -GALLIUM_TARGET_DRIVERS += pl111 GALLIUM_TARGET_DRIVERS += hx8357d +GALLIUM_TARGET_DRIVERS += ili9225 +GALLIUM_TARGET_DRIVERS += ili9341 GALLIUM_TARGET_DRIVERS += imx +GALLIUM_TARGET_DRIVERS += mi0283qt +GALLIUM_TARGET_DRIVERS += pl111 +GALLIUM_TARGET_DRIVERS += repaper +GALLIUM_TARGET_DRIVERS += st7586 +GALLIUM_TARGET_DRIVERS += st7735r $(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_kmsro) endif diff --git a/src/gallium/drivers/kmsro/Automake.inc b/src/gallium/drivers/kmsro/Automake.inc index d5961c90765..61989f425ac 100644 --- a/src/gallium/drivers/kmsro/Automake.inc +++ b/src/gallium/drivers/kmsro/Automake.inc @@ -1,7 +1,13 @@ if HAVE_GALLIUM_KMSRO -TARGET_DRIVERS += pl111 TARGET_DRIVERS += hx8357d +TARGET_DRIVERS += ili9225 +TARGET_DRIVERS += ili9341 +TARGET_DRIVERS += mi0283qt +TARGET_DRIVERS += pl111 +TARGET_DRIVERS += repaper +TARGET_DRIVERS += st7586 +TARGET_DRIVERS += st7735r TARGET_CPPFLAGS += -DGALLIUM_KMSRO TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/winsys/kmsro/drm/libkmsrodrm.la \ diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index df77d329efa..43f7ac2c22c 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -62,11 +62,19 @@ libgallium_dri = shared_library( ], ) -foreach d : [[with_gallium_kmsro, 'pl111_dri.so'], - [with_gallium_kmsro, 'hx8357d_dri.so'], - [with_gallium_kmsro, 'imx-drm_dri.so'], - [with_gallium_kmsro, 'rockchip_dri.so'], - [with_gallium_kmsro, 'meson_dri.so'], +foreach d : [[with_gallium_kmsro, [ + 'hx8357d_dri.so', + 'ili9225_dri.so', + 'ili9341_dri.so', + 'imx-drm_dri.so', + 'meson_dri.so', + 'mi0283qt_dri.so', + 'pl111_dri.so', + 'repaper_dri.so', + 'rockchip_dri.so', + 'st7586.so', + 'st7735r.so', + ]], [with_gallium_radeonsi, 'radeonsi_dri.so'], [with_gallium_nouveau, 'nouveau_dri.so'], [with_gallium_freedreno, ['msm_dri.so', 'kgsl_dri.so']], diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/target.c index 8acec0c819d..2d83d88324f 100644 --- a/src/gallium/targets/dri/target.c +++ b/src/gallium/targets/dri/target.c @@ -94,8 +94,14 @@ DEFINE_LOADER_DRM_ENTRYPOINT(tegra); #if defined(GALLIUM_KMSRO) DEFINE_LOADER_DRM_ENTRYPOINT(hx8357d) +DEFINE_LOADER_DRM_ENTRYPOINT(ili9225) +DEFINE_LOADER_DRM_ENTRYPOINT(ili9341) DEFINE_LOADER_DRM_ENTRYPOINT(meson) +DEFINE_LOADER_DRM_ENTRYPOINT(mi0283qt) DEFINE_LOADER_DRM_ENTRYPOINT(pl111) +DEFINE_LOADER_DRM_ENTRYPOINT(repaper) DEFINE_LOADER_DRM_ENTRYPOINT(rockchip) +DEFINE_LOADER_DRM_ENTRYPOINT(st7586) +DEFINE_LOADER_DRM_ENTRYPOINT(st7735r) #endif _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
