targets/dri: fix freedreno targets

The kernel driver name is either "kgsl" (downstream/android) or "msm"
(upstream).

Signed-off-by: Rob Clark <robclark@freedesktop.org>

diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
index bdd8669ff8680e489b8c51e42ca81a4fa886022d..5656ef076cf1756638aa93eeb59eb3fbc44ce7e8 100644 (file)
--- a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
@@ -225,9 +225,17 @@ pipe_vmwgfx_create_screen(int fd)
 #if defined(GALLIUM_FREEDRENO)
 #if defined(DRI_TARGET)
 
-const __DRIextension **__driDriverGetExtensions_freedreno(void);
+const __DRIextension **__driDriverGetExtensions_msm(void);
 
-PUBLIC const __DRIextension **__driDriverGetExtensions_freedreno(void)
+PUBLIC const __DRIextension **__driDriverGetExtensions_msm(void)
+{
+   globalDriverAPI = &galliumdrm_driver_api;
+   return galliumdrm_driver_extensions;
+}
+
+const __DRIextension **__driDriverGetExtensions_kgsl(void);
+
+PUBLIC const __DRIextension **__driDriverGetExtensions_kgsl(void)
 {
    globalDriverAPI = &galliumdrm_driver_api;
    return galliumdrm_driver_extensions;

diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index 61d6bc7aa3ead301ac210f1f1f2b583018536db8..0816b8c9b25212a5206e94b945ce6f3686fdb0ca 100644 (file)
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -131,7 +131,7 @@ STATIC_TARGET_LIB_DEPS += \
 endif
 
 if HAVE_GALLIUM_FREEDRENO
-MEGADRIVERS += freedreno
+MEGADRIVERS += msm kgsl
 STATIC_TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO
 STATIC_TARGET_LIB_DEPS += \
        $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \