From: Rob Clark <robdclark@gmail.com>
Date: Mon, 21 Jul 2014 14:43:30 +0000 (-0400)
Subject: targets/dri: fix freedreno targets
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f6dfd16e343ce8ca2095c86a26ba6264bc25cdb;p=mesa.git

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 bdd8669ff86..5656ef076cf 100644
--- 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 61d6bc7aa3e..0816b8c9b25 100644
--- 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 \