[Mesa-dev] [PATCH 3/3] imx: gallium driver for imx-drm scanout driver
Christian Gmeiner
christian.gmeiner at gmail.com
Wed Nov 30 13:44:36 UTC 2016
The imx (stub) driver is needed to get hardware acceleration from
etnaviv on a platform using imx-drm kms driver. This adds support
for wayland and native kms egl apps.
Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
---
configure.ac | 12 +++++++
src/gallium/Makefile.am | 4 +++
.../auxiliary/pipe-loader/pipe_loader_drm.c | 5 +++
src/gallium/auxiliary/target-helpers/drm_helper.h | 23 ++++++++++++
.../auxiliary/target-helpers/drm_helper_public.h | 3 ++
src/gallium/drivers/imx/Automake.inc | 9 +++++
src/gallium/drivers/imx/Makefile.am | 9 +++++
src/gallium/winsys/imx/drm/Makefile.am | 33 +++++++++++++++++
src/gallium/winsys/imx/drm/Makefile.sources | 3 ++
src/gallium/winsys/imx/drm/imx_drm_public.h | 31 ++++++++++++++++
src/gallium/winsys/imx/drm/imx_drm_winsys.c | 41 ++++++++++++++++++++++
11 files changed, 173 insertions(+)
create mode 100644 src/gallium/drivers/imx/Automake.inc
create mode 100644 src/gallium/drivers/imx/Makefile.am
create mode 100644 src/gallium/winsys/imx/drm/Makefile.am
create mode 100644 src/gallium/winsys/imx/drm/Makefile.sources
create mode 100644 src/gallium/winsys/imx/drm/imx_drm_public.h
create mode 100644 src/gallium/winsys/imx/drm/imx_drm_winsys.c
diff --git a/configure.ac b/configure.ac
index 83b23af..c0f81ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2447,6 +2447,9 @@ if test -n "$with_gallium_drivers"; then
PKG_CHECK_MODULES([ETNAVIV], [libdrm_etnaviv >= $LIBDRM_ETNAVIV_REQUIRED])
require_libdrm "etnaviv"
;;
+ ximx)
+ HAVE_GALLIUM_IMX=yes
+ ;;
xswrast)
HAVE_GALLIUM_SOFTPIPE=yes
if test "x$MESA_LLVM" = x1; then
@@ -2499,6 +2502,12 @@ if test "x$HAVE_RADEON_VULKAN" = "xyes"; then
radeon_llvm_check "radv" "3" "9" "0"
fi
+dnl We need to validate some needed dependencies for renderonly drivers.
+
+if test "x$HAVE_GALLIUM_ETNAVIV" != xyes -a "x$HAVE_GALLIUM_IMX" == xyes ; then
+ AC_ERROR([Building with imx requires etnaviv])
+fi
+
dnl Set LLVM_LIBS - This is done after the driver configuration so
dnl that drivers can add additional components to LLVM_COMPONENTS.
dnl Previously, gallium drivers were updating LLVM_LIBS directly
@@ -2572,6 +2581,7 @@ AM_CONDITIONAL(HAVE_GALLIUM_SWRAST, test "x$HAVE_GALLIUM_SOFTPIPE" = xyes -o \
AM_CONDITIONAL(HAVE_GALLIUM_VC4, test "x$HAVE_GALLIUM_VC4" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_VIRGL, test "x$HAVE_GALLIUM_VIRGL" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_ETNAVIV, test "x$HAVE_GALLIUM_ETNAVIV" = xyes)
+AM_CONDITIONAL(HAVE_GALLIUM_IMX, test "x$HAVE_GALLIUM_IMX" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_STATIC_TARGETS, test "x$enable_shared_pipe_drivers" = xno)
@@ -2719,6 +2729,7 @@ AC_CONFIG_FILES([Makefile
src/gallium/drivers/swr/Makefile
src/gallium/drivers/trace/Makefile
src/gallium/drivers/etnaviv/Makefile
+ src/gallium/drivers/imx/Makefile
src/gallium/drivers/vc4/Makefile
src/gallium/drivers/virgl/Makefile
src/gallium/state_trackers/clover/Makefile
@@ -2749,6 +2760,7 @@ AC_CONFIG_FILES([Makefile
src/gallium/tests/trivial/Makefile
src/gallium/tests/unit/Makefile
src/gallium/winsys/etnaviv/drm/Makefile
+ src/gallium/winsys/imx/drm/Makefile
src/gallium/winsys/freedreno/drm/Makefile
src/gallium/winsys/i915/drm/Makefile
src/gallium/winsys/intel/drm/Makefile
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 9e47e9f..f910f31 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -72,6 +72,10 @@ if HAVE_GALLIUM_ETNAVIV
SUBDIRS += drivers/etnaviv winsys/etnaviv/drm
endif
+if HAVE_GALLIUM_IMX
+SUBDIRS += drivers/imx winsys/imx/drm
+endif
+
## swrast/softpipe
if HAVE_GALLIUM_SOFTPIPE
SUBDIRS += drivers/softpipe
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
index 99d9da6..6c89fe5 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
@@ -158,6 +158,11 @@ static const struct drm_driver_descriptor driver_descriptors[] = {
.driver_name = "etnaviv",
.create_screen = pipe_etna_create_screen,
.configuration = configuration_query,
+ },
+ {
+ .driver_name = "imx-drm",
+ .create_screen = pipe_imx_drm_create_screen,
+ .configuration = configuration_query,
}
};
#endif
diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h
index e056c58..fbb4ce4 100644
--- a/src/gallium/auxiliary/target-helpers/drm_helper.h
+++ b/src/gallium/auxiliary/target-helpers/drm_helper.h
@@ -289,4 +289,27 @@ pipe_etna_create_screen(int fd)
#endif
+#ifdef GALLIUM_IMX
+#include "imx/drm/imx_drm_public.h"
+
+struct pipe_screen *
+pipe_imx_drm_create_screen(int fd)
+{
+ struct pipe_screen *screen;
+
+ screen = imx_drm_screen_create(fd);
+ return screen ? debug_screen_wrap(screen) : NULL;
+}
+
+#else
+
+struct pipe_screen *
+pipe_imx_drm_create_screen(int fd)
+{
+ fprintf(stderr, "imx-drm: driver missing\n");
+ return NULL;
+}
+
+#endif
+
#endif /* DRM_HELPER_H */
diff --git a/src/gallium/auxiliary/target-helpers/drm_helper_public.h b/src/gallium/auxiliary/target-helpers/drm_helper_public.h
index 73cf1da..bc12b21 100644
--- a/src/gallium/auxiliary/target-helpers/drm_helper_public.h
+++ b/src/gallium/auxiliary/target-helpers/drm_helper_public.h
@@ -37,4 +37,7 @@ pipe_vc4_create_screen(int fd);
struct pipe_screen *
pipe_etna_create_screen(int fd);
+struct pipe_screen *
+pipe_imx_drm_create_screen(int fd);
+
#endif /* _DRM_HELPER_PUBLIC_H */
diff --git a/src/gallium/drivers/imx/Automake.inc b/src/gallium/drivers/imx/Automake.inc
new file mode 100644
index 0000000..92560a2
--- /dev/null
+++ b/src/gallium/drivers/imx/Automake.inc
@@ -0,0 +1,9 @@
+if HAVE_GALLIUM_IMX
+
+TARGET_DRIVERS += imx-drm
+TARGET_CPPFLAGS += -DGALLIUM_IMX
+TARGET_LIB_DEPS += \
+ $(top_builddir)/src/gallium/winsys/imx/drm/libimxdrm.la \
+ $(LIBDRM_LIBS)
+
+endif
diff --git a/src/gallium/drivers/imx/Makefile.am b/src/gallium/drivers/imx/Makefile.am
new file mode 100644
index 0000000..0ca81fd
--- /dev/null
+++ b/src/gallium/drivers/imx/Makefile.am
@@ -0,0 +1,9 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CPPFLAGS = \
+ $(GALLIUM_CFLAGS) \
+ $(IMX_CFLAGS)
+
+noinst_LTLIBRARIES = libimx.la
+
+libimx_la_SOURCES =
diff --git a/src/gallium/winsys/imx/drm/Makefile.am b/src/gallium/winsys/imx/drm/Makefile.am
new file mode 100644
index 0000000..ff32fde
--- /dev/null
+++ b/src/gallium/winsys/imx/drm/Makefile.am
@@ -0,0 +1,33 @@
+# Copyright © 2012 Intel 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 (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
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS 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 Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+ -I$(top_srcdir)/src/gallium/drivers \
+ $(GALLIUM_WINSYS_CFLAGS) \
+ $(IMX_CFLAGS)
+
+noinst_LTLIBRARIES = libimxdrm.la
+
+libimxdrm_la_SOURCES = $(C_SOURCES)
\ No newline at end of file
diff --git a/src/gallium/winsys/imx/drm/Makefile.sources b/src/gallium/winsys/imx/drm/Makefile.sources
new file mode 100644
index 0000000..3c0d6fb
--- /dev/null
+++ b/src/gallium/winsys/imx/drm/Makefile.sources
@@ -0,0 +1,3 @@
+C_SOURCES := \
+ imx_drm_public.h \
+ imx_drm_winsys.c
\ No newline at end of file
diff --git a/src/gallium/winsys/imx/drm/imx_drm_public.h b/src/gallium/winsys/imx/drm/imx_drm_public.h
new file mode 100644
index 0000000..2d93da2
--- /dev/null
+++ b/src/gallium/winsys/imx/drm/imx_drm_public.h
@@ -0,0 +1,31 @@
+/*
+ * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+#ifndef __IMX_DRM_PUBLIC_H__
+#define __IMX_DRM_PUBLIC_H__
+
+struct pipe_screen;
+
+struct pipe_screen *imx_drm_screen_create(int fd);
+
+#endif /* __IMX_DRM_PUBLIC_H__ */
diff --git a/src/gallium/winsys/imx/drm/imx_drm_winsys.c b/src/gallium/winsys/imx/drm/imx_drm_winsys.c
new file mode 100644
index 0000000..7469893
--- /dev/null
+++ b/src/gallium/winsys/imx/drm/imx_drm_winsys.c
@@ -0,0 +1,41 @@
+/*
+ * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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 "../../imx/drm/imx_drm_public.h"
+#include "../winsys/etnaviv/drm/etnaviv_drm_public.h"
+#include "renderonly/renderonly.h"
+
+static struct pipe_screen *imx_open_render_node(struct renderonly *ro)
+{
+ return etna_drm_screen_create_rendernode(ro);
+}
+
+static const struct renderonly_ops ro_ops = {
+ .create = imx_open_render_node,
+ .intermediate_rendering = true
+};
+
+struct pipe_screen *imx_drm_screen_create(int fd)
+{
+ return renderonly_screen_create(fd, &ro_ops, NULL);
+}
--
2.7.4
More information about the mesa-dev
mailing list