From 272b6cf58f507180b2ff3059bec16d8f023f5f40 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 24 Oct 2018 15:31:32 -0700 Subject: [PATCH] kmsro: Extend to include hx8357d. This allows vc4 to initialize on the Adafruit PiTFT 3.5" touchscreen with the hx8357d tinydrm driver v2: Whitespace fix noted by Eric Engestrom, update commit message for the driver being merged. v3: Rebase on Rob Herring's pipe-loader changes. Acked-by: Eric Engestrom (v1) Acked-by: Emil Velikov (v1) --- src/gallium/drivers/kmsro/Android.mk | 1 + src/gallium/drivers/kmsro/Automake.inc | 1 + src/gallium/targets/dri/meson.build | 1 + src/gallium/targets/dri/target.c | 1 + 4 files changed, 4 insertions(+) diff --git a/src/gallium/drivers/kmsro/Android.mk b/src/gallium/drivers/kmsro/Android.mk index 8a851024dc8..f6a444e8865 100644 --- a/src/gallium/drivers/kmsro/Android.mk +++ b/src/gallium/drivers/kmsro/Android.mk @@ -35,5 +35,6 @@ include $(BUILD_STATIC_LIBRARY) ifneq ($(HAVE_GALLIUM_KMSRO),) GALLIUM_TARGET_DRIVERS += pl111 +GALLIUM_TARGET_DRIVERS += hx8357d $(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 66d125cb440..d5961c90765 100644 --- a/src/gallium/drivers/kmsro/Automake.inc +++ b/src/gallium/drivers/kmsro/Automake.inc @@ -1,6 +1,7 @@ if HAVE_GALLIUM_KMSRO TARGET_DRIVERS += pl111 +TARGET_DRIVERS += hx8357d 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 c1cb616b4da..bc63702498b 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -63,6 +63,7 @@ libgallium_dri = shared_library( ) foreach d : [[with_gallium_kmsro, 'pl111_dri.so'], + [with_gallium_kmsro, 'hx8357d_dri.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 2821cef197e..6b0ea785c40 100644 --- a/src/gallium/targets/dri/target.c +++ b/src/gallium/targets/dri/target.c @@ -78,6 +78,7 @@ DEFINE_LOADER_DRM_ENTRYPOINT(v3d) #if defined(GALLIUM_VC4) DEFINE_LOADER_DRM_ENTRYPOINT(vc4) #if defined(GALLIUM_KMSRO) +DEFINE_LOADER_DRM_ENTRYPOINT(hx8357d) DEFINE_LOADER_DRM_ENTRYPOINT(pl111) #endif #endif -- 2.30.2