[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <f34c4210-fd59-9d27-0987-3345631c9e35@quicinc.com>
Date: Thu, 20 Jun 2024 13:27:15 -0700
From: Abhinav Kumar <quic_abhinavk@...cinc.com>
To: Dmitry Baryshkov <dmitry.baryshkov@...aro.org>,
Andrzej Hajda
<andrzej.hajda@...el.com>,
Neil Armstrong <neil.armstrong@...aro.org>,
Robert
Foss <rfoss@...nel.org>,
Laurent Pinchart
<Laurent.pinchart@...asonboard.com>,
Jonas Karlman <jonas@...boo.se>,
Jernej
Skrabec <jernej.skrabec@...il.com>,
Maarten Lankhorst
<maarten.lankhorst@...ux.intel.com>,
Maxime Ripard <mripard@...nel.org>,
Thomas Zimmermann <tzimmermann@...e.de>,
David Airlie <airlied@...il.com>, Daniel Vetter <daniel@...ll.ch>,
Rob Clark <robdclark@...il.com>, Sean Paul
<sean@...rly.run>,
Marijn Suijten <marijn.suijten@...ainline.org>
CC: <dri-devel@...ts.freedesktop.org>, <linux-arm-msm@...r.kernel.org>,
<freedreno@...ts.freedesktop.org>, <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v5 5/9] drm/msm/hdmi: turn mode_set into atomic_enable
On 6/7/2024 6:23 AM, Dmitry Baryshkov wrote:
> The mode_set callback is deprecated, it doesn't get the
> drm_bridge_state, just mode-related argumetns. Turn it into the
> atomic_enable callback as suggested by the documentation.
>
mode_set is deprecated but atomic_mode_set is not.
I would rather use atomic_mode_set because moving to atomic_enable()
would be incorrect.
That would be called after encoder's enable and hence changes the
sequence. That was not the intention of this patch.
NAK.
> Acked-by: Maxime Ripard <mripard@...nel.org>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@...aro.org>
> ---
> drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 33 ++++++++++++++++++++++++++-------
> 1 file changed, 26 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
> index d839c71091dc..f259d6268c0f 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
> @@ -129,12 +129,25 @@ static void msm_hdmi_config_avi_infoframe(struct hdmi *hdmi)
> static void msm_hdmi_bridge_atomic_pre_enable(struct drm_bridge *bridge,
> struct drm_bridge_state *old_bridge_state)
> {
> + struct drm_atomic_state *state = old_bridge_state->base.state;
> struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
> struct hdmi *hdmi = hdmi_bridge->hdmi;
> struct hdmi_phy *phy = hdmi->phy;
> + struct drm_encoder *encoder = bridge->encoder;
> + struct drm_connector *connector;
> + struct drm_connector_state *conn_state;
> + struct drm_crtc_state *crtc_state;
> + const struct drm_display_mode *mode;
>
> DBG("power up");
>
> + connector = drm_atomic_get_new_connector_for_encoder(state, encoder);
> + conn_state = drm_atomic_get_new_connector_state(state, connector);
> + crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc);
> + mode = &crtc_state->adjusted_mode;
> +
> + hdmi->pixclock = mode->clock * 1000;
> +
> if (!hdmi->power_on) {
> msm_hdmi_phy_resource_enable(phy);
> msm_hdmi_power_on(bridge);
> @@ -177,18 +190,24 @@ static void msm_hdmi_bridge_atomic_post_disable(struct drm_bridge *bridge,
> }
> }
>
> -static void msm_hdmi_bridge_mode_set(struct drm_bridge *bridge,
> - const struct drm_display_mode *mode,
> - const struct drm_display_mode *adjusted_mode)
> +static void msm_hdmi_bridge_atomic_enable(struct drm_bridge *bridge,
> + struct drm_bridge_state *old_bridge_state)
> {
> + struct drm_atomic_state *state = old_bridge_state->base.state;
> struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
> struct hdmi *hdmi = hdmi_bridge->hdmi;
> + struct drm_encoder *encoder = bridge->encoder;
> + struct drm_connector *connector;
> + struct drm_connector_state *conn_state;
> + struct drm_crtc_state *crtc_state;
> + const struct drm_display_mode *mode;
> int hstart, hend, vstart, vend;
> uint32_t frame_ctrl;
>
> - mode = adjusted_mode;
> -
> - hdmi->pixclock = mode->clock * 1000;
> + connector = drm_atomic_get_new_connector_for_encoder(state, encoder);
> + conn_state = drm_atomic_get_new_connector_state(state, connector);
> + crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc);
> + mode = &crtc_state->adjusted_mode;
>
> hstart = mode->htotal - mode->hsync_start;
> hend = mode->htotal - mode->hsync_start + mode->hdisplay;
> @@ -305,8 +324,8 @@ static const struct drm_bridge_funcs msm_hdmi_bridge_funcs = {
> .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
> .atomic_reset = drm_atomic_helper_bridge_reset,
> .atomic_pre_enable = msm_hdmi_bridge_atomic_pre_enable,
> + .atomic_enable = msm_hdmi_bridge_atomic_enable,
> .atomic_post_disable = msm_hdmi_bridge_atomic_post_disable,
> - .mode_set = msm_hdmi_bridge_mode_set,
> .mode_valid = msm_hdmi_bridge_mode_valid,
> .edid_read = msm_hdmi_bridge_edid_read,
> .detect = msm_hdmi_bridge_detect,
>
Powered by blists - more mailing lists