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

meson,configure: always define HAVE_{INTEL,VMWGFX,NOUVEAU,EXYNOS,VC4,RADEON} 

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 16:21:30 +00:00
parent 540827cc7d
commit ee47329bef
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -358,16 +358,22 @@ AM_CONDITIONAL(HAVE_LIBKMS, [test "x$LIBKMS" = xyes])
AM_CONDITIONAL(HAVE_INTEL, [test "x$INTEL" = xyes]) AM_CONDITIONAL(HAVE_INTEL, [test "x$INTEL" = xyes])
if test "x$INTEL" = xyes; then if test "x$INTEL" = xyes; then
AC_DEFINE(HAVE_INTEL, 1, [Have intel support]) AC_DEFINE(HAVE_INTEL, 1, [Have intel support])
else
AC_DEFINE(HAVE_INTEL, 0)
fi fi
AM_CONDITIONAL(HAVE_VMWGFX, [test "x$VMWGFX" = xyes]) AM_CONDITIONAL(HAVE_VMWGFX, [test "x$VMWGFX" = xyes])
if test "x$VMWGFX" = xyes; then if test "x$VMWGFX" = xyes; then
AC_DEFINE(HAVE_VMWGFX, 1, [Have vmwgfx kernel headers]) AC_DEFINE(HAVE_VMWGFX, 1, [Have vmwgfx kernel headers])
else
AC_DEFINE(HAVE_VMWGFX, 0)
fi fi
AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes]) AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes])
if test "x$NOUVEAU" = xyes; then if test "x$NOUVEAU" = xyes; then
AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau (nvidia) support]) AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau (nvidia) support])
else
AC_DEFINE(HAVE_NOUVEAU, 0)
fi fi
AM_CONDITIONAL(HAVE_OMAP, [test "x$OMAP" = xyes]) AM_CONDITIONAL(HAVE_OMAP, [test "x$OMAP" = xyes])
@ -375,6 +381,8 @@ AM_CONDITIONAL(HAVE_OMAP, [test "x$OMAP" = xyes])
AM_CONDITIONAL(HAVE_EXYNOS, [test "x$EXYNOS" = xyes]) AM_CONDITIONAL(HAVE_EXYNOS, [test "x$EXYNOS" = xyes])
if test "x$EXYNOS" = xyes; then if test "x$EXYNOS" = xyes; then
AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support]) AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support])
else
AC_DEFINE(HAVE_EXYNOS, 0)
fi fi
AM_CONDITIONAL(HAVE_FREEDRENO, [test "x$FREEDRENO" = xyes]) AM_CONDITIONAL(HAVE_FREEDRENO, [test "x$FREEDRENO" = xyes])
@ -392,6 +400,8 @@ fi
AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" = xyes]) AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" = xyes])
if test "x$RADEON" = xyes; then if test "x$RADEON" = xyes; then
AC_DEFINE(HAVE_RADEON, 1, [Have radeon support]) AC_DEFINE(HAVE_RADEON, 1, [Have radeon support])
else
AC_DEFINE(HAVE_RADEON, 0)
fi fi
if test "x$AMDGPU" != xno; then if test "x$AMDGPU" != xno; then
@ -421,6 +431,8 @@ if test "x$AMDGPU" = xyes; then
if test "x$have_cunit" = "xno"; then if test "x$have_cunit" = "xno"; then
AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests]) AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests])
fi fi
else
AC_DEFINE(HAVE_AMDGPU, 0)
fi fi
AM_CONDITIONAL(HAVE_TEGRA, [test "x$TEGRA" = xyes]) AM_CONDITIONAL(HAVE_TEGRA, [test "x$TEGRA" = xyes])
@ -428,6 +440,8 @@ AM_CONDITIONAL(HAVE_TEGRA, [test "x$TEGRA" = xyes])
AM_CONDITIONAL(HAVE_VC4, [test "x$VC4" = xyes]) AM_CONDITIONAL(HAVE_VC4, [test "x$VC4" = xyes])
if test "x$VC4" = xyes; then if test "x$VC4" = xyes; then
AC_DEFINE(HAVE_VC4, 1, [Have VC4 support]) AC_DEFINE(HAVE_VC4, 1, [Have VC4 support])
else
AC_DEFINE(HAVE_VC4, 0)
fi fi
AM_CONDITIONAL(HAVE_ETNAVIV, [test "x$ETNAVIV" = xyes]) AM_CONDITIONAL(HAVE_ETNAVIV, [test "x$ETNAVIV" = xyes])

10
libkms/linux.c
View File

@ -110,27 +110,27 @@ linux_from_sysfs(int fd, struct kms_driver **out)
if (ret) if (ret)
return ret; return ret;
#ifdef HAVE_INTEL #if HAVE_INTEL
if (!strcmp(name, "intel")) if (!strcmp(name, "intel"))
ret = intel_create(fd, out); ret = intel_create(fd, out);
else else
#endif #endif
#ifdef HAVE_VMWGFX #if HAVE_VMWGFX
if (!strcmp(name, "vmwgfx")) if (!strcmp(name, "vmwgfx"))
ret = vmwgfx_create(fd, out); ret = vmwgfx_create(fd, out);
else else
#endif #endif
#ifdef HAVE_NOUVEAU #if HAVE_NOUVEAU
if (!strcmp(name, "nouveau")) if (!strcmp(name, "nouveau"))
ret = nouveau_create(fd, out); ret = nouveau_create(fd, out);
else else
#endif #endif
#ifdef HAVE_RADEON #if HAVE_RADEON
if (!strcmp(name, "radeon")) if (!strcmp(name, "radeon"))
ret = radeon_create(fd, out); ret = radeon_create(fd, out);
else else
#endif #endif
#ifdef HAVE_EXYNOS #if HAVE_EXYNOS
if (!strcmp(name, "exynos")) if (!strcmp(name, "exynos"))
ret = exynos_create(fd, out); ret = exynos_create(fd, out);
else else

4
meson.build
View File

@ -256,9 +256,7 @@ foreach t : [[with_intel, 'INTEL'], [with_vmwgfx, 'VMWGFX'],
[with_exynos, 'EXYNOS'], [with_exynos, 'EXYNOS'],
[with_vc4, 'VC4'], [with_vc4, 'VC4'],
[with_radeon, 'RADEON']] [with_radeon, 'RADEON']]
if t[0] config.set10('HAVE_@0@'.format(t[1]), t[0])
config.set10('HAVE_@0@'.format(t[1]), true)
endif
endforeach endforeach
if with_freedreno_kgsl if with_freedreno_kgsl
if not with_freedreno if not with_freedreno