[Mesa-dev] [PATCH 2/2] kmsro: Extend to include hx8357d.

[Eric Anholt]

This allows vc4 to initialize on the Adafruit PiTFT 3.5" touchscreen with
the new tinydrm driver I just submitted.  If this series extending the
pl111/kmsro driver is accepted, then I'll extend kmsro with the other
tinydrm drivers as well.
---
 src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | 5 +++++
 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 +
 5 files changed, 9 insertions(+)

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
index 230bafe5e159..73ddab0cbf02 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
@@ -111,6 +111,11 @@ static const struct drm_driver_descriptor driver_descriptors[] = {
         .create_screen = pipe_kmsro_create_screen,
         .configuration = pipe_default_configuration_query,
     },
+    {
+       .driver_name = "hx8357d",
+        .create_screen = pipe_kmsro_create_screen,
+        .configuration = pipe_default_configuration_query,
+    },
     {
         .driver_name = "virtio_gpu",
         .create_screen = pipe_virgl_create_screen,
diff --git a/src/gallium/drivers/kmsro/Android.mk b/src/gallium/drivers/kmsro/Android.mk
index 8a851024dc88..f6a444e8865b 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 66d125cb440a..d5961c907653 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 c1cb616b4dad..bc63702498ba 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 2821cef197ea..6b0ea785c405 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.19.1