From patchwork Tue Jun 14 22:49:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 9177139 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 91A2660868 for ; Tue, 14 Jun 2016 22:53:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 801AE28307 for ; Tue, 14 Jun 2016 22:53:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74C672833E; Tue, 14 Jun 2016 22:53:13 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7E232833B for ; Tue, 14 Jun 2016 22:53:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751190AbcFNWxK (ORCPT ); Tue, 14 Jun 2016 18:53:10 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33473 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752833AbcFNWvO (ORCPT ); Tue, 14 Jun 2016 18:51:14 -0400 Received: by mail-pf0-f194.google.com with SMTP id c74so306402pfb.0 for ; Tue, 14 Jun 2016 15:51:14 -0700 (PDT) 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; bh=taruoVAHpycKSrmYUdbOwWX602+uW9wkd4uh7t5jVU4=; b=HtM7FTz3WvbOre1wWSleG/f9w7ubOcppR4kHXzXY7ABUwNIDotyTzqQ5Pv3DEN5h5J B5+gHTxuW/I8HH1gu8cJ2bnP8Xiw6rVurdHnkfYl4rVH4cN8kfyTjw6l1eaCVCAKq5UO lrSIftPXk7Kq+VYnRmQTkZMMPwxELbYSLNt+hALAxH7bVH5QdsHwSo053HbzZZabI+Z8 dBOwVh/WPteoxqqtFCIHCZiLqubr4/Qzm8YknNpoh5rh14GmBevvzHKlgfpttBNeJ1Gl AOlB/0EoxQD37nLhn06lccXRecrkRphSP1B6N7Ky/wGo3tX3cOZi2sRIB9y1hnsPP5ju bd3w== 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; bh=taruoVAHpycKSrmYUdbOwWX602+uW9wkd4uh7t5jVU4=; b=dGWcVnURjmjsYJxJMvSYVkWqJY8gy0CTmPXBreg69MzuAKvIPZ/hyfrmXORrHTgLyf wnNEWPH8lB+UJS8YDFrX+qRQeLnqwLn5Lq3lhVJWqer52+xKaK+iOHYYpniBwsIU2QnV 87s+KjBAwgY9vcv6wnpNf5lX5V2/m+pUrrrR2o6T9lgwEC2n0ix/oxu4JmjAEP8Xj+mz xx1VcZuQfO/Gj0ZJEMXEF4A7EhIE7wXKR0gro8FFYSuciIS6LtgL+RwkGs3t0TCc4fgt pH7gMGL+SSmoFKwyDi/WVUfWsqQ7Bx7OBvu42FEhaaSYz/2qub+MG5ZwRtmIiKJRvVoD l9OQ== X-Gm-Message-State: ALyK8tLHSLlc8YfyVLt6soJj/NgbUqJk5Nwdh2QwkMipaR5S2OoliIt3EbnPndkKw/CHjg== X-Received: by 10.66.63.35 with SMTP id d3mr36444pas.69.1465944673891; Tue, 14 Jun 2016 15:51:13 -0700 (PDT) Received: from mothership.sklembedded.com (c-73-241-2-21.hsd1.ca.comcast.net. [73.241.2.21]) by smtp.googlemail.com with ESMTPSA id v184sm47829999pfb.24.2016.06.14.15.51.13 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Jun 2016 15:51:13 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: linux-media@vger.kernel.org Cc: Steve Longerbeam Subject: [PATCH 13/38] gpu: ipu-v3: Fix IRT usage Date: Tue, 14 Jun 2016 15:49:09 -0700 Message-Id: <1465944574-15745-14-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465944574-15745-1-git-send-email-steve_longerbeam@mentor.com> References: <1465944574-15745-1-git-send-email-steve_longerbeam@mentor.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There can be multiple IC tasks using the IRT, so the IRT needs a separate use counter. Create a private ipu_irt_enable() to enable the IRT module when any IC task requires rotation, and ipu_irt_disable() when a task no longer needs the IRT. Signed-off-by: Steve Longerbeam --- drivers/gpu/ipu-v3/ipu-ic.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/ipu-v3/ipu-ic.c b/drivers/gpu/ipu-v3/ipu-ic.c index f306a9c..5329bfe 100644 --- a/drivers/gpu/ipu-v3/ipu-ic.c +++ b/drivers/gpu/ipu-v3/ipu-ic.c @@ -160,6 +160,7 @@ struct ipu_ic_priv { spinlock_t lock; struct ipu_soc *ipu; int use_count; + int irt_use_count; struct ipu_ic task[IC_NUM_TASKS]; }; @@ -379,8 +380,6 @@ void ipu_ic_task_disable(struct ipu_ic *ic) ipu_ic_write(ic, ic_conf, IC_CONF); - ic->rotation = ic->graphics = false; - spin_unlock_irqrestore(&priv->lock, flags); } EXPORT_SYMBOL_GPL(ipu_ic_task_disable); @@ -639,22 +638,44 @@ int ipu_ic_set_src(struct ipu_ic *ic, int csi_id, bool vdi) } EXPORT_SYMBOL_GPL(ipu_ic_set_src); +static void ipu_irt_enable(struct ipu_ic *ic) +{ + struct ipu_ic_priv *priv = ic->priv; + + if (!priv->irt_use_count) + ipu_module_enable(priv->ipu, IPU_CONF_ROT_EN); + + priv->irt_use_count++; +} + +static void ipu_irt_disable(struct ipu_ic *ic) +{ + struct ipu_ic_priv *priv = ic->priv; + + priv->irt_use_count--; + + if (!priv->irt_use_count) + ipu_module_disable(priv->ipu, IPU_CONF_ROT_EN); + + if (priv->irt_use_count < 0) + priv->irt_use_count = 0; +} + int ipu_ic_enable(struct ipu_ic *ic) { struct ipu_ic_priv *priv = ic->priv; unsigned long flags; - u32 module = IPU_CONF_IC_EN; spin_lock_irqsave(&priv->lock, flags); - if (ic->rotation) - module |= IPU_CONF_ROT_EN; - if (!priv->use_count) - ipu_module_enable(priv->ipu, module); + ipu_module_enable(priv->ipu, IPU_CONF_IC_EN); priv->use_count++; + if (ic->rotation) + ipu_irt_enable(ic); + spin_unlock_irqrestore(&priv->lock, flags); return 0; @@ -665,18 +686,22 @@ int ipu_ic_disable(struct ipu_ic *ic) { struct ipu_ic_priv *priv = ic->priv; unsigned long flags; - u32 module = IPU_CONF_IC_EN | IPU_CONF_ROT_EN; spin_lock_irqsave(&priv->lock, flags); priv->use_count--; if (!priv->use_count) - ipu_module_disable(priv->ipu, module); + ipu_module_disable(priv->ipu, IPU_CONF_IC_EN); if (priv->use_count < 0) priv->use_count = 0; + if (ic->rotation) + ipu_irt_disable(ic); + + ic->rotation = ic->graphics = false; + spin_unlock_irqrestore(&priv->lock, flags); return 0;