tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/rockchip: inno_hdmi: Switch encoder hooks to atomic

Browse Source 
The inno_hdmi encoder still uses the !atomic variants of enable, disable
and modeset. Convert to their atomic equivalents.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
Tested-by: Alex Bee <knaerzche@gmail.com>
Signed-off-by: Alex Bee <knaerzche@gmail.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20231222174220.55249-7-knaerzche@gmail.com
This commit is contained in:
Maxime Ripard
2023-12-22 18:41:57 +01:00
committed by Heiko Stuebner
parent 8f0df2012b
commit ff4d4fa76f
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/rockchip/inno_hdmi.c
+11 -8
View File
@@ -490,22 +490,25 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi,
} }
static void inno_hdmi_encoder_mode_set(struct drm_encoder *encoder, static void inno_hdmi_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_crtc_state *crtc_state,
struct drm_display_mode *adj_mode) struct drm_connector_state *conn_state)
{ {
struct drm_display_mode *adj_mode = &crtc_state->adjusted_mode;
struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder); struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder);
inno_hdmi_setup(hdmi, adj_mode); inno_hdmi_setup(hdmi, adj_mode);
} }
static void inno_hdmi_encoder_enable(struct drm_encoder *encoder) static void inno_hdmi_encoder_enable(struct drm_encoder *encoder,
struct drm_atomic_state *state)
{ {
struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder); struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder);
inno_hdmi_set_pwr_mode(hdmi, NORMAL); inno_hdmi_set_pwr_mode(hdmi, NORMAL);
} }
static void inno_hdmi_encoder_disable(struct drm_encoder *encoder) static void inno_hdmi_encoder_disable(struct drm_encoder *encoder,
struct drm_atomic_state *state)
{ {
struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder); struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder);
@@ -526,10 +529,10 @@ inno_hdmi_encoder_atomic_check(struct drm_encoder *encoder,
} }
static struct drm_encoder_helper_funcs inno_hdmi_encoder_helper_funcs = { static struct drm_encoder_helper_funcs inno_hdmi_encoder_helper_funcs = {
.enable = inno_hdmi_encoder_enable, .atomic_check = inno_hdmi_encoder_atomic_check,
.disable = inno_hdmi_encoder_disable, .atomic_enable = inno_hdmi_encoder_enable,
.mode_set = inno_hdmi_encoder_mode_set, .atomic_disable = inno_hdmi_encoder_disable,
.atomic_check = inno_hdmi_encoder_atomic_check, .atomic_mode_set = inno_hdmi_encoder_mode_set,
}; };
static enum drm_connector_status static enum drm_connector_status