From patchwork Wed Mar 20 07:18:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 10861027 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7102E17E0 for ; Wed, 20 Mar 2019 08:33:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5922629AA0 for ; Wed, 20 Mar 2019 08:33:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D3F029AA6; Wed, 20 Mar 2019 08:33:30 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 492B429AA5 for ; Wed, 20 Mar 2019 08:33:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DD28389C97; Wed, 20 Mar 2019 08:33:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id 18C3A891BA for ; Wed, 20 Mar 2019 07:18:31 +0000 (UTC) Received: by mail-pg1-x543.google.com with SMTP id p6so1100631pgh.9 for ; Wed, 20 Mar 2019 00:18:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Mtcq9S/v2Tl+uFG8ivjTYFKQCKpz3W6EmGjpkEFJ4cs=; b=KoG0xV+Pa6qVwD4/PYO2Pk5OIdi4pGKdFVV5C4U2OxLVB5nQ9/9UeJeY2DSe95+pQh M1ecJqXZEm5U813dCRNN4E9gLi7eetRjSe0yM498YD7AFYQSg/VugWt+T5x1vGQYD6h/ sGPB/By4S4dIH5mT+oBisPuxl1GzvpoyNYmoIFRL3FIYMoNkkcR8uh1SPE/hlpb2J/+H MFrRmK1WqK0Z/R156bgmat29xY8F9oqXGu3vRGxVqI9EIcj3uQhhP6hgW3zuf+SVAy+4 A483cv4eZbqZjnCI2ln6rMhh4PAnnXDVg8tVTUHYT9qfzMol9Prezha2bjVu570a8HqT zdpw== X-Gm-Message-State: APjAAAXh40azQhtWur/bm+sRo14ORhql73H0OBIX2B7FwYQsd4CZFGP4 0M9stxrEtixSANY8KacsDnIZcg== X-Google-Smtp-Source: APXvYqws1Wq1zw3UK9tB1eJ1pU0nnhICoChdQWRZmcqeRsBI33N++GPHTDNKRmme1nTLPHv5LaPGkw== X-Received: by 2002:a63:c204:: with SMTP id b4mr5897712pgd.335.1553066310716; Wed, 20 Mar 2019 00:18:30 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:b852:bd51:9305:4261]) by smtp.gmail.com with ESMTPSA id l184sm1579803pfc.41.2019.03.20.00.18.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Mar 2019 00:18:30 -0700 (PDT) From: Hsin-Yi Wang To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] gpu/drm: mediatek: call mtk_dsi_stop() after mtk_drm_crtc_atomic_disable() Date: Wed, 20 Mar 2019 15:18:25 +0800 Message-Id: <20190320071825.20268-1-hsinyi@chromium.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 20 Mar 2019 08:32:28 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Mtcq9S/v2Tl+uFG8ivjTYFKQCKpz3W6EmGjpkEFJ4cs=; b=XYdQaKD62Uc3PQvaYbXUSYqA2iBDHwnMF01B+WOLaYLLPBHWiQJg4xzKyrbgIGFBe2 i47kGXU41UWimuGRsqohqhOxUkxxvS8fogJIlYFrQJcRDFe4NMrtglvEp741k2g971pM qAOMXPFerplhpCOtQ8pFwOcjrXNXTDhrMGj+8= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Matthias Brugger , linux-mediatek@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP mtk_dsi_stop() should be called after mtk_drm_crtc_atomic_disable(), which needs ovl irq for drm_crtc_wait_one_vblank(), since after mtk_dsi_stop() is called, ovl irq will be disabled. If drm_crtc_wait_one_vblank() is called after last irq, it will timeout with this message: "vblank wait timed out on crtc 0". This happens sometimes when turning off the screen. In drm_atomic_helper.c#disable_outputs(), the calling sequence when turning off the screen is: 1. mtk_dsi_encoder_disable() --> mtk_output_dsi_disable() --> mtk_dsi_stop(); // sometimes make vblank timeout in atomic_disable --> mtk_dsi_poweroff(); 2. mtk_drm_crtc_atomic_disable() --> drm_crtc_wait_one_vblank(); ... --> mtk_dsi_ddp_stop() --> mtk_dsi_poweroff(); mtk_dsi_poweroff() has reference count design, change to make mtk_dsi_stop() called in mtk_dsi_poweroff() when refcount is 0. Fixes: 0707632b5bac ("drm/mediatek: update DSI sub driver flow for sending commands to panel") Signed-off-by: Hsin-Yi Wang --- change log: v1->v2: * update commit message. * call mtk_dsi_stop() in mtk_dsi_poweroff() when refcount is 0. --- drivers/gpu/drm/mediatek/mtk_dsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index b00eb2d2e086..e152f37af57d 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -630,6 +630,8 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi) if (--dsi->refcount != 0) return; + mtk_dsi_stop(dsi); + if (!mtk_dsi_switch_to_cmd_mode(dsi, VM_DONE_INT_FLAG, 500)) { if (dsi->panel) { if (drm_panel_unprepare(dsi->panel)) { @@ -696,7 +698,6 @@ static void mtk_output_dsi_disable(struct mtk_dsi *dsi) } } - mtk_dsi_stop(dsi); mtk_dsi_poweroff(dsi); dsi->enabled = false; @@ -1178,6 +1179,8 @@ static int mtk_dsi_remove(struct platform_device *pdev) struct mtk_dsi *dsi = platform_get_drvdata(pdev); mtk_output_dsi_disable(dsi); + mtk_dsi_stop(dsi); + mtk_dsi_poweroff(dsi); component_del(&pdev->dev, &mtk_dsi_component_ops); return 0;