Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2869370rwb; Mon, 15 Aug 2022 13:00:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR5Z+kPV+EHALwnYr9BfE9vhm4Kxf70cN4VjVvNcH9J2sNNV9WfeG62bxBD+6xPN72H9ZFBZ X-Received: by 2002:a17:90b:4c52:b0:1f6:3a26:9f08 with SMTP id np18-20020a17090b4c5200b001f63a269f08mr20393966pjb.206.1660593617590; Mon, 15 Aug 2022 13:00:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660593617; cv=none; d=google.com; s=arc-20160816; b=G64hF85/PBm3OdPaPvXr059Fv4oE5iZPzhJYGC+uMgA0Di96wpkFGpRDB+K6MQYQgX 9Qn4sRAYSYh6rOwLU+V7LPQDAK2cNzAYQ9VRUO+OaIDR7VCFj/FI+iYsCqTCikEZXkO+ ZA99qE0kFhcNE38ySK8H8OUy8Vt/tVQutXDTtJ6nM5G2uQsCUXoDpU2o1WvCx1V4AYe/ OMhrv/QTLHgbf63+Svup6RkPm1B6G/uvPXqQgxTmQcyOdbswKIiBZGMHoZzbpTzhnblp 4YuRaQ1COklQzrCTs9sFUvSDVkgbzAnNzasEpMgCBk4CHllxunXnkJNoRI1DGTRgEhQg fCnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/IX9ooNsEYjdHbT0naZuNwNv9DC+5KnfyWl0vHFpZYQ=; b=AlgtL19nY2rwsblniw2zXp1sjwViWZHYLIj30eMjabgAiCxUlidgyaVCf3Nk8nqazD k1nU2MQEWuXDppwZn7jAAoQPY9YrckHU4bS/XrbKIoC/itDlQ36wu/2SbpkYPyObdUxr 3ifLGlhqREC7HzyUl5KR2KwSsDA/O+Fi4qSUKXO+uHyYIEa6Q/Zwl21Q1inSpdB1/XeI vBxzad5Kr8LFO7vR8zuWqLMECyIjIX1iWQBEWOebClj3r5d+PmqA7Pmugkyj19shY0BG WSl/e65cgRDQRkXjmqensw4GOWaDbxSRC4tm6eUmSmMNsTCvboA4i6bFvMM3hkMjRPVV dQdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JY0ekJxh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h1-20020a17090a604100b001f70261fe1fsi7690983pjm.46.2022.08.15.13.00.03; Mon, 15 Aug 2022 13:00:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JY0ekJxh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345164AbiHOTsn (ORCPT + 99 others); Mon, 15 Aug 2022 15:48:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345435AbiHOTqu (ORCPT ); Mon, 15 Aug 2022 15:46:50 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39AE26F561; Mon, 15 Aug 2022 11:49:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8FA3AB810A1; Mon, 15 Aug 2022 18:49:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D621AC433D6; Mon, 15 Aug 2022 18:49:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660589355; bh=aoTL0j8aoAOsgFnokFVnd7h3V6pYNwdWdig+Ob+6Xm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JY0ekJxh5GgTWtJLKEIr6w54VgXppox3g9hNSAJAZ+v/bdl2/nok0/fvmrmhe9te5 5Y2Lv6j5/BhfyXQLtBEAh7AWiA//qAso0YZ9zPILGSb/5Qo2Mvt/+8h/ADxMEr/+oI bxUGFConD3LVPyPfwTkBJ0N/Jgvl7Y+eo9VMBn/Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jitao Shi , Xinlei Lee , AngeloGioacchino Del Regno , Rex-BC Chen , Chun-Kuang Hu , Sasha Levin Subject: [PATCH 5.15 691/779] drm/mediatek: Keep dsi as LP00 before dcs cmds transfer Date: Mon, 15 Aug 2022 20:05:35 +0200 Message-Id: <20220815180406.870421931@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180337.130757997@linuxfoundation.org> References: <20220815180337.130757997@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jitao Shi [ Upstream commit 39e8d062b03c3dc257d880d82bd55cdd9e185a3b ] To comply with the panel sequence, hold the mipi signal to LP00 before the dcs cmds transmission, and pull the mipi signal high from LP00 to LP11 until the start of the dcs cmds transmission. The normal panel timing is : (1) pp1800 DC pull up (2) avdd & avee AC pull high (3) lcm_reset pull high -> pull low -> pull high (4) Pull MIPI signal high (LP11) -> initial code -> send video data (HS mode) The power-off sequence is reversed. If dsi is not in cmd mode, then dsi will pull the mipi signal high in the mtk_output_dsi_enable function. The delay in lane_ready func is the reaction time of dsi_rx after pulling up the mipi signal. Fixes: 2dd8075d2185 ("drm/mediatek: mtk_dsi: Use the drm_panel_bridge API") Link: https://patchwork.kernel.org/project/linux-mediatek/patch/1653012007-11854-4-git-send-email-xinlei.lee@mediatek.com/ Cc: # 5.10.x: 7f6335c6a258: drm/mediatek: Modify dsi funcs to atomic operations Cc: # 5.10.x: cde7e2e35c28: drm/mediatek: Separate poweron/poweroff from enable/disable and define new funcs Cc: # 5.10.x Signed-off-by: Jitao Shi Signed-off-by: Xinlei Lee Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Rex-BC Chen Signed-off-by: Chun-Kuang Hu Signed-off-by: Sasha Levin --- drivers/gpu/drm/mediatek/mtk_dsi.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index ab51656d5dae..ac14e598a14f 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -203,6 +203,7 @@ struct mtk_dsi { struct mtk_phy_timing phy_timing; int refcount; bool enabled; + bool lanes_ready; u32 irq_data; wait_queue_head_t irq_wait_queue; const struct mtk_dsi_driver_data *driver_data; @@ -649,18 +650,11 @@ static int mtk_dsi_poweron(struct mtk_dsi *dsi) mtk_dsi_reset_engine(dsi); mtk_dsi_phy_timconfig(dsi); - mtk_dsi_rxtx_control(dsi); - usleep_range(30, 100); - mtk_dsi_reset_dphy(dsi); mtk_dsi_ps_control_vact(dsi); mtk_dsi_set_vm_cmd(dsi); mtk_dsi_config_vdo_timing(dsi); mtk_dsi_set_interrupt_enable(dsi); - mtk_dsi_clk_ulp_mode_leave(dsi); - mtk_dsi_lane0_ulp_mode_leave(dsi); - mtk_dsi_clk_hs_mode(dsi, 0); - return 0; err_disable_engine_clk: clk_disable_unprepare(dsi->engine_clk); @@ -691,6 +685,23 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi) clk_disable_unprepare(dsi->digital_clk); phy_power_off(dsi->phy); + + dsi->lanes_ready = false; +} + +static void mtk_dsi_lane_ready(struct mtk_dsi *dsi) +{ + if (!dsi->lanes_ready) { + dsi->lanes_ready = true; + mtk_dsi_rxtx_control(dsi); + usleep_range(30, 100); + mtk_dsi_reset_dphy(dsi); + mtk_dsi_clk_ulp_mode_leave(dsi); + mtk_dsi_lane0_ulp_mode_leave(dsi); + mtk_dsi_clk_hs_mode(dsi, 0); + msleep(20); + /* The reaction time after pulling up the mipi signal for dsi_rx */ + } } static void mtk_output_dsi_enable(struct mtk_dsi *dsi) @@ -698,6 +709,7 @@ static void mtk_output_dsi_enable(struct mtk_dsi *dsi) if (dsi->enabled) return; + mtk_dsi_lane_ready(dsi); mtk_dsi_set_mode(dsi); mtk_dsi_clk_hs_mode(dsi, 1); @@ -924,6 +936,8 @@ static ssize_t mtk_dsi_host_transfer(struct mipi_dsi_host *host, if (MTK_DSI_HOST_IS_READ(msg->type)) irq_flag |= LPRX_RD_RDY_INT_FLAG; + mtk_dsi_lane_ready(dsi); + ret = mtk_dsi_host_send_cmd(dsi, msg, irq_flag); if (ret) goto restore_dsi_mode; -- 2.35.1