aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom2018-01-26 09:19:03 -0600
committerEric Engestrom2018-01-29 09:41:52 -0600
commitec53f4808c8ccd73cd2dbed8b53a4e961e3a2b76 (patch)
tree4ed76e932f9b45e7a7558c8b7970672a73c3cc4f
parentee47329bef727a109418f7134638e0fe67210748 (diff)
downloadexternal-libgbm-ec53f4808c8ccd73cd2dbed8b53a4e961e3a2b76.tar.gz
external-libgbm-ec53f4808c8ccd73cd2dbed8b53a4e961e3a2b76.tar.xz
external-libgbm-ec53f4808c8ccd73cd2dbed8b53a4e961e3a2b76.zip
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>
-rw-r--r--configure.ac2
-rw-r--r--freedreno/freedreno_bo.c2
-rw-r--r--freedreno/freedreno_device.c2
-rw-r--r--meson.build8
4 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 32ceba69..e19fdc99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -395,6 +395,8 @@ fi
395AM_CONDITIONAL(HAVE_FREEDRENO_KGSL, [test "x$FREEDRENO_KGSL" = xyes]) 395AM_CONDITIONAL(HAVE_FREEDRENO_KGSL, [test "x$FREEDRENO_KGSL" = xyes])
396if test "x$FREEDRENO_KGSL" = xyes; then 396if test "x$FREEDRENO_KGSL" = xyes; then
397 AC_DEFINE(HAVE_FREEDRENO_KGSL, 1, [Have freedreno support for KGSL kernel interface]) 397 AC_DEFINE(HAVE_FREEDRENO_KGSL, 1, [Have freedreno support for KGSL kernel interface])
398else
399 AC_DEFINE(HAVE_FREEDRENO_KGSL, 0)
398fi 400fi
399 401
400AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" = xyes]) 402AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" = xyes])
diff --git a/freedreno/freedreno_bo.c b/freedreno/freedreno_bo.c
index 7f8ea59c..df35c36a 100644
--- a/freedreno/freedreno_bo.c
+++ b/freedreno/freedreno_bo.c
@@ -326,7 +326,7 @@ void fd_bo_cpu_fini(struct fd_bo *bo)
326 bo->funcs->cpu_fini(bo); 326 bo->funcs->cpu_fini(bo);
327} 327}
328 328
329#ifndef HAVE_FREEDRENO_KGSL 329#if !HAVE_FREEDRENO_KGSL
330struct fd_bo * fd_bo_from_fbdev(struct fd_pipe *pipe, int fbfd, uint32_t size) 330struct fd_bo * fd_bo_from_fbdev(struct fd_pipe *pipe, int fbfd, uint32_t size)
331{ 331{
332 return NULL; 332 return NULL;
diff --git a/freedreno/freedreno_device.c b/freedreno/freedreno_device.c
index 12b95fd0..a0334bf4 100644
--- a/freedreno/freedreno_device.c
+++ b/freedreno/freedreno_device.c
@@ -65,7 +65,7 @@ struct fd_device * fd_device_new(int fd)
65 65
66 dev = msm_device_new(fd); 66 dev = msm_device_new(fd);
67 dev->version = version->version_minor; 67 dev->version = version->version_minor;
68#ifdef HAVE_FREEDRENO_KGSL 68#if HAVE_FREEDRENO_KGSL
69 } else if (!strcmp(version->name, "kgsl")) { 69 } else if (!strcmp(version->name, "kgsl")) {
70 DEBUG_MSG("kgsl DRM device"); 70 DEBUG_MSG("kgsl DRM device");
71 dev = kgsl_device_new(fd); 71 dev = kgsl_device_new(fd);
diff --git a/meson.build b/meson.build
index 7298f741..c7245dda 100644
--- a/meson.build
+++ b/meson.build
@@ -255,14 +255,12 @@ foreach t : [[with_intel, 'INTEL'], [with_vmwgfx, 'VMWGFX'],
255 [with_nouveau, 'NOUVEAU'], 255 [with_nouveau, 'NOUVEAU'],
256 [with_exynos, 'EXYNOS'], 256 [with_exynos, 'EXYNOS'],
257 [with_vc4, 'VC4'], 257 [with_vc4, 'VC4'],
258 [with_freedreno_kgsl, 'FREEDRENO_KGSL'],
258 [with_radeon, 'RADEON']] 259 [with_radeon, 'RADEON']]
259 config.set10('HAVE_@0@'.format(t[1]), t[0]) 260 config.set10('HAVE_@0@'.format(t[1]), t[0])
260endforeach 261endforeach
261if with_freedreno_kgsl 262if with_freedreno_kgsl and not with_freedreno
262 if not with_freedreno 263 error('cannot enable freedreno-kgsl without freedreno support')
263 error('cannot enable freedreno-kgsl without freedreno support')
264 endif
265 config.set10('HAVE_FREEDRENO_KGSL', true)
266endif 264endif
267if dep_cairo.found() 265if dep_cairo.found()
268 config.set10('HAVE_CAIRO', true) 266 config.set10('HAVE_CAIRO', true)