diff mbox

[v2,libdrm,3/7] tegra: Add simple test for drm_tegra_open()

Message ID 1397043630-13972-4-git-send-email-thierry.reding@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thierry Reding April 9, 2014, 11:40 a.m. UTC 
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>
---
Changes in v2:
- fix in-tree build failure

 configure.ac            |  1 +
 tests/Makefile.am       |  4 ++++
 tests/tegra/.gitignore  |  1 +
 tests/tegra/Makefile.am | 22 +++++++++++++++++
 tests/tegra/openclose.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 91 insertions(+)
 create mode 100644 tests/tegra/.gitignore
 create mode 100644 tests/tegra/Makefile.am
 create mode 100644 tests/tegra/openclose.c

Comments

Erik Faye-Lund April 10, 2014, 5:20 p.m. UTC | #1 
On Wed, Apr 9, 2014 at 1:40 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>

Looks good!
Erik Faye-Lund April 28, 2014, 7:49 p.m. UTC | #2 
On Thu, Apr 10, 2014 at 7:20 PM, Erik Faye-Lund <kusmabite@gmail.com> wrote:
> On Wed, Apr 9, 2014 at 1:40 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>
>
> Looks good!

Actually, "make check" doesn't work here:

kusma@localhost:~/src/libdrm$ make -C tests/tegra/ check
make: Entering directory `/home/kusma/src/libdrm/tests/tegra'
make  openclose gr2d-fill
make[1]: Entering directory `/home/kusma/src/libdrm/tests/tegra'
make[1]: `openclose' is up to date.
make[1]: `gr2d-fill' is up to date.
make[1]: Leaving directory `/home/kusma/src/libdrm/tests/tegra'
make  check-TESTS
make[1]: Entering directory `/home/kusma/src/libdrm/tests/tegra'
FAIL: openclose
failed to open DRM device (null): Bad address
FAIL: gr2d-fill
=======================================================================
2 of 2 tests failed
Please report to https://bugs.freedesktop.org/enter_bug.cgi?product=DRI
=======================================================================
make[1]: *** [check-TESTS] Error 1
make[1]: Leaving directory `/home/kusma/src/libdrm/tests/tegra'
make: *** [check-am] Error 2
make: Leaving directory `/home/kusma/src/libdrm/tests/tegra'
Thierry Reding May 2, 2014, 2:17 p.m. UTC | #3 
On Mon, Apr 28, 2014 at 09:49:48PM +0200, Erik Faye-Lund wrote:
> On Thu, Apr 10, 2014 at 7:20 PM, Erik Faye-Lund <kusmabite@gmail.com> wrote:
> > On Wed, Apr 9, 2014 at 1:40 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>
> >
> > Looks good!
> 
> Actually, "make check" doesn't work here:
> 
> kusma@localhost:~/src/libdrm$ make -C tests/tegra/ check
> make: Entering directory `/home/kusma/src/libdrm/tests/tegra'
> make  openclose gr2d-fill
> make[1]: Entering directory `/home/kusma/src/libdrm/tests/tegra'
> make[1]: `openclose' is up to date.
> make[1]: `gr2d-fill' is up to date.
> make[1]: Leaving directory `/home/kusma/src/libdrm/tests/tegra'
> make  check-TESTS
> make[1]: Entering directory `/home/kusma/src/libdrm/tests/tegra'
> FAIL: openclose
> failed to open DRM device (null): Bad address
> FAIL: gr2d-fill
> =======================================================================
> 2 of 2 tests failed
> Please report to https://bugs.freedesktop.org/enter_bug.cgi?product=DRI
> =======================================================================
> make[1]: *** [check-TESTS] Error 1
> make[1]: Leaving directory `/home/kusma/src/libdrm/tests/tegra'
> make: *** [check-am] Error 2
> make: Leaving directory `/home/kusma/src/libdrm/tests/tegra'

I've modified the tests to default to /dev/dri/card0 if no device was
specified on the command-line.

Thierry
diff mbox

Patch

diff --git a/configure.ac b/configure.ac
index 4cb6810bd6a8..e4cf70b1520b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -422,6 +422,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/.gitignore b/tests/tegra/.gitignore
new file mode 100644
index 000000000000..5c5216c5c5e6
--- /dev/null
+++ b/tests/tegra/.gitignore
@@ -0,0 +1 @@ 
+openclose
diff --git a/tests/tegra/Makefile.am b/tests/tegra/Makefile.am
new file mode 100644
index 000000000000..8b481bde4f11
--- /dev/null
+++ b/tests/tegra/Makefile.am
@@ -0,0 +1,22 @@ 
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include/drm \
+	-I$(top_srcdir)/tegra \
+	-I$(top_srcdir)
+
+AM_CFLAGS = -Wall -Werror
+
+LDADD = \
+	../../tegra/libdrm_tegra.la \
+	../../libdrm.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;
+}