Module: Mesa Branch: master Commit: 9f6dfd16e343ce8ca2095c86a26ba6264bc25cdb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f6dfd16e343ce8ca2095c86a26ba6264bc25cdb
Author: Rob Clark <[email protected]> Date: Mon Jul 21 10:43:30 2014 -0400 targets/dri: fix freedreno targets The kernel driver name is either "kgsl" (downstream/android) or "msm" (upstream). Signed-off-by: Rob Clark <[email protected]> --- src/gallium/auxiliary/target-helpers/inline_drm_helper.h | 12 ++++++++++-- src/gallium/targets/dri/Makefile.am | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h index bdd8669..5656ef0 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 61d6bc7..0816b8c 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 \ _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
