From: Dmitry Ermilov <dmitry.ermilov@intel.com>
Date: Thu, 7 Jun 2012 15:41:16 +0000 (+0400)
Subject: tests: add support for raw DRM.
X-Git-Tag: android-x86-7.1-r1~568
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1b5d7595866898071640760e7d405bfc87f45cc9;p=android-x86%2Fhardware-intel-common-libva.git

tests: add support for raw DRM.

Signed-off-by: Dmitry Ermilov <dmitry.ermilov@intel.com>
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
---

diff --git a/test/common/Makefile.am b/test/common/Makefile.am
index c348fd7..57cd3f0 100644
--- a/test/common/Makefile.am
+++ b/test/common/Makefile.am
@@ -25,6 +25,7 @@ noinst_LTLIBRARIES = libva-display.la
 libva_display_cflags = \
 	-I$(top_srcdir)				\
 	-I$(top_builddir)			\
+	-DIN_LIBVA				\
 	$(NULL)
 
 libva_display_libs = \
@@ -39,6 +40,12 @@ source_c		+= va_display_x11.c
 libva_display_cflags	+= $(X11_CFLAGS)
 libva_display_libs	+= $(X11_LIBS)
 
+if USE_DRM
+source_c		+= va_display_drm.c
+libva_display_cflags	+= $(DRM_CFLAGS)
+libva_display_libs	+= $(top_builddir)/va/libva-drm.la $(DRM_LIBS)
+endif
+
 libva_display_la_SOURCES= $(source_c)
 noinst_HEADERS		= $(source_h)
 libva_display_la_CFLAGS	= $(libva_display_cflags)
diff --git a/test/common/va_display.c b/test/common/va_display.c
index 80955a5..d356f7d 100644
--- a/test/common/va_display.c
+++ b/test/common/va_display.c
@@ -34,6 +34,7 @@
 
 extern const VADisplayHooks va_display_hooks_android;
 extern const VADisplayHooks va_display_hooks_x11;
+extern const VADisplayHooks va_display_hooks_drm;
 
 static const VADisplayHooks *g_display_hooks;
 static const VADisplayHooks *g_display_hooks_available[] = {
@@ -41,6 +42,9 @@ static const VADisplayHooks *g_display_hooks_available[] = {
     &va_display_hooks_android,
 #else
     &va_display_hooks_x11,
+#ifdef HAVE_VA_DRM
+    &va_display_hooks_drm,
+#endif
 #endif
     NULL
 };
diff --git a/test/common/va_display_drm.c b/test/common/va_display_drm.c
new file mode 100644
index 0000000..aa9f60a
--- /dev/null
+++ b/test/common/va_display_drm.c
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2012 Intel Corporation. All Rights Reserved.
+ *
+ * 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, sub license, 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 (including the
+ * next paragraph) 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 NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#ifdef IN_LIBVA
+# include "va/drm/va_drm.h"
+#else
+# include <va/va_drm.h>
+#endif
+#include "va_display.h"
+
+static int drm_fd = -1;
+
+static VADisplay
+va_open_display_drm(void)
+{
+    drm_fd = open("/dev/dri/card0", O_RDWR);
+    if (drm_fd < 0) {
+        fprintf(stderr, "error: can't open DRM connection!\n");
+        return NULL;
+    }
+    return vaGetDisplayDRM(drm_fd);
+}
+
+static void
+va_close_display_drm(VADisplay va_dpy)
+{
+    if (drm_fd < 0)
+        return;
+
+    close(drm_fd);
+    drm_fd = -1;
+}
+
+
+static VAStatus
+va_put_surface_drm(
+    VADisplay          va_dpy,
+    VASurfaceID        surface,
+    const VARectangle *src_rect,
+    const VARectangle *dst_rect
+)
+{
+    return VA_STATUS_ERROR_OPERATION_FAILED;
+}
+
+const VADisplayHooks va_display_hooks_drm = {
+    "drm",
+    va_open_display_drm,
+    va_close_display_drm,
+    va_put_surface_drm,
+};