From nobody Mon Apr 6 09:42:36 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 8D3AFC433FE for ; Tue, 4 Oct 2022 04:50:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229571AbiJDEuG (ORCPT ); Tue, 4 Oct 2022 00:50:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229562AbiJDEt7 (ORCPT ); Tue, 4 Oct 2022 00:49:59 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9090411443 for ; Mon, 3 Oct 2022 21:49:55 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id 83so5194901pfw.10 for ; Mon, 03 Oct 2022 21:49:55 -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=Oju4xub6V7o9xdAwaD+T9qBCkcycOQCYgq5nWXYf73c=; b=g2MUedlp2FmmMd643uwEZbCZtVYI18tEjGcXa6bcde+90DOKQzZFnf9PlJgcernkbP hfxXV1vocR9AXTAwnwjzqJnN30j617uXUheWuN5H8g7cDrK9WvyW77BRt2CYlADtvyI4 +5qVi4VQ3QkdewrNJD8ON/DY7n1Ooaa3PPHGs= 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=Oju4xub6V7o9xdAwaD+T9qBCkcycOQCYgq5nWXYf73c=; b=pjo8a3nz5DGBHdanNjg8ZIoYJKUVm0pWIxneozO02R3evIwIeTOHehgTt62vXAvut3 /iVV996znsLVD29ekK9Aau4/Fw2LiiaXplEUB/0Lws4ufj9tW2TLoBrTs4UPJ6c9hNwZ ml605/n9WOWzARAwqXToWhxvKywiNhxuo01Zvx9xaXj5DAPb+nnlGMgu6wq2uFogKMCJ HFz/7pMQnEy6ztow4NdTC7EfEyrwv/7QL5v1xpDJ3VGfiSA4LVSqM1gD8E+rn+31ox/P yFMFdYW4FUkC4QcI2AqjKFVHr/AMrCYK1HECsS5a+B6T9bS7u035nnbvZ5F53hCOrwgw wr1Q== X-Gm-Message-State: ACrzQf3SEN9yxu3xmIUZNt/Av9OmjOKlADc8BEm8FJtidSRkPF3LcZr6 oebYnXP1KVnfjxrojcruIUAs4w== X-Google-Smtp-Source: AMsMyM7mi1Icb6JbtEanxHY2Ja6jRia1xju1EzBz4lc1wz9V+WfGDXYAie3hAGBmHJiYfPsV5b+mCw== X-Received: by 2002:a05:6a00:22c7:b0:544:bbf0:8780 with SMTP id f7-20020a056a0022c700b00544bbf08780mr25661740pfj.80.1664858994828; Mon, 03 Oct 2022 21:49:54 -0700 (PDT) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:5713:ccf0:f1dd:69d2]) by smtp.gmail.com with ESMTPSA id gl1-20020a17090b120100b0020ab3f9c27dsm1095051pjb.55.2022.10.03.21.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 21:49:54 -0700 (PDT) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter Cc: Hsin-Yi Wang , dri-devel@lists.freedesktop.org, AngeloGioacchino Del Regno , linux-kernel@vger.kernel.org, Hermes Wu , Allen Chen , Pin-yen Lin Subject: [PATCH v3 1/2] drm/bridge: it6505: Adapt runtime power management framework Date: Tue, 4 Oct 2022 12:49:42 +0800 Message-Id: <20221004044943.2407781-2-treapking@chromium.org> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog In-Reply-To: <20221004044943.2407781-1-treapking@chromium.org> References: <20221004044943.2407781-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 Reviewed-by: AngeloGioacchino Del Regno --- Changes in v3: - Handle the error from extcon_get_state Changes in v2: - Handle the error from pm_runtime_get_sync in it6505_extcon_work drivers/gpu/drm/bridge/ite-it6505.c | 34 ++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/i= te-it6505.c index 2bb957cffd94..050f3be9adbc 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,41 @@ 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 > 0) { + + if (state =3D=3D it6505->extcon_state || unlikely(state < 0)) + goto unlock; + it6505->extcon_state =3D state; + if (state) { 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!"); } =20 +unlock: mutex_unlock(&it6505->extcon_lock); } =20 @@ -3032,8 +3043,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 +3328,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 09:42:36 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 9CC7FC4332F for ; Tue, 4 Oct 2022 04:50:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229548AbiJDEuK (ORCPT ); Tue, 4 Oct 2022 00:50:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbiJDEuC (ORCPT ); Tue, 4 Oct 2022 00:50:02 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CA84E033 for ; Mon, 3 Oct 2022 21:49:59 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id x6so6415344pll.11 for ; Mon, 03 Oct 2022 21:49:59 -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=6rx+SIB5qyaNNqvePOxH/VVXvkvOQPlultnrgr/9WBk=; b=gLGYEgNEm1k0Ctu79S1ja4IaXh59wOmABV1jWdHjEbgedZEQzeIDzDBbD1qAmzhWbG +pOdKXHnrAj5muXLm6SQeZeGtUbxGWqcDI+Ts7dloblRb2Y5kaWPkAIPYNXVLHPv2GIJ WUTRAIr1Xjg0hzxo7X++xRMfkVvQ31BsFnOaw= 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=6rx+SIB5qyaNNqvePOxH/VVXvkvOQPlultnrgr/9WBk=; b=Pq5YN2eedQxaqG5OPfJnk+n0XsejWOnje8pHpnVFcac5QTtmwNbDESVrdgClKofsw1 /DQQ8MEa6ZCjgfDseS4GuNMhI019yBIvIxDDCxgi5GSuenHgJD2k1aChhRIwnEZNPH0/ W1/aEiDjcSzXWviz+Dt4i4KAcJnb/qUsX7JUApYtm/HoyJWwXFOmFvkHyenYMrBBT5ix kt73kyzBTmJ++YgSTeNJodTkZ7wLMclMM6LBjtA4hh4/idZSpqFP13cxjXibTL4+mnoR 5WaRE/zWc6Tk+oOKeGk3McSPwSNP/LQZ61h+2y3ZIGigmyWHnLD2zWGXxreBurrDeYyO UcQw== X-Gm-Message-State: ACrzQf1ShmXivW0+QyQueQsXhJXVmqRLrhZvSj4xaaRSOBDAntNlpLEk BwKPLWXtt1awhCiwzQLtcZkqQQ== X-Google-Smtp-Source: AMsMyM4J4QFS3sG3dhrr9gH6JE3zLYeTHARsUl9uaqvmP8uj0TuQMSKZR9U5E7D+Jg2TXjgK3vhrIw== X-Received: by 2002:a17:902:b092:b0:17b:833e:74f7 with SMTP id p18-20020a170902b09200b0017b833e74f7mr23318315plr.149.1664858998744; Mon, 03 Oct 2022 21:49:58 -0700 (PDT) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:5713:ccf0:f1dd:69d2]) by smtp.gmail.com with ESMTPSA id gl1-20020a17090b120100b0020ab3f9c27dsm1095051pjb.55.2022.10.03.21.49.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 21:49:58 -0700 (PDT) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter Cc: Hsin-Yi Wang , dri-devel@lists.freedesktop.org, AngeloGioacchino Del Regno , linux-kernel@vger.kernel.org, Hermes Wu , Allen Chen , Pin-yen Lin Subject: [PATCH v3 2/2] drm/bridge: it6505: Add pre_enable/post_disable callback Date: Tue, 4 Oct 2022 12:49:43 +0800 Message-Id: <20221004044943.2407781-3-treapking@chromium.org> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog In-Reply-To: <20221004044943.2407781-1-treapking@chromium.org> References: <20221004044943.2407781-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 --- Changes in v3: - Collect review tag 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 050f3be9adbc..922e1f2b7a35 100644 --- a/drivers/gpu/drm/bridge/ite-it6505.c +++ b/drivers/gpu/drm/bridge/ite-it6505.c @@ -2991,6 +2991,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) { @@ -3025,6 +3047,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