From patchwork Sun Nov 22 18:48:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Jakobi X-Patchwork-Id: 7677071 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 3050F9F1C2 for ; Sun, 22 Nov 2015 18:55:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5913520702 for ; Sun, 22 Nov 2015 18:55:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 337C520703 for ; Sun, 22 Nov 2015 18:55:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751959AbbKVSzM (ORCPT ); Sun, 22 Nov 2015 13:55:12 -0500 Received: from smtp.math.uni-bielefeld.de ([129.70.45.10]:45824 "EHLO smtp.math.uni-bielefeld.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752136AbbKVSzM (ORCPT ); Sun, 22 Nov 2015 13:55:12 -0500 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 51253610BD; Sun, 22 Nov 2015 19:55:10 +0100 (CET) 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, inki.dae@samsung.com, human.hwang@samsung.com, Tobias Jakobi Subject: [PATCH v2 12/13] exynos/fimg2d: add g2d_reset() to public API Date: Sun, 22 Nov 2015 19:48:42 +0100 Message-Id: <1448218123-21292-13-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> 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=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 After the rewrite of the command buffer submission handling g2d_reset() is no longer called internally. Still the user might want to reset the G2D context so expose this call. Signed-off-by: Tobias Jakobi --- exynos/exynos-symbol-check | 1 + exynos/exynos_fimg2d.c | 28 ++++++++++++++-------------- exynos/exynos_fimg2d.h | 1 + 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/exynos/exynos-symbol-check b/exynos/exynos-symbol-check index 2e4ba56..57dd684 100755 --- a/exynos/exynos-symbol-check +++ b/exynos/exynos-symbol-check @@ -32,6 +32,7 @@ g2d_exec2 g2d_config_event g2d_fini g2d_init +g2d_reset g2d_scale_and_blend g2d_solid_fill EOF diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c index 25426a2..2def209 100644 --- a/exynos/exynos_fimg2d.c +++ b/exynos/exynos_fimg2d.c @@ -255,20 +255,6 @@ static void g2d_set_direction(struct g2d_context *ctx, } /* - * g2d_reset - reset fimg2d hardware. - * - * @ctx: a pointer to g2d_context structure. - * - */ -static void g2d_reset(struct g2d_context *ctx) -{ - ctx->cmd_nr = 0; - ctx->cmd_buf_nr = 0; - - g2d_add_cmd(ctx, SOFT_RESET_REG, 0x01); -} - -/* * g2d_flush - submit all commands and values in user side command buffer * to command queue aware of fimg2d dma. * @@ -356,6 +342,20 @@ void g2d_fini(struct g2d_context *ctx) free(ctx); } +/* + * g2d_reset - reset fimg2d hardware. + * + * @ctx: a pointer to g2d_context structure. + * + */ +void g2d_reset(struct g2d_context *ctx) +{ + ctx->cmd_nr = 0; + ctx->cmd_buf_nr = 0; + + g2d_add_cmd(ctx, SOFT_RESET_REG, 0x01); +} + /** * g2d_config_event - setup userdata configuration for a g2d event. * The next invocation of a g2d call (e.g. g2d_solid_fill) is diff --git a/exynos/exynos_fimg2d.h b/exynos/exynos_fimg2d.h index 2700686..03391c1 100644 --- a/exynos/exynos_fimg2d.h +++ b/exynos/exynos_fimg2d.h @@ -333,6 +333,7 @@ struct g2d_context; struct g2d_context *g2d_init(int fd); void g2d_fini(struct g2d_context *ctx); +void g2d_reset(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);