Commit cedb7dd1 authored by Maxime Ripard's avatar Maxime Ripard

drm/sun4i: hdmi: Convert encoder to atomic

The sun4i_hdmi driver still uses the non-atomic variants of the encoder
hooks, so let's convert to their atomic equivalents.
Acked-by: default avatarSui Jingfeng <sui.jingfeng@linux.dev>
Reviewed-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240222-kms-hdmi-connector-state-v7-32-8f4af575fce2@kernel.org
parent c079e2e1
...@@ -82,7 +82,8 @@ static int sun4i_hdmi_atomic_check(struct drm_encoder *encoder, ...@@ -82,7 +82,8 @@ static int sun4i_hdmi_atomic_check(struct drm_encoder *encoder,
return 0; return 0;
} }
static void sun4i_hdmi_disable(struct drm_encoder *encoder) static void sun4i_hdmi_disable(struct drm_encoder *encoder,
struct drm_atomic_state *state)
{ {
struct sun4i_hdmi *hdmi = drm_encoder_to_sun4i_hdmi(encoder); struct sun4i_hdmi *hdmi = drm_encoder_to_sun4i_hdmi(encoder);
u32 val; u32 val;
...@@ -96,7 +97,8 @@ static void sun4i_hdmi_disable(struct drm_encoder *encoder) ...@@ -96,7 +97,8 @@ static void sun4i_hdmi_disable(struct drm_encoder *encoder)
clk_disable_unprepare(hdmi->tmds_clk); clk_disable_unprepare(hdmi->tmds_clk);
} }
static void sun4i_hdmi_enable(struct drm_encoder *encoder) static void sun4i_hdmi_enable(struct drm_encoder *encoder,
struct drm_atomic_state *state)
{ {
struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
struct sun4i_hdmi *hdmi = drm_encoder_to_sun4i_hdmi(encoder); struct sun4i_hdmi *hdmi = drm_encoder_to_sun4i_hdmi(encoder);
...@@ -120,9 +122,10 @@ static void sun4i_hdmi_enable(struct drm_encoder *encoder) ...@@ -120,9 +122,10 @@ static void sun4i_hdmi_enable(struct drm_encoder *encoder)
} }
static void sun4i_hdmi_mode_set(struct drm_encoder *encoder, static void sun4i_hdmi_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_crtc_state *crtc_state,
struct drm_display_mode *adjusted_mode) 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); struct sun4i_hdmi *hdmi = drm_encoder_to_sun4i_hdmi(encoder);
unsigned int x, y; unsigned int x, y;
u32 val; u32 val;
...@@ -201,9 +204,9 @@ static enum drm_mode_status sun4i_hdmi_mode_valid(struct drm_encoder *encoder, ...@@ -201,9 +204,9 @@ static enum drm_mode_status sun4i_hdmi_mode_valid(struct drm_encoder *encoder,
static const struct drm_encoder_helper_funcs sun4i_hdmi_helper_funcs = { static const struct drm_encoder_helper_funcs sun4i_hdmi_helper_funcs = {
.atomic_check = sun4i_hdmi_atomic_check, .atomic_check = sun4i_hdmi_atomic_check,
.disable = sun4i_hdmi_disable, .atomic_disable = sun4i_hdmi_disable,
.enable = sun4i_hdmi_enable, .atomic_enable = sun4i_hdmi_enable,
.mode_set = sun4i_hdmi_mode_set, .atomic_mode_set = sun4i_hdmi_mode_set,
.mode_valid = sun4i_hdmi_mode_valid, .mode_valid = sun4i_hdmi_mode_valid,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment