| Message ID | 20240222-kms-hdmi-connector-state-v7-33-8f4af575fce2@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/connector: Create HDMI Connector infrastructure | expand |
Dne četrtek, 22. februar 2024 ob 19:14:19 CET je Maxime Ripard napisal(a): > We're not doing anything special in atomic_mode_set so we can simply > merge it into atomic_enable. > > Acked-by: Sui Jingfeng <sui.jingfeng@linux.dev> > Signed-off-by: Maxime Ripard <mripard@kernel.org> Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com> Best regards, Jernej > --- > drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 38 +++++++++++++--------------------- > 1 file changed, 14 insertions(+), 24 deletions(-) > > diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c > index 799a26215cc2..bae69d696765 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c > +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c > @@ -103,33 +103,11 @@ static void sun4i_hdmi_enable(struct drm_encoder *encoder, > struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > struct sun4i_hdmi *hdmi = drm_encoder_to_sun4i_hdmi(encoder); > struct drm_display_info *display = &hdmi->connector.display_info; > + unsigned int x, y; > u32 val = 0; > > DRM_DEBUG_DRIVER("Enabling the HDMI Output\n"); > > - clk_prepare_enable(hdmi->tmds_clk); > - > - sun4i_hdmi_setup_avi_infoframes(hdmi, mode); > - val |= SUN4I_HDMI_PKT_CTRL_TYPE(0, SUN4I_HDMI_PKT_AVI); > - val |= SUN4I_HDMI_PKT_CTRL_TYPE(1, SUN4I_HDMI_PKT_END); > - writel(val, hdmi->base + SUN4I_HDMI_PKT_CTRL_REG(0)); > - > - val = SUN4I_HDMI_VID_CTRL_ENABLE; > - if (display->is_hdmi) > - val |= SUN4I_HDMI_VID_CTRL_HDMI_MODE; > - > - writel(val, hdmi->base + SUN4I_HDMI_VID_CTRL_REG); > -} > - > -static void sun4i_hdmi_mode_set(struct drm_encoder *encoder, > - struct drm_crtc_state *crtc_state, > - struct drm_connector_state *conn_state) > -{ > - const struct drm_display_mode *mode = &crtc_state->mode; > - struct sun4i_hdmi *hdmi = drm_encoder_to_sun4i_hdmi(encoder); > - unsigned int x, y; > - u32 val; > - > clk_set_rate(hdmi->mod_clk, mode->crtc_clock * 1000); > clk_set_rate(hdmi->tmds_clk, mode->crtc_clock * 1000); > > @@ -181,6 +159,19 @@ static void sun4i_hdmi_mode_set(struct drm_encoder *encoder, > val |= SUN4I_HDMI_VID_TIMING_POL_VSYNC; > > writel(val, hdmi->base + SUN4I_HDMI_VID_TIMING_POL_REG); > + > + clk_prepare_enable(hdmi->tmds_clk); > + > + sun4i_hdmi_setup_avi_infoframes(hdmi, mode); > + val |= SUN4I_HDMI_PKT_CTRL_TYPE(0, SUN4I_HDMI_PKT_AVI); > + val |= SUN4I_HDMI_PKT_CTRL_TYPE(1, SUN4I_HDMI_PKT_END); > + writel(val, hdmi->base + SUN4I_HDMI_PKT_CTRL_REG(0)); > + > + val = SUN4I_HDMI_VID_CTRL_ENABLE; > + if (display->is_hdmi) > + val |= SUN4I_HDMI_VID_CTRL_HDMI_MODE; > + > + writel(val, hdmi->base + SUN4I_HDMI_VID_CTRL_REG); > } > > static enum drm_mode_status sun4i_hdmi_mode_valid(struct drm_encoder *encoder, > @@ -206,7 +197,6 @@ static const struct drm_encoder_helper_funcs sun4i_hdmi_helper_funcs = { > .atomic_check = sun4i_hdmi_atomic_check, > .atomic_disable = sun4i_hdmi_disable, > .atomic_enable = sun4i_hdmi_enable, > - .atomic_mode_set = sun4i_hdmi_mode_set, > .mode_valid = sun4i_hdmi_mode_valid, > }; > > >
On Thu, 22 Feb 2024 19:14:19 +0100, Maxime Ripard wrote: > We're not doing anything special in atomic_mode_set so we can simply > merge it into atomic_enable. > > Applied to drm/drm-misc (drm-misc-next). Thanks! Maxime
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c index 799a26215cc2..bae69d696765 100644 --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c @@ -103,33 +103,11 @@ static void sun4i_hdmi_enable(struct drm_encoder *encoder, struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; struct sun4i_hdmi *hdmi = drm_encoder_to_sun4i_hdmi(encoder); struct drm_display_info *display = &hdmi->connector.display_info; + unsigned int x, y; u32 val = 0; DRM_DEBUG_DRIVER("Enabling the HDMI Output\n"); - clk_prepare_enable(hdmi->tmds_clk); - - sun4i_hdmi_setup_avi_infoframes(hdmi, mode); - val |= SUN4I_HDMI_PKT_CTRL_TYPE(0, SUN4I_HDMI_PKT_AVI); - val |= SUN4I_HDMI_PKT_CTRL_TYPE(1, SUN4I_HDMI_PKT_END); - writel(val, hdmi->base + SUN4I_HDMI_PKT_CTRL_REG(0)); - - val = SUN4I_HDMI_VID_CTRL_ENABLE; - if (display->is_hdmi) - val |= SUN4I_HDMI_VID_CTRL_HDMI_MODE; - - writel(val, hdmi->base + SUN4I_HDMI_VID_CTRL_REG); -} - -static void sun4i_hdmi_mode_set(struct drm_encoder *encoder, - struct drm_crtc_state *crtc_state, - struct drm_connector_state *conn_state) -{ - const struct drm_display_mode *mode = &crtc_state->mode; - struct sun4i_hdmi *hdmi = drm_encoder_to_sun4i_hdmi(encoder); - unsigned int x, y; - u32 val; - clk_set_rate(hdmi->mod_clk, mode->crtc_clock * 1000); clk_set_rate(hdmi->tmds_clk, mode->crtc_clock * 1000); @@ -181,6 +159,19 @@ static void sun4i_hdmi_mode_set(struct drm_encoder *encoder, val |= SUN4I_HDMI_VID_TIMING_POL_VSYNC; writel(val, hdmi->base + SUN4I_HDMI_VID_TIMING_POL_REG); + + clk_prepare_enable(hdmi->tmds_clk); + + sun4i_hdmi_setup_avi_infoframes(hdmi, mode); + val |= SUN4I_HDMI_PKT_CTRL_TYPE(0, SUN4I_HDMI_PKT_AVI); + val |= SUN4I_HDMI_PKT_CTRL_TYPE(1, SUN4I_HDMI_PKT_END); + writel(val, hdmi->base + SUN4I_HDMI_PKT_CTRL_REG(0)); + + val = SUN4I_HDMI_VID_CTRL_ENABLE; + if (display->is_hdmi) + val |= SUN4I_HDMI_VID_CTRL_HDMI_MODE; + + writel(val, hdmi->base + SUN4I_HDMI_VID_CTRL_REG); } static enum drm_mode_status sun4i_hdmi_mode_valid(struct drm_encoder *encoder, @@ -206,7 +197,6 @@ static const struct drm_encoder_helper_funcs sun4i_hdmi_helper_funcs = { .atomic_check = sun4i_hdmi_atomic_check, .atomic_disable = sun4i_hdmi_disable, .atomic_enable = sun4i_hdmi_enable, - .atomic_mode_set = sun4i_hdmi_mode_set, .mode_valid = sun4i_hdmi_mode_valid, };