From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 649F0C32771 for ; Mon, 19 Sep 2022 03:01:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229606AbiISDBb (ORCPT ); Sun, 18 Sep 2022 23:01:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbiISDBZ (ORCPT ); Sun, 18 Sep 2022 23:01:25 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75E9D19C20 for ; Sun, 18 Sep 2022 20:01:17 -0700 (PDT) X-UUID: 8e7c2af9fdbe40aa902e87221b3b1be1-20220919 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:From:References:CC:To:Subject:MIME-Version:Date:Message-ID; bh=brO5M1scQWHNwMS0EUhURU1amtuc/rJCBXyobl1FbS4=; b=XFhhWjB6HiwifZ+jpsdNB98ckYp/1KCdAiqeqptTNpdgdu38zRIBV23uNev7Cnlw5FC8iFRlX8IFIzQ1dZU/qFUEZT1/4b2bK7gnh1YX8uj429rjrxk35IOcgGDWJLWGS1lWdEmCKEIQEhxFJ88erWj8RhrtcvHP+cOKynlEUWo=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.11,REQID:234500b2-2d89-4c29-a46b-5df75421d762,IP:0,U RL:25,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:20 X-CID-META: VersionHash:39a5ff1,CLOUDID:2c5ad4f6-6e85-48d9-afd8-0504bbfe04cb,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: 8e7c2af9fdbe40aa902e87221b3b1be1-20220919 Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 296657723; Mon, 19 Sep 2022 11:01:13 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Mon, 19 Sep 2022 11:01:12 +0800 Received: from [172.21.84.99] (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 19 Sep 2022 11:01:11 +0800 Message-ID: <7ef4e4c6-e8e6-74a9-8211-bff90ad2d9fb@mediatek.com> Date: Mon, 19 Sep 2022 11:01:11 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: [PATCH v2] drm: mediatek: Fix display vblank timeout when disable dsi Content-Language: en-US To: Chun-Kuang Hu CC: Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , AngeloGioacchino Del Regno , Project_Global_Chrome_Upstream_Group , DRI Development , Linux ARM , linux-kernel , "moderated list:ARM/Mediatek SoC support" , =?UTF-8?B?WGlubGVpIExlZSAo5p2O5piV56OKKQ==?= References: <20220914140031.18578-1-allen-kh.cheng@mediatek.com> From: Allen-KH Cheng In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi CK, We will test this fix on the mt8186/mt8183. Maybe our fix is not necessary. I appreciate your suggestion. BRs, Allen On 9/18/22 12:32, Chun-Kuang Hu wrote: > Hi, Allen: > > Allen-KH Cheng 於 2022年9月14日 週三 晚上10:00寫道： >> >> From: Xinlei Lee >> >> Dsi is turned off at bridge.disable, causing crtc to wait for vblank >> timeout. It is necessary to add count protection to turn off dsi and >> turn off at post_disable. > > If turn off dsi in post_disable(), you should turn on dsi in pre_enable(). > > There is another patch fix this problem [1], do you have any comment > on that patch? > > [1] http://lists.infradead.org/pipermail/linux-mediatek/2022-August/046713.html > > Regards, > Chun-Kuang. > >> >> Fixes: cde7e2e35c28 ("drm/mediatek: Separate poweron/poweroff from enable/disable and define new funcs") >> Signed-off-by: Xinlei Lee >> Co-developed-by: Allen-KH Cheng >> Signed-off-by: Allen-KH Cheng >> --- >> Change in v1: >> * Rebase to kernel/git/chunkuang.hu/linux.git, mediatek-drm-fixes >> [Allen-KH Cheng ] >> --- >> --- >> drivers/gpu/drm/mediatek/mtk_dsi.c | 15 ++++++--------- >> 1 file changed, 6 insertions(+), 9 deletions(-) >> >> diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c >> index 5b624e0f5b0a..e30f4244c001 100644 >> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c >> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c >> @@ -768,14 +768,6 @@ static void mtk_dsi_bridge_mode_set(struct drm_bridge *bridge, >> drm_display_mode_to_videomode(adjusted, &dsi->vm); >> } >> >> -static void mtk_dsi_bridge_atomic_disable(struct drm_bridge *bridge, >> - struct drm_bridge_state *old_bridge_state) >> -{ >> - struct mtk_dsi *dsi = bridge_to_dsi(bridge); >> - >> - mtk_output_dsi_disable(dsi); >> -} >> - >> static void mtk_dsi_bridge_atomic_enable(struct drm_bridge *bridge, >> struct drm_bridge_state *old_bridge_state) >> { >> @@ -803,13 +795,15 @@ static void mtk_dsi_bridge_atomic_post_disable(struct drm_bridge *bridge, >> { >> struct mtk_dsi *dsi = bridge_to_dsi(bridge); >> >> + if (dsi->refcount == 1) >> + mtk_output_dsi_disable(dsi); >> + >> mtk_dsi_poweroff(dsi); >> } >> >> static const struct drm_bridge_funcs mtk_dsi_bridge_funcs = { >> .attach = mtk_dsi_bridge_attach, >> .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, >> - .atomic_disable = mtk_dsi_bridge_atomic_disable, >> .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, >> .atomic_enable = mtk_dsi_bridge_atomic_enable, >> .atomic_pre_enable = mtk_dsi_bridge_atomic_pre_enable, >> @@ -829,6 +823,9 @@ void mtk_dsi_ddp_stop(struct device *dev) >> { >> struct mtk_dsi *dsi = dev_get_drvdata(dev); >> >> + if (dsi->refcount == 1) >> + mtk_output_dsi_disable(dsi); >> + >> mtk_dsi_poweroff(dsi); >> } >> >> -- >> 2.18.0 >>