From patchwork Fri Oct 31 22:54:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 5207401 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 856D6C11AC for ; Fri, 31 Oct 2014 23:56:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA83F2014A for ; Fri, 31 Oct 2014 23:56:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id F364C20158 for ; Fri, 31 Oct 2014 23:56:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 78DC96E881; Fri, 31 Oct 2014 16:56:41 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by gabe.freedesktop.org (Postfix) with ESMTP id 615F7898E1 for ; Fri, 31 Oct 2014 15:57:47 -0700 (PDT) Received: by mail-pd0-f182.google.com with SMTP id fp1so8143130pdb.27 for ; Fri, 31 Oct 2014 15:57:47 -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=4ReOb7Hcdw7c3SXYjEXqD/cDKPJKtCIsiNf10i6uNgs=; b=OLK6USCW99saDue6eCmhvCVNb+joj5ldu5JM6JhWQpkK8VMvnYO3ZgtqCjeD2xLVh/ 0FC8xt7Qt9zGi2Qi/8rg1LpXlzClen5tyJgEDCfhgJkdrLc3O4uxdnitrh+z7lZIIDQe Y2hk14l95q9/NDAPPTdSz5QHcZemoORnhums4//Y2wKAEV/mtAr0RQqYORag47Cb+jot MtEojC48faNd3pXbPmR0T2/oaeG8Nk6RPmvWULzEpqM9K5zceAdqBvgv+h81OrxI7IKZ e0RtR6nIYaTmhH14LakONKfxNTAxyG80U9zy0/suAqbvGooT3BiBrXX7NGvkFBAN7s8Y N2lA== X-Received: by 10.70.123.138 with SMTP id ma10mr23632886pdb.64.1414796267279; Fri, 31 Oct 2014 15:57:47 -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.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 15:57:46 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: dri-devel@lists.freedesktop.org Subject: [PATCH 71/72] imx-drm: ipuv3-crtc: Disable overlay plane during crtc disable Date: Fri, 31 Oct 2014 15:54:54 -0700 Message-Id: <1414796095-10107-72-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:32 -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 If the overlay exists and is enabled, it must be disabled before stopping the DI, otherwise DI synchronous display errors are the result. Signed-off-by: Steve Longerbeam --- drivers/staging/imx-drm/ipuv3-crtc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/staging/imx-drm/ipuv3-crtc.c b/drivers/staging/imx-drm/ipuv3-crtc.c index 7d5b691..b49d1b2 100644 --- a/drivers/staging/imx-drm/ipuv3-crtc.c +++ b/drivers/staging/imx-drm/ipuv3-crtc.c @@ -138,6 +138,14 @@ static void ipu_fb_disable(struct ipu_crtc *ipu_crtc) if (!ipu_crtc->enabled) return; + /* + * If the overlay exists and is enabled, it must be disabled + * before stopping the DI, otherwise DI synchronous display + * errors are the result. + */ + if (ipu_crtc->have_overlay && ipu_crtc->plane[1].enabled) + ipu_plane_disable(&ipu_crtc->plane[1]); + /* Stop DC channel and DI before IDMAC */ ipu_dc_disable_channel(ipu_crtc->dc); ipu_di_disable(ipu_crtc->di);