From patchwork Fri Oct 31 22:54:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 5207701 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C439CC11AC for ; Fri, 31 Oct 2014 23:57:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0D34520120 for ; Fri, 31 Oct 2014 23:57:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DB60D201B9 for ; Fri, 31 Oct 2014 23:57:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0162E6E89E; Fri, 31 Oct 2014 16:56:43 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pd0-f175.google.com (mail-pd0-f175.google.com [209.85.192.175]) by gabe.freedesktop.org (Postfix) with ESMTP id D285A6E850 for ; Fri, 31 Oct 2014 15:57:05 -0700 (PDT) Received: by mail-pd0-f175.google.com with SMTP id y13so8104007pdi.20 for ; Fri, 31 Oct 2014 15:57:05 -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=ma5hH4uGLbrK2l8QTi3XpfEg9OfUrIGylad7LLoqPRk=; b=S9ReT5vZQ1jHKi8rrn9Q8SGMUnHUIa+9/rXSf2kvKF81hCL+s+IN0kKxgNBGBhADvL y2JNG7yO2qvvjEe5hMtegMlESxHtPrgO1I8V4kzu2TPhvAvNpf4HxoVsP1pHf19AWE7s +8DpPAORM5P6YR5urQZEPqYTDPQbfH8L5W2XXWTd44ghwZN01/UdE0W3DCsbUzD5M+44 YmBSysjOyMCN9g4/Ze+7r94z3FnsNV4c+DeAJcl88M2Ig6ja+41x+jE6sosgvpsUSk69 Kn4rVlQS2BJvS8DstyYKIBvQsN8AC397xbsJ9qThtTRKI8SEz2CQTPfEE5OVypWfnp7o qudw== X-Received: by 10.66.240.71 with SMTP id vy7mr27754080pac.89.1414796225740; Fri, 31 Oct 2014 15:57:05 -0700 (PDT) Received: from mothership.mgc.mentorg.com (c-50-152-159-227.hsd1.ca.comcast.net. [50.152.159.227]) by mx.google.com with ESMTPSA id ev8sm10870656pdb.28.2014.10.31.15.57.04 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 15:57:05 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: dri-devel@lists.freedesktop.org Subject: [PATCH 21/72] gpu: ipu-v3: Update DP sync SRM always in ipu_dp_enable_channel() Date: Fri, 31 Oct 2014 15:54:04 -0700 Message-Id: <1414796095-10107-22-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1414796095-10107-1-git-send-email-steve_longerbeam@mentor.com> References: <1414796095-10107-1-git-send-email-steve_longerbeam@mentor.com> X-Mailman-Approved-At: Fri, 31 Oct 2014 16:56:31 -0700 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.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 In Freescale kernels, when a DP channel is enabled, the DP sync SRM is updated for both background and foreground DP channels. Do the same. Signed-off-by: Steve Longerbeam --- drivers/gpu/ipu-v3/ipu-dp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/ipu-v3/ipu-dp.c b/drivers/gpu/ipu-v3/ipu-dp.c index d918596..a31b4a5 100644 --- a/drivers/gpu/ipu-v3/ipu-dp.c +++ b/drivers/gpu/ipu-v3/ipu-dp.c @@ -388,14 +388,13 @@ int ipu_dp_enable_channel(struct ipu_dp *dp) struct ipu_dp_priv *priv = flow->priv; u32 reg; - if (!dp->foreground) - return 0; - mutex_lock(&priv->mutex); - reg = readl(flow->base + DP_COM_CONF); - reg |= DP_COM_CONF_FG_EN; - writel(reg, flow->base + DP_COM_CONF); + if (dp->foreground) { + reg = readl(flow->base + DP_COM_CONF); + reg |= DP_COM_CONF_FG_EN; + writel(reg, flow->base + DP_COM_CONF); + } ipu_srm_dp_sync_update(priv->ipu);