From patchwork Wed Jul 20 01:11:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 9238625 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 B349C607DA for ; Wed, 20 Jul 2016 01:13:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5A9926253 for ; Wed, 20 Jul 2016 01:13:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A8C326E81; Wed, 20 Jul 2016 01:13:32 +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=unavailable 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 4853826253 for ; Wed, 20 Jul 2016 01:13:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752407AbcGTBNJ (ORCPT ); Tue, 19 Jul 2016 21:13:09 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:35242 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753244AbcGTBLb (ORCPT ); Tue, 19 Jul 2016 21:11:31 -0400 Received: by mail-pf0-f194.google.com with SMTP id h186so2337247pfg.2; Tue, 19 Jul 2016 18:11:30 -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=dNBqhQzcFmLvOeYDPG54BCPkKCYBn263TR0gkNn69UE=; b=KiRHkimchjl2yb5hrj+lHMNjyHH11YbdMYdMiWH3bvSfeHGiRdEFN0GZAg7hmqwGLq 3P/l5E9KWsQYB153e/kOHdn1FBW86IJ6H3yB2S2zbNNfzcD+dh16kOVNgEZ9HC1gmsXd 2BAn/LHjpM4tO/DxnIORxuTnFwHI6hqrG8rYBHYPxEwC5EVls3+pVv9+olAFyGG4kOTG jKrcDvr9OM1BTEuGLCSYNp+y1uibyC0rieIqOghaOkBP0aSme2mg/LrKjK8EZB7DQ2XS +JzCPsHLv6i+K9U4mavuav+6pUmzFbb9C6xrWSt2Ho4mrbuJNCgICl0wpdwmZNS2bZSk jkog== 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=dNBqhQzcFmLvOeYDPG54BCPkKCYBn263TR0gkNn69UE=; b=coPrLtxCd1bOjIp7GrtVCROoBlbCutE8tw8+flPgfVrVGpRwFN4iup95XJRIH/INkO /a7+XAEvNwApn545Phc3WRkOvq3hoYURdXwwHp+6B3OCal8s4SmdfNIKtPIIiAbrhQ6B a80So/pM8BPC480xjsbZUBZ9sgpbf7bHN0buyPmK5KbSyN5v4DEqXEQD2NDUK4wjdC+Y uiT2EfGyslgwP42WUPWdtNouR7knuqBDTXTOOQaWxo9oZ2Zi41iS7lRUuVa16vsMNduO 2G2sVrBBoDErqg88BaUmWulUpuRiggq9Y6EetNqTyQ2UX0hJKVzWqlWtDY0eJCNYud6h ZiNA== X-Gm-Message-State: ALyK8tKx6tRwYdF3e9lgo3hbuoGMA4ODYOsd11M3Se+eL0VNpvQJZvVYmJoYWyB4Or2DYQ== X-Received: by 10.98.21.131 with SMTP id 125mr60320982pfv.92.1468977090248; Tue, 19 Jul 2016 18:11:30 -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 d1sm84277pas.48.2016.07.19.18.11.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Jul 2016 18:11:29 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: p.zabel@pengutronix.de, plagnioj@jcrosoft.com, tomi.valkeinen@ti.com Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Steve Longerbeam Subject: [PATCH v2 10/13] gpu: ipu-v3: Fix IRT usage Date: Tue, 19 Jul 2016 18:11:08 -0700 Message-Id: <1468977071-29240-11-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468977071-29240-1-git-send-email-steve_longerbeam@mentor.com> References: <1467932621-358-1-git-send-email-steve_longerbeam@mentor.com> <1468977071-29240-1-git-send-email-steve_longerbeam@mentor.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@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 --- v2: - cleaned up irt_use_count decrement in ipu_irt_disable() --- drivers/gpu/ipu-v3/ipu-ic.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/ipu-v3/ipu-ic.c b/drivers/gpu/ipu-v3/ipu-ic.c index 1dcb96c..1a37afc 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); @@ -629,22 +628,41 @@ unlock: } EXPORT_SYMBOL_GPL(ipu_ic_task_idma_init); +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; + + if (priv->irt_use_count) { + if (!--priv->irt_use_count) + ipu_module_disable(priv->ipu, IPU_CONF_ROT_EN); + } +} + 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; @@ -655,18 +673,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;