From patchwork Wed May 11 23:15:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12846711 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 D5435C433EF for ; Wed, 11 May 2022 23:16:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349081AbiEKXQH (ORCPT ); Wed, 11 May 2022 19:16:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349079AbiEKXP7 (ORCPT ); Wed, 11 May 2022 19:15:59 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9126915721 for ; Wed, 11 May 2022 16:15:57 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id d25so3223803pfo.10 for ; Wed, 11 May 2022 16:15:57 -0700 (PDT) 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=R/bRSCWxN3crWK458fxz1SEwoQZz1X0AHwhiaJnWOQg=; b=KVvo0HsMb0gWdW8ms9ukhOL6ZAQxTudwfprKB5eUOOA+BinL+gfiSIxfaBnRXJOEiQ wsjUqTqHizdwMwtddcF+UYDChiULqeGuICA6d/SUXH11T8Qo+LkrC/kp/zkg4QyVqiPZ gqEwBe0ptEgOxlgZcAnSsAaak/mHjo34JaYdQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=R/bRSCWxN3crWK458fxz1SEwoQZz1X0AHwhiaJnWOQg=; b=0QwiE4BOX8jfHZoWP4LdtKSA8AMwu28I8WcmIoTRBkjyZE33RXKHgFHetmv0k/wj1c AxK9OQUm6UVu6qXNcBkyjFQBt+Lm0XSpQG8JRzqIjhp1Fqe3P509K6NsR0NBLpnp3wJ6 g1Gv00XcOhaGafEU/1ZZY9oB2SHVnc/ZeWNM9FQLN0KJ/nZlBk+kGPBUxsdZz8x4fJQu ggzm8mQKAJ6FjYe01PZo1Yzb0KDaLw/CbC0cFwEepY2Uv/v/7FEre78bsZE2TKnVphEW OLqjCjXu2KjTaB2fpTiFxK3DHweGOjakMRI1FthsQsYmIX7PBrd9ouihPvuovsQOueXv IGTA== X-Gm-Message-State: AOAM5322nzzsoElnWqDdi2oLBUBvUgs/AfdYmUfD1A1LPrDYE30HUmud AuxL3pNBZsDS/121O72l78iWWQ== X-Google-Smtp-Source: ABdhPJzC5NTog37EDIqcukSTKK1ryjMlJrzN5VuhbJd6toYfu2679dFJdIBToo+zFeHGy4CReIKYbg== X-Received: by 2002:a63:3e44:0:b0:3c3:dabd:eb03 with SMTP id l65-20020a633e44000000b003c3dabdeb03mr22323606pga.15.1652310957139; Wed, 11 May 2022 16:15:57 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:504e:720d:de58:4f66]) by smtp.gmail.com with ESMTPSA id j18-20020a170902da9200b0015e8d4eb22asm2416295plx.116.2022.05.11.16.15.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 16:15:56 -0700 (PDT) From: Douglas Anderson To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov Cc: Dave Stevenson , Douglas Anderson , Bjorn Andersson , Daniel Vetter , David Airlie , Sean Paul , Stephen Boyd , Vinod Koul , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] Revert "drm/msm/dsi: move DSI host powerup to modeset time" Date: Wed, 11 May 2022 16:15:51 -0700 Message-Id: <20220511161539.v2.1.Ia196e35ad985059e77b038a41662faae9e26f411@changeid> X-Mailer: git-send-email 2.36.0.550.gb090851708-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This reverts commit 7d8e9a90509f1bd1d193a0c93cb8d1dbad9049fb. The patch causes sc7180 Chromebooks that use the parade-ps8640 bridge chip to fail to turn the display back on after it turns off. Let's revert to get these devices back to a working state. It seems like the DSI powerup problem is somewhat common and probably we should land something more general like Dave Stevenson's series [1] that would give more flexibility. [1] https://lore.kernel.org/r/cover.1646406653.git.dave.stevenson@raspberrypi.com Fixes: 7d8e9a90509f ("drm/msm/dsi: move DSI host powerup to modeset time") Signed-off-by: Douglas Anderson --- Changes in v2: - Remove the mud from my face. drivers/gpu/drm/msm/dsi/dsi_manager.c | 43 ++++++++------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c index 50b987658b1f..8d51711a3417 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c @@ -315,12 +315,13 @@ dsi_mgr_connector_best_encoder(struct drm_connector *connector) return msm_dsi_get_encoder(msm_dsi); } -static void dsi_mgr_bridge_power_on(struct drm_bridge *bridge) +static void dsi_mgr_bridge_pre_enable(struct drm_bridge *bridge) { int id = dsi_mgr_bridge_get_id(bridge); struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id); struct msm_dsi *msm_dsi1 = dsi_mgr_get_dsi(DSI_1); struct mipi_dsi_host *host = msm_dsi->host; + struct drm_panel *panel = msm_dsi->panel; struct msm_dsi_phy_shared_timings phy_shared_timings[DSI_MAX]; bool is_bonded_dsi = IS_BONDED_DSI(); int ret; @@ -361,34 +362,6 @@ static void dsi_mgr_bridge_power_on(struct drm_bridge *bridge) if (is_bonded_dsi && msm_dsi1) msm_dsi_host_enable_irq(msm_dsi1->host); - return; - -host1_on_fail: - msm_dsi_host_power_off(host); -host_on_fail: - dsi_mgr_phy_disable(id); -phy_en_fail: - return; -} - -static void dsi_mgr_bridge_pre_enable(struct drm_bridge *bridge) -{ - int id = dsi_mgr_bridge_get_id(bridge); - struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id); - struct msm_dsi *msm_dsi1 = dsi_mgr_get_dsi(DSI_1); - struct mipi_dsi_host *host = msm_dsi->host; - struct drm_panel *panel = msm_dsi->panel; - bool is_bonded_dsi = IS_BONDED_DSI(); - int ret; - - DBG("id=%d", id); - if (!msm_dsi_device_connected(msm_dsi)) - return; - - /* Do nothing with the host if it is slave-DSI in case of bonded DSI */ - if (is_bonded_dsi && !IS_MASTER_DSI_LINK(id)) - return; - /* Always call panel functions once, because even for dual panels, * there is only one drm_panel instance. */ @@ -423,7 +396,17 @@ static void dsi_mgr_bridge_pre_enable(struct drm_bridge *bridge) if (panel) drm_panel_unprepare(panel); panel_prep_fail: + msm_dsi_host_disable_irq(host); + if (is_bonded_dsi && msm_dsi1) + msm_dsi_host_disable_irq(msm_dsi1->host); + if (is_bonded_dsi && msm_dsi1) + msm_dsi_host_power_off(msm_dsi1->host); +host1_on_fail: + msm_dsi_host_power_off(host); +host_on_fail: + dsi_mgr_phy_disable(id); +phy_en_fail: return; } @@ -569,8 +552,6 @@ static void dsi_mgr_bridge_mode_set(struct drm_bridge *bridge, msm_dsi_host_set_display_mode(host, adjusted_mode); if (is_bonded_dsi && other_dsi) msm_dsi_host_set_display_mode(other_dsi->host, adjusted_mode); - - dsi_mgr_bridge_power_on(bridge); } static enum drm_mode_status dsi_mgr_bridge_mode_valid(struct drm_bridge *bridge,