| Message ID | 1392825893-7380-4-git-send-email-thierry.reding@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Feb 19, 2014 at 5:04 PM, Thierry Reding <thierry.reding@gmail.com> wrote: > diff --git a/tests/tegra/Makefile.am b/tests/tegra/Makefile.am > new file mode 100644 > index 000000000000..7039f09d38aa > --- /dev/null > +++ b/tests/tegra/Makefile.am > @@ -0,0 +1,20 @@ > +AM_CPPFLAGS = \ > + -I$(top_srcdir)/include/drm \ > + -I$(top_srcdir)/tegra > + > +AM_CFLAGS = -Wall -Werror > + > +LDADD = \ > + ../../tegra/libdrm_tegra.la You also need to add ../../libdrm.la here.
On Wed, Feb 19, 2014 at 9:19 PM, Erik Faye-Lund <kusmabite@gmail.com> wrote: > On Wed, Feb 19, 2014 at 5:04 PM, Thierry Reding > <thierry.reding@gmail.com> wrote: >> diff --git a/tests/tegra/Makefile.am b/tests/tegra/Makefile.am >> new file mode 100644 >> index 000000000000..7039f09d38aa >> --- /dev/null >> +++ b/tests/tegra/Makefile.am >> @@ -0,0 +1,20 @@ >> +AM_CPPFLAGS = \ >> + -I$(top_srcdir)/include/drm \ >> + -I$(top_srcdir)/tegra >> + >> +AM_CFLAGS = -Wall -Werror >> + >> +LDADD = \ >> + ../../tegra/libdrm_tegra.la > > You also need to add ../../libdrm.la here. But even so, "make check" fails without any explanation. However, gr2d-fill also fails. But with an error: "failed to open DRM device (null): Bad address". Judging from the source-code, it seems they expect arguments that "make check" doesn't provide.
On Wed, Feb 19, 2014 at 5:04 PM, Thierry Reding <thierry.reding@gmail.com> wrote: > From: Thierry Reding <treding@nvidia.com> > > This test opens a device, dumps the version information and checks that > a Tegra DRM context can be opened on it. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > configure.ac | 1 + > tests/Makefile.am | 4 ++++ > tests/tegra/Makefile.am | 20 ++++++++++++++++ > tests/tegra/openclose.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 88 insertions(+) > create mode 100644 tests/tegra/Makefile.am > create mode 100644 tests/tegra/openclose.c > > diff --git a/configure.ac b/configure.ac > index 752a70592933..c4ae14e8d2e1 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -421,6 +421,7 @@ AC_CONFIG_FILES([ > tests/radeon/Makefile > tests/vbltest/Makefile > tests/exynos/Makefile > + tests/tegra/Makefile > include/Makefile > include/drm/Makefile > man/Makefile > diff --git a/tests/Makefile.am b/tests/Makefile.am > index cd1149130214..0a3d21f2d99f 100644 > --- a/tests/Makefile.am > +++ b/tests/Makefile.am > @@ -24,6 +24,10 @@ if HAVE_EXYNOS > SUBDIRS += exynos > endif > > +if HAVE_TEGRA > +SUBDIRS += tegra > +endif > + > if HAVE_LIBUDEV > > check_LTLIBRARIES = libdrmtest.la > diff --git a/tests/tegra/Makefile.am b/tests/tegra/Makefile.am > new file mode 100644 > index 000000000000..7039f09d38aa > --- /dev/null > +++ b/tests/tegra/Makefile.am > @@ -0,0 +1,20 @@ > +AM_CPPFLAGS = \ > + -I$(top_srcdir)/include/drm \ > + -I$(top_srcdir)/tegra > + > +AM_CFLAGS = -Wall -Werror > + > +LDADD = \ > + ../../tegra/libdrm_tegra.la > + > +TESTS = \ > + openclose \ > + > +if HAVE_INSTALL_TESTS > +testdir = $(libexecdir)/libdrm/tests/tegra > +test_PROGRAMS = \ > + $(TESTS) > +else > +noinst_PROGRAMS = $(TESTS) > +check_PROGRAMS = $(TESTS) > +endif You should probably add openclose to .gitignore also. The same goes for gr2d-fill in the other commit.
diff --git a/configure.ac b/configure.ac index 752a70592933..c4ae14e8d2e1 100644 --- a/configure.ac +++ b/configure.ac @@ -421,6 +421,7 @@ AC_CONFIG_FILES([ tests/radeon/Makefile tests/vbltest/Makefile tests/exynos/Makefile + tests/tegra/Makefile include/Makefile include/drm/Makefile man/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index cd1149130214..0a3d21f2d99f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,6 +24,10 @@ if HAVE_EXYNOS SUBDIRS += exynos endif +if HAVE_TEGRA +SUBDIRS += tegra +endif + if HAVE_LIBUDEV check_LTLIBRARIES = libdrmtest.la diff --git a/tests/tegra/Makefile.am b/tests/tegra/Makefile.am new file mode 100644 index 000000000000..7039f09d38aa --- /dev/null +++ b/tests/tegra/Makefile.am @@ -0,0 +1,20 @@ +AM_CPPFLAGS = \ + -I$(top_srcdir)/include/drm \ + -I$(top_srcdir)/tegra + +AM_CFLAGS = -Wall -Werror + +LDADD = \ + ../../tegra/libdrm_tegra.la + +TESTS = \ + openclose \ + +if HAVE_INSTALL_TESTS +testdir = $(libexecdir)/libdrm/tests/tegra +test_PROGRAMS = \ + $(TESTS) +else +noinst_PROGRAMS = $(TESTS) +check_PROGRAMS = $(TESTS) +endif diff --git a/tests/tegra/openclose.c b/tests/tegra/openclose.c new file mode 100644 index 000000000000..5b4230c774f6 --- /dev/null +++ b/tests/tegra/openclose.c @@ -0,0 +1,63 @@ +/* + * Copyright © 2014 NVIDIA Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <fcntl.h> +#include <stdio.h> +#include <unistd.h> + +#include "xf86drm.h" +#include "tegra.h" + +int main(int argc, char *argv[]) +{ + struct drm_tegra *tegra; + drmVersionPtr version; + int err, fd; + + fd = open(argv[1], O_RDWR); + if (fd < 0) + return 1; + + version = drmGetVersion(fd); + if (version) { + printf("Version: %d.%d.%d\n", version->version_major, + version->version_minor, version->version_patchlevel); + printf(" Name: %s\n", version->name); + printf(" Date: %s\n", version->date); + printf(" Description: %s\n", version->desc); + + drmFreeVersion(version); + } + + err = drm_tegra_new(&tegra, fd); + if (err < 0) + return 1; + + drm_tegra_close(tegra); + close(fd); + + return 0; +}