From nobody Mon Apr 6 14:56:52 2026 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 C8572C433FE for ; Mon, 3 Oct 2022 05:04:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229571AbiJCFD6 (ORCPT ); Mon, 3 Oct 2022 01:03:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229458AbiJCFDy (ORCPT ); Mon, 3 Oct 2022 01:03:54 -0400 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD2F926579 for ; Sun, 2 Oct 2022 22:03:52 -0700 (PDT) Received: by mail-pg1-x52c.google.com with SMTP id j71so2641767pge.2 for ; Sun, 02 Oct 2022 22:03:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=aBBW7OEU3Jgfto9gKhCEsUvgKLnU3sOd14ZwKXmRCUU=; b=VOs7XxzGPKi8k8vLT++EXRfoNjCuEcMwGNH7k6UOdHcoLaHmZOyxPkgLqMtDa3ocaj INMu6y/TvmRJOKFZl8pMwl2Wi5dYSKawjc07YqUiryTmLxVviffpXJWYMXY9azqCWste qdgJC/Q8mKo19TX+ujvqHl63YHyazDU4W5yi0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=aBBW7OEU3Jgfto9gKhCEsUvgKLnU3sOd14ZwKXmRCUU=; b=t2HTqouWf4S55QGBVlfZo/pOa/hnKBHHccTRJHiznsNa2zcRaiv/J+UZT0H9ElURje QKdVs2h9ZuWMW0DfJJF1vvcci1a11fX/FCk7/SoNRYSr+9qfbmbIvVPhP0fbg38JWXHP 5MjeieeQjRk5GM7f4BgXORGCpUIUUPBjnoqbiDDEzvBhLCGh1evWf8QPd05NWK5cNcXY TsWERmqwNtb6Ouro4RytVJOyVf0uq4ZzpnxpM5ts7ZisTFbc5qrybScf6e+QmAeuQcsK a+okGxb5V6gs1w+WARn3QoHxfvkQ7jTUtCUteEC1Xm6w0RNxsknXysyWuv60f9kNzD3N 2m9g== X-Gm-Message-State: ACrzQf3lcA8EfwnNYyOHUmKIL0cxzoRfx33Cxweu0Y1nJaUpJOf/SQEi kZB4zGtI6ialTfilPfjABOGt4w== X-Google-Smtp-Source: AMsMyM4JnYlktQ8B8Bmm6tGapdzDSy19ilVqdF8e9ZTCi3eSy74kgYRGZfNK3k+jqcqm8iFkKmP8lQ== X-Received: by 2002:a63:1210:0:b0:435:60d2:b953 with SMTP id h16-20020a631210000000b0043560d2b953mr17385550pgl.459.1664773432289; Sun, 02 Oct 2022 22:03:52 -0700 (PDT) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:dfa6:5a1a:b35a:db69]) by smtp.gmail.com with ESMTPSA id y8-20020a170902b48800b0017680faa1a8sm6174628plr.112.2022.10.02.22.03.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 22:03:51 -0700 (PDT) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter Cc: linux-kernel@vger.kernel.org, Hermes Wu , AngeloGioacchino Del Regno , Allen Chen , Hsin-Yi Wang , dri-devel@lists.freedesktop.org, Pin-yen Lin Subject: [PATCH v2 1/2] drm/bridge: it6505: Adapt runtime power management framework Date: Mon, 3 Oct 2022 13:03:34 +0800 Message-Id: <20221003050335.1007931-2-treapking@chromium.org> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog In-Reply-To: <20221003050335.1007931-1-treapking@chromium.org> References: <20221003050335.1007931-1-treapking@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use pm_runtime_(get|put)_sync to control the bridge power, and add SET_SYSTEM_SLEEP_PM_OPS with pm_runtime_force_(suspend|resume) to it6505 driver. Without SET_SYSTEM_SLEEP_PM_OPS, the bridge will be powered on unnecessarily when no external display is connected. Fixes: b5c84a9edcd4 ("drm/bridge: add it6505 driver") Signed-off-by: Pin-yen Lin --- Changes in v2: - Handle the error from pm_runtime_get_sync in it6505_extcon_work drivers/gpu/drm/bridge/ite-it6505.c | 33 +++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/i= te-it6505.c index 2bb957cffd94..685d8e750b12 100644 --- a/drivers/gpu/drm/bridge/ite-it6505.c +++ b/drivers/gpu/drm/bridge/ite-it6505.c @@ -421,6 +421,7 @@ struct it6505 { struct notifier_block event_nb; struct extcon_dev *extcon; struct work_struct extcon_wq; + int extcon_state; enum drm_connector_status connector_status; enum link_train_status link_state; struct work_struct link_works; @@ -2685,31 +2686,42 @@ static void it6505_extcon_work(struct work_struct *= work) { struct it6505 *it6505 =3D container_of(work, struct it6505, extcon_wq); struct device *dev =3D &it6505->client->dev; - int state =3D extcon_get_state(it6505->extcon, EXTCON_DISP_DP); - unsigned int pwroffretry =3D 0; + int state, ret; =20 if (it6505->enable_drv_hold) return; =20 mutex_lock(&it6505->extcon_lock); =20 + state =3D extcon_get_state(it6505->extcon, EXTCON_DISP_DP); DRM_DEV_DEBUG_DRIVER(dev, "EXTCON_DISP_DP =3D 0x%02x", state); + + if (state =3D=3D it6505->extcon_state) + goto unlock; + if (state > 0) { DRM_DEV_DEBUG_DRIVER(dev, "start to power on"); msleep(100); - it6505_poweron(it6505); + ret =3D pm_runtime_get_sync(dev); + + /* + * On system resume, extcon_work can be triggered before + * pm_runtime_force_resume re-enables runtime power management. + * Handling the error here to make sure the bridge is powered on. + */ + if (ret) + it6505_poweron(it6505); } else { DRM_DEV_DEBUG_DRIVER(dev, "start to power off"); - while (it6505_poweroff(it6505) && pwroffretry++ < 5) { - DRM_DEV_DEBUG_DRIVER(dev, "power off fail %d times", - pwroffretry); - } + pm_runtime_put_sync(dev); =20 drm_helper_hpd_irq_event(it6505->bridge.dev); memset(it6505->dpcd, 0, sizeof(it6505->dpcd)); DRM_DEV_DEBUG_DRIVER(dev, "power off it6505 success!"); } + it6505->extcon_state =3D state; =20 +unlock: mutex_unlock(&it6505->extcon_lock); } =20 @@ -3032,8 +3044,10 @@ static __maybe_unused int it6505_bridge_suspend(stru= ct device *dev) return it6505_poweroff(it6505); } =20 -static SIMPLE_DEV_PM_OPS(it6505_bridge_pm_ops, it6505_bridge_suspend, - it6505_bridge_resume); +static const struct dev_pm_ops it6505_bridge_pm_ops =3D { + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) + SET_RUNTIME_PM_OPS(it6505_bridge_suspend, it6505_bridge_resume, NULL) +}; =20 static int it6505_init_pdata(struct it6505 *it6505) { @@ -3315,6 +3329,7 @@ static int it6505_i2c_probe(struct i2c_client *client, =20 DRM_DEV_DEBUG_DRIVER(dev, "it6505 device name: %s", dev_name(dev)); debugfs_init(it6505); + pm_runtime_enable(dev); =20 it6505->bridge.funcs =3D &it6505_bridge_funcs; it6505->bridge.type =3D DRM_MODE_CONNECTOR_DisplayPort; --=20 2.38.0.rc1.362.ged0d419d3c-goog From nobody Mon Apr 6 14:56:52 2026 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 A12FEC43217 for ; Mon, 3 Oct 2022 05:04:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229590AbiJCFEF (ORCPT ); Mon, 3 Oct 2022 01:04:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229576AbiJCFD5 (ORCPT ); Mon, 3 Oct 2022 01:03:57 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 316DE26ACB for ; Sun, 2 Oct 2022 22:03:57 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id g130so8665438pfb.8 for ; Sun, 02 Oct 2022 22:03:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=ztuWh3+lm3Xgyvy8ErwnYqF7ln3RGH0S/A4OyK3wmIE=; b=Hz8TZprhU9xLfxIJDPiq1ixTjaUkHrGur4fPPa52CFjvLABRT995xyhJWJ8w1pt/HX HySMjpKk8DIwly7hIZgDp/G/m5E0OlvM9cErN3xt2UTEUFfpeAkJVSqgtG64B52weKIn 3sJUdQFTYCDzyfRzvyj+a7heHPSPmwzHDY4Zo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=ztuWh3+lm3Xgyvy8ErwnYqF7ln3RGH0S/A4OyK3wmIE=; b=f2GjLBE4Lfxo8Z62DB/l993gXGDrGO7Qd5+1Rw6a5XdkMf5i/a3sCOzEONGKXYQSG/ KOiz9wPqNfKpk723BKqZ2sW3EzGnX3s5rLPB/WuE2RwAMLtrUXa94dwcgjUxIdmYqe8X e2UBQyhwRLxW0JbAqyBkbs8qTr7HJZ3oR81Xp09D/bP/vDeFjz22g7CvTgYzbmDAAQJH rkOt4UfDpPqbOXwjIiFDrlAoRQ3ay6XQTRfGBimfk3FLzcWnJhtX8okxNPY9++D54ASA VHNVRzNBHfKvOXjVoVWXVsBufzCTY+CzHk7pVNCGr60sICXbeKmndSJhRqkACnGneNTf XZsw== X-Gm-Message-State: ACrzQf1LU3FAxizn4oVY6QF67fKQY0gznWTJ6mWra+G+MVmvkAWWZRo7 chXBoJ8Voaj5WDfO57HvJWxTlA== X-Google-Smtp-Source: AMsMyM7w6djAOyImUB/oWDtW7Wxj/dH2t2EMQ4LGPYCFTqC3FDUnNEPHJfsbQCiA4dt1fFO01grIFg== X-Received: by 2002:a05:6a00:14c4:b0:542:cd3a:591e with SMTP id w4-20020a056a0014c400b00542cd3a591emr20437876pfu.27.1664773436673; Sun, 02 Oct 2022 22:03:56 -0700 (PDT) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:dfa6:5a1a:b35a:db69]) by smtp.gmail.com with ESMTPSA id y8-20020a170902b48800b0017680faa1a8sm6174628plr.112.2022.10.02.22.03.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 22:03:55 -0700 (PDT) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter Cc: linux-kernel@vger.kernel.org, Hermes Wu , AngeloGioacchino Del Regno , Allen Chen , Hsin-Yi Wang , dri-devel@lists.freedesktop.org, Pin-yen Lin Subject: [PATCH v2 2/2] drm/bridge: it6505: Add pre_enable/post_disable callback Date: Mon, 3 Oct 2022 13:03:35 +0800 Message-Id: <20221003050335.1007931-3-treapking@chromium.org> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog In-Reply-To: <20221003050335.1007931-1-treapking@chromium.org> References: <20221003050335.1007931-1-treapking@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add atomic_pre_enable and atomic_post_disable callback to make sure the bridge is not powered off until atomic_post_disable is called. This prevents a power leakage when it6505 is powered off, but the upstream DRM bridge is still sending display signals. Fixes: b5c84a9edcd4 ("drm/bridge: add it6505 driver") Signed-off-by: Pin-yen Lin Reviewed-by: AngeloGioacchino Del Regno --- (no changes since v1) drivers/gpu/drm/bridge/ite-it6505.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/i= te-it6505.c index 685d8e750b12..27de6652f842 100644 --- a/drivers/gpu/drm/bridge/ite-it6505.c +++ b/drivers/gpu/drm/bridge/ite-it6505.c @@ -2992,6 +2992,28 @@ static void it6505_bridge_atomic_disable(struct drm_= bridge *bridge, } } =20 +static void it6505_bridge_atomic_pre_enable(struct drm_bridge *bridge, + struct drm_bridge_state *old_state) +{ + struct it6505 *it6505 =3D bridge_to_it6505(bridge); + struct device *dev =3D &it6505->client->dev; + + DRM_DEV_DEBUG_DRIVER(dev, "start"); + + pm_runtime_get_sync(dev); +} + +static void it6505_bridge_atomic_post_disable(struct drm_bridge *bridge, + struct drm_bridge_state *old_state) +{ + struct it6505 *it6505 =3D bridge_to_it6505(bridge); + struct device *dev =3D &it6505->client->dev; + + DRM_DEV_DEBUG_DRIVER(dev, "start"); + + pm_runtime_put_sync(dev); +} + static enum drm_connector_status it6505_bridge_detect(struct drm_bridge *bridge) { @@ -3026,6 +3048,8 @@ static const struct drm_bridge_funcs it6505_bridge_fu= ncs =3D { .mode_valid =3D it6505_bridge_mode_valid, .atomic_enable =3D it6505_bridge_atomic_enable, .atomic_disable =3D it6505_bridge_atomic_disable, + .atomic_pre_enable =3D it6505_bridge_atomic_pre_enable, + .atomic_post_disable =3D it6505_bridge_atomic_post_disable, .detect =3D it6505_bridge_detect, .get_edid =3D it6505_bridge_get_edid, }; --=20 2.38.0.rc1.362.ged0d419d3c-goog