From patchwork Wed Nov 30 07:26:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christian Gmeiner X-Patchwork-Id: 9453847 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 05E946071C for ; Wed, 30 Nov 2016 07:27:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA91B28389 for ; Wed, 30 Nov 2016 07:27:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF252283AC; Wed, 30 Nov 2016 07:27:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0657E28389 for ; Wed, 30 Nov 2016 07:27:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 275FF6E11D; Wed, 30 Nov 2016 07:27:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wj0-x242.google.com (mail-wj0-x242.google.com [IPv6:2a00:1450:400c:c01::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id D584F6E10C for ; Wed, 30 Nov 2016 07:27:04 +0000 (UTC) Received: by mail-wj0-x242.google.com with SMTP id jb2so20969374wjb.3 for ; Tue, 29 Nov 2016 23:27:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I6oNVDzYH6LFtbxc0WG7iGQMaWpcH81GTWc4ZLZ05v4=; b=gXxFy7cF33DmfTd4n3iBXdkA7IvnyzNX1WZzM+JS4pAn88zZFFyiXr9s/Bgz7lLldV zt0R59PY3OU/BlHmivucDl8zaQJ1fFYzc2hqejm/0IKkHN3f75TyhbAL5vBezay3ZYc+ kZpfOAViI3VKgJDvmc09rKZqbNdiRQgWSwCMVue6UNufp1K0gNkyVI8nFx0cpdQUAAWA lQ9kxYgtPcLBWcmAdJTzUpz+OPN34AOWeQ4Ar6ut58XUxBiPXIEpFZMfyIEarxtrkVdp r/bCrDcbafNwYpkfogK0vIZwfcRdqsP+nn6GPzBFFQrF58qu7b+j/KfKxsucsVw86V3u mUyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I6oNVDzYH6LFtbxc0WG7iGQMaWpcH81GTWc4ZLZ05v4=; b=F17Lkd7EL4VFXQfV4gN3AaUIKDUWJaD2pr7+lCTJUK+0I5NkLEr2OwMLpGie7irrPB XwH4FalQtEWy7RJjkEwLpKjsR+2gV6Vir17pDrGTlPWo3srpNxSvVvpjsJ6D0IXF166R jV/RtYAyu709afZ/d8YkAA3O55JqpDeS6wuXU/0f0tNP46/pevOsHyElG+/lgS2w6OQb q4TdnD7nuD71aRi3w5cDIEb6BAeCCILosVewe9G1iHZk00Nu2Ib17nNvz5Jzv4zE2gik dgrQx2HOs1qzyzFvjyF4IfdReeZywogtYx9jF/C5WOmWdUEXS0cC6ktf5tMoywxmFZEa RXHg== X-Gm-Message-State: AKaTC03/te4UzAz9JdadGzJ8D30qKczr2KvRUv4/if63G79ZJmmQlsFXNAjuazr2/GM3QQ== X-Received: by 10.194.120.226 with SMTP id lf2mr26672177wjb.130.1480490823107; Tue, 29 Nov 2016 23:27:03 -0800 (PST) Received: from c720p.fritz.box (188-23-67-10.adsl.highway.telekom.at. [188.23.67.10]) by smtp.gmail.com with ESMTPSA id e5sm6498891wma.12.2016.11.29.23.27.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Nov 2016 23:27:02 -0800 (PST) From: Christian Gmeiner To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/3] imx: gallium driver for imx-drm scanout driver Date: Wed, 30 Nov 2016 08:26:13 +0100 Message-Id: <1480490773-2366-4-git-send-email-christian.gmeiner@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480490773-2366-1-git-send-email-christian.gmeiner@gmail.com> References: <1480490773-2366-1-git-send-email-christian.gmeiner@gmail.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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); +}