From: Jessica Zhang <quic_jesszhan@quicinc.com>
To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Rob Clark <robdclark@gmail.com>,
Abhinav Kumar <quic_abhinavk@quicinc.com>,
Sean Paul <sean@poorly.run>,
Marijn Suijten <marijn.suijten@somainline.org>,
"David Airlie" <airlied@gmail.com>,
Daniel Vetter <daniel@ffwll.ch>
Cc: <linux-arm-msm@vger.kernel.org>,
<dri-devel@lists.freedesktop.org>,
<freedreno@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 14/14] drm/msm/hdmi: wire in hpd_enable/hpd_disable bridge ops
Date: Wed, 19 Jun 2024 15:14:01 -0700 [thread overview]
Message-ID: <0d240c5d-665e-40d8-91fb-9b9aad3b172a@quicinc.com> (raw)
In-Reply-To: <20240522-fd-hdmi-hpd-v2-14-c30bdb7c5c7e@linaro.org>
On 5/22/2024 3:51 AM, Dmitry Baryshkov wrote:
> The HDMI driver already has msm_hdmi_hpd_enable() and
> msm_hdmi_hpd_disable() functions. Wire them into the
> msm_hdmi_bridge_funcs, so that HPD can be enabled and disabled
> dynamically rather than always having HPD events generation enabled.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Jessica Zhang <quic_jesszhan@quicinc.com>
> ---
> drivers/gpu/drm/msm/hdmi/hdmi.c | 9 ---------
> drivers/gpu/drm/msm/hdmi/hdmi.h | 4 ++--
> drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 3 +++
> drivers/gpu/drm/msm/hdmi/hdmi_hpd.c | 12 ++++++------
> 4 files changed, 11 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
> index 2890196857f8..06adcf4a6544 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
> @@ -202,12 +202,6 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi,
> goto fail;
> }
>
> - ret = msm_hdmi_hpd_enable(hdmi->bridge);
> - if (ret < 0) {
> - DRM_DEV_ERROR(&hdmi->pdev->dev, "failed to enable HPD: %d\n", ret);
> - goto fail;
> - }
> -
> return 0;
>
> fail:
> @@ -377,9 +371,6 @@ static void msm_hdmi_unbind(struct device *dev, struct device *master,
> if (priv->hdmi->audio_pdev)
> platform_device_unregister(priv->hdmi->audio_pdev);
>
> - if (priv->hdmi->bridge)
> - msm_hdmi_hpd_disable(priv->hdmi);
> -
> msm_hdmi_destroy(priv->hdmi);
> priv->hdmi = NULL;
> }
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h
> index 7f0ca5252018..c6519e6f7f2c 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi.h
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h
> @@ -219,8 +219,8 @@ int msm_hdmi_bridge_init(struct hdmi *hdmi);
> void msm_hdmi_hpd_irq(struct drm_bridge *bridge);
> enum drm_connector_status msm_hdmi_bridge_detect(
> struct drm_bridge *bridge);
> -int msm_hdmi_hpd_enable(struct drm_bridge *bridge);
> -void msm_hdmi_hpd_disable(struct hdmi *hdmi);
> +void msm_hdmi_hpd_enable(struct drm_bridge *bridge);
> +void msm_hdmi_hpd_disable(struct drm_bridge *bridge);
>
> /*
> * i2c adapter for ddc:
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
> index 104107ed47d0..41722b2e6b44 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
> @@ -300,6 +300,9 @@ static const struct drm_bridge_funcs msm_hdmi_bridge_funcs = {
> .mode_valid = msm_hdmi_bridge_mode_valid,
> .edid_read = msm_hdmi_bridge_edid_read,
> .detect = msm_hdmi_bridge_detect,
> +
> + .hpd_enable = msm_hdmi_hpd_enable,
> + .hpd_disable = msm_hdmi_hpd_disable,
> };
>
> static void
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c b/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c
> index cb89e9e2c6ea..04d00b6f36fd 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c
> @@ -60,7 +60,7 @@ static void msm_hdmi_phy_reset(struct hdmi *hdmi)
> }
> }
>
> -int msm_hdmi_hpd_enable(struct drm_bridge *bridge)
> +void msm_hdmi_hpd_enable(struct drm_bridge *bridge)
> {
> struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
> struct hdmi *hdmi = hdmi_bridge->hdmi;
> @@ -70,8 +70,8 @@ int msm_hdmi_hpd_enable(struct drm_bridge *bridge)
> unsigned long flags;
>
> ret = pm_runtime_resume_and_get(dev);
> - if (ret)
> - return ret;
> + if (WARN_ON(ret))
> + return;
>
> mutex_lock(&hdmi->state_mutex);
> msm_hdmi_set_mode(hdmi, false);
> @@ -99,12 +99,12 @@ int msm_hdmi_hpd_enable(struct drm_bridge *bridge)
> hdmi_write(hdmi, REG_HDMI_HPD_CTRL,
> HDMI_HPD_CTRL_ENABLE | hpd_ctrl);
> spin_unlock_irqrestore(&hdmi->reg_lock, flags);
> -
> - return 0;
> }
>
> -void msm_hdmi_hpd_disable(struct hdmi *hdmi)
> +void msm_hdmi_hpd_disable(struct drm_bridge *bridge)
> {
> + struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
> + struct hdmi *hdmi = hdmi_bridge->hdmi;
> struct device *dev = &hdmi->pdev->dev;
>
> /* Disable HPD interrupt */
>
> --
> 2.39.2
>
next prev parent reply other threads:[~2024-06-19 22:14 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-22 10:50 [PATCH v2 00/14] drm/msm/hdmi: rework and fix the HPD even generation Dmitry Baryshkov
2024-05-22 10:50 ` [PATCH v2 01/14] drm/msm/hdmi: move the alt_iface clock to the hpd list Dmitry Baryshkov
2024-06-11 18:15 ` Jessica Zhang
2024-05-22 10:50 ` [PATCH v2 02/14] drm/msm/hdmi: simplify extp clock handling Dmitry Baryshkov
2024-06-11 18:16 ` Jessica Zhang
2024-05-22 10:50 ` [PATCH v2 03/14] drm/msm/hdmi: switch to atomic_pre_enable/post_disable Dmitry Baryshkov
2024-06-11 18:17 ` Jessica Zhang
2024-05-22 10:50 ` [PATCH v2 04/14] drm/msm/hdmi: set infoframes on all pre_enable calls Dmitry Baryshkov
2024-06-12 0:04 ` Jessica Zhang
2024-06-12 8:31 ` Dmitry Baryshkov
2024-05-22 10:50 ` [PATCH v2 05/14] drm/msm/hdmi: drop clock frequency assignment Dmitry Baryshkov
2024-06-18 23:02 ` Jessica Zhang
2024-05-22 10:50 ` [PATCH v2 06/14] drm/msm/hdmi: switch to clk_bulk API Dmitry Baryshkov
2024-06-18 23:51 ` Jessica Zhang
2024-05-22 10:50 ` [PATCH v2 07/14] drm/msm/hdmi: switch to pm_runtime_resume_and_get() Dmitry Baryshkov
2024-06-19 0:00 ` Jessica Zhang
2024-05-22 10:51 ` [PATCH v2 08/14] drm/msm/hdmi: add runtime PM calls to DDC transfer function Dmitry Baryshkov
2024-06-19 0:05 ` Jessica Zhang
2024-05-22 10:51 ` [PATCH v2 09/14] drm/msm/hdmi: implement proper runtime PM handling Dmitry Baryshkov
2024-06-19 17:36 ` Jessica Zhang
2024-05-22 10:51 ` [PATCH v2 10/14] drm/msm/hdmi: rename hpd_clks to pwr_clks Dmitry Baryshkov
2024-06-19 17:55 ` Jessica Zhang
2024-05-22 10:51 ` [PATCH v2 11/14] drm/msm/hdmi: expand the HDMI_CFG macro Dmitry Baryshkov
2024-06-19 18:11 ` Jessica Zhang
2024-05-22 10:51 ` [PATCH v2 12/14] drm/msm/hdmi: drop hpd-gpios support Dmitry Baryshkov
2024-06-19 18:47 ` Jessica Zhang
2024-05-22 10:51 ` [PATCH v2 13/14] drm/msm/hdmi: ensure that HDMI is one if HPD is requested Dmitry Baryshkov
2024-06-12 13:01 ` Markus Elfring
2024-06-12 13:22 ` Dmitry Baryshkov
2024-06-12 14:32 ` [v2 " Markus Elfring
2024-06-12 16:15 ` Dmitry Baryshkov
2024-06-19 22:13 ` [PATCH v2 " Jessica Zhang
2024-05-22 10:51 ` [PATCH v2 14/14] drm/msm/hdmi: wire in hpd_enable/hpd_disable bridge ops Dmitry Baryshkov
2024-06-19 22:14 ` Jessica Zhang [this message]
2024-06-12 12:28 ` [v2 00/14] drm/msm/hdmi: rework and fix the HPD even generation Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0d240c5d-665e-40d8-91fb-9b9aad3b172a@quicinc.com \
--to=quic_jesszhan@quicinc.com \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marijn.suijten@somainline.org \
--cc=quic_abhinavk@quicinc.com \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®