geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

always define HAVE_FREEDRENO_KGSL 

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
main
Eric Engestrom 2018-01-26 15:19:03 +00:00
parent ee47329bef
commit ec53f4808c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -395,6 +395,8 @@ fi
AM_CONDITIONAL(HAVE_FREEDRENO_KGSL, [test "x$FREEDRENO_KGSL" = xyes]) AM_CONDITIONAL(HAVE_FREEDRENO_KGSL, [test "x$FREEDRENO_KGSL" = xyes])
if test "x$FREEDRENO_KGSL" = xyes; then if test "x$FREEDRENO_KGSL" = xyes; then
AC_DEFINE(HAVE_FREEDRENO_KGSL, 1, [Have freedreno support for KGSL kernel interface]) AC_DEFINE(HAVE_FREEDRENO_KGSL, 1, [Have freedreno support for KGSL kernel interface])
else
AC_DEFINE(HAVE_FREEDRENO_KGSL, 0)
fi fi
AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" = xyes]) AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" = xyes])

2
freedreno/freedreno_bo.c
View File

@ -326,7 +326,7 @@ void fd_bo_cpu_fini(struct fd_bo *bo)
bo->funcs->cpu_fini(bo); bo->funcs->cpu_fini(bo);
} }
#ifndef HAVE_FREEDRENO_KGSL #if !HAVE_FREEDRENO_KGSL
struct fd_bo * fd_bo_from_fbdev(struct fd_pipe *pipe, int fbfd, uint32_t size) struct fd_bo * fd_bo_from_fbdev(struct fd_pipe *pipe, int fbfd, uint32_t size)
{ {
return NULL; return NULL;

2
freedreno/freedreno_device.c
View File

@ -65,7 +65,7 @@ struct fd_device * fd_device_new(int fd)
dev = msm_device_new(fd); dev = msm_device_new(fd);
dev->version = version->version_minor; dev->version = version->version_minor;
#ifdef HAVE_FREEDRENO_KGSL #if HAVE_FREEDRENO_KGSL
} else if (!strcmp(version->name, "kgsl")) { } else if (!strcmp(version->name, "kgsl")) {
DEBUG_MSG("kgsl DRM device"); DEBUG_MSG("kgsl DRM device");
dev = kgsl_device_new(fd); dev = kgsl_device_new(fd);

6
meson.build
View File

@ -255,15 +255,13 @@ foreach t : [[with_intel, 'INTEL'], [with_vmwgfx, 'VMWGFX'],
[with_nouveau, 'NOUVEAU'], [with_nouveau, 'NOUVEAU'],
[with_exynos, 'EXYNOS'], [with_exynos, 'EXYNOS'],
[with_vc4, 'VC4'], [with_vc4, 'VC4'],
[with_freedreno_kgsl, 'FREEDRENO_KGSL'],
[with_radeon, 'RADEON']] [with_radeon, 'RADEON']]
config.set10('HAVE_@0@'.format(t[1]), t[0]) config.set10('HAVE_@0@'.format(t[1]), t[0])
endforeach endforeach
if with_freedreno_kgsl if with_freedreno_kgsl and not with_freedreno
if not with_freedreno
error('cannot enable freedreno-kgsl without freedreno support') error('cannot enable freedreno-kgsl without freedreno support')
endif endif
config.set10('HAVE_FREEDRENO_KGSL', true)
endif
if dep_cairo.found() if dep_cairo.found()
config.set10('HAVE_CAIRO', true) config.set10('HAVE_CAIRO', true)
endif endif