From patchwork Sun Nov 22 18:48:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Jakobi X-Patchwork-Id: 7676941 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 78E459F1C2 for ; Sun, 22 Nov 2015 18:52:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB0E420703 for ; Sun, 22 Nov 2015 18:52:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5BBC120711 for ; Sun, 22 Nov 2015 18:52:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B600E7209E; Sun, 22 Nov 2015 10:52:31 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp.math.uni-bielefeld.de (smtp.math.uni-bielefeld.de [129.70.45.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id EFF3E72052 for ; Sun, 22 Nov 2015 10:52:29 -0800 (PST) Received: from chidori.local (dslb-092-077-040-173.092.077.pools.vodafone-ip.de [92.77.40.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by smtp.math.uni-bielefeld.de (Postfix) with ESMTPSA id B0172608FB; Sun, 22 Nov 2015 19:52:27 +0100 (CET) From: Tobias Jakobi To: linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 05/13] exynos: fimg2d: add g2d_exec2 Date: Sun, 22 Nov 2015 19:48:35 +0100 Message-Id: <1448218123-21292-6-git-send-email-tjakobi@math.uni-bielefeld.de> X-Mailer: git-send-email 2.4.9 In-Reply-To: <1448218123-21292-1-git-send-email-tjakobi@math.uni-bielefeld.de> References: <1448218123-21292-1-git-send-email-tjakobi@math.uni-bielefeld.de> Cc: emil.l.velikov@gmail.com, dri-devel@lists.freedesktop.org, Tobias Jakobi 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is a more 'flexible' version of g2d_exec allowing to pass some flags which modify the behaviour of g2d_exec. Currently only the 'async' operation flag is supported. v2: Add g2d_exec2() to Exynos symbol test. Signed-off-by: Tobias Jakobi --- exynos/exynos-symbol-check | 1 + exynos/exynos_fimg2d.c | 15 +++++++++++++-- exynos/exynos_fimg2d.h | 6 ++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/exynos/exynos-symbol-check b/exynos/exynos-symbol-check index bb12315..2bb7718 100755 --- a/exynos/exynos-symbol-check +++ b/exynos/exynos-symbol-check @@ -27,6 +27,7 @@ g2d_blend g2d_copy g2d_copy_with_scale g2d_exec +g2d_exec2 g2d_config_event g2d_fini g2d_init diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c index b10620b..e997d4b 100644 --- a/exynos/exynos_fimg2d.c +++ b/exynos/exynos_fimg2d.c @@ -366,13 +366,24 @@ void g2d_config_event(struct g2d_context *ctx, void *userdata) */ int g2d_exec(struct g2d_context *ctx) { - struct drm_exynos_g2d_exec exec; + return g2d_exec2(ctx, G2D_EXEC_FLAG_NORMAL); +} + +/** + * g2d_exec2 - same as 'g2d_exec' but allow to pass some flags. + * + * @ctx: a pointer to g2d_context structure. + */ +int g2d_exec2(struct g2d_context *ctx, unsigned int flags) +{ + struct drm_exynos_g2d_exec exec = {0}; int ret; if (ctx->cmdlist_nr == 0) return -EINVAL; - exec.async = 0; + if (flags & G2D_EXEC_FLAG_ASYNC) + exec.async = 1; ret = drmIoctl(ctx->fd, DRM_IOCTL_EXYNOS_G2D_EXEC, &exec); if (ret < 0) { diff --git a/exynos/exynos_fimg2d.h b/exynos/exynos_fimg2d.h index a2c22da..c6b58ac 100644 --- a/exynos/exynos_fimg2d.h +++ b/exynos/exynos_fimg2d.h @@ -184,6 +184,11 @@ enum e_g2d_acoeff_mode { G2D_ACOEFF_MODE_MASK }; +enum e_g2d_exec_flag { + G2D_EXEC_FLAG_NORMAL = (0 << 0), + G2D_EXEC_FLAG_ASYNC = (1 << 0) +}; + union g2d_point_val { unsigned int val; struct { @@ -292,6 +297,7 @@ struct g2d_context *g2d_init(int fd); void g2d_fini(struct g2d_context *ctx); void g2d_config_event(struct g2d_context *ctx, void *userdata); int g2d_exec(struct g2d_context *ctx); +int g2d_exec2(struct g2d_context *ctx, unsigned int flags); int g2d_solid_fill(struct g2d_context *ctx, struct g2d_image *img, unsigned int x, unsigned int y, unsigned int w, unsigned int h);