From patchwork Thu Apr 23 14:43:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Jakobi X-Patchwork-Id: 6263651 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 0B96B9F313 for ; Thu, 23 Apr 2015 14:43:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 28181203AE for ; Thu, 23 Apr 2015 14:42:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99E1D203A0 for ; Thu, 23 Apr 2015 14:42:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933698AbbDWOm5 (ORCPT ); Thu, 23 Apr 2015 10:42:57 -0400 Received: from smtp.math.uni-bielefeld.de ([129.70.45.10]:42580 "EHLO smtp.math.uni-bielefeld.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933669AbbDWOm4 (ORCPT ); Thu, 23 Apr 2015 10:42:56 -0400 Received: from chidori.math.uni-bielefeld.de (dhcp24-141.math.uni-bielefeld.de [129.70.24.141]) (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 0E54D600D0; Thu, 23 Apr 2015 16:42:54 +0200 (CEST) From: Tobias Jakobi To: linux-samsung-soc@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, emil.l.velikov@gmail.com, jy0922.shim@samsung.com, gustavo.padovan@collabora.co.uk, inki.dae@samsung.com, Tobias Jakobi Subject: [PATCH v3 4/7] exynos: fimg2d: add g2d_exec2 Date: Thu, 23 Apr 2015 16:43:03 +0200 Message-Id: <1429800186-12644-1-git-send-email-tjakobi@math.uni-bielefeld.de> X-Mailer: git-send-email 2.0.5 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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. Signed-off-by: Tobias Jakobi --- exynos/exynos_fimg2d.c | 15 +++++++++++++-- exynos/exynos_fimg2d.h | 6 ++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c index e90ffed..1a99f17 100644 --- a/exynos/exynos_fimg2d.c +++ b/exynos/exynos_fimg2d.c @@ -288,13 +288,24 @@ drm_public void g2d_config_event(struct g2d_context *ctx, void *userdata) */ drm_public 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. + */ +drm_public 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 421249d..8f9ba23 100644 --- a/exynos/exynos_fimg2d.h +++ b/exynos/exynos_fimg2d.h @@ -187,6 +187,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 { @@ -305,6 +310,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);