diff options
| author | Rob Clark <[email protected]> | 2014-07-21 10:43:30 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2014-07-23 09:03:09 -0400 |
| commit | 9f6dfd16e343ce8ca2095c86a26ba6264bc25cdb (patch) | |
| tree | 40b27ccfe2ef6cbec5d8b8bb810eaded93465ea3 | |
| parent | c357e8475a05a5417f6a3d90f03e3789f014c9c7 (diff) | |
targets/dri: fix freedreno targets
The kernel driver name is either "kgsl" (downstream/android) or "msm"
(upstream).
Signed-off-by: Rob Clark <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/target-helpers/inline_drm_helper.h | 12 | ||||
| -rw-r--r-- | 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 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 \ |