Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit cde8b754 authored by Giulio Benetti's avatar Giulio Benetti Committed by Maxime Ripard
Browse files

drm/sun4i: move rgb mode_valid from connector to encoder 



mode_valid function must be connected to encoder.
Otherwise it could get not be called by drm in the case there's a
bridge connected to encoder instead of a panel.

Move mode_valid function pointer to encoder helper functions,
changing its prototype according to encoder helper function pointer.

Signed-off-by: default avatarGiulio Benetti <giulio.benetti@micronovasrl.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1520941017-81177-1-git-send-email-giulio.benetti@micronovasrl.com
parent fd1eabd8

drivers/gpu/drm/sun4i/sun4i_rgb.c

+4 −4
Original line number Diff line number Diff line
@@ -52,10 +52,10 @@ static int sun4i_rgb_get_modes(struct drm_connector *connector) 
	return drm_panel_get_modes(tcon->panel);

}



static int sun4i_rgb_mode_valid(struct drm_connector *connector,

				struct drm_display_mode *mode)

static enum drm_mode_status sun4i_rgb_mode_valid(struct drm_encoder *crtc,

						 const struct drm_display_mode *mode)

{

	struct sun4i_rgb *rgb = drm_connector_to_sun4i_rgb(connector);

	struct sun4i_rgb *rgb = drm_encoder_to_sun4i_rgb(crtc);

	struct sun4i_tcon *tcon = rgb->tcon;

	u32 hsync = mode->hsync_end - mode->hsync_start;

	u32 vsync = mode->vsync_end - mode->vsync_start;
@@ -106,7 +106,6 @@ static int sun4i_rgb_mode_valid(struct drm_connector *connector, 


static struct drm_connector_helper_funcs sun4i_rgb_con_helper_funcs = {

	.get_modes	= sun4i_rgb_get_modes,

	.mode_valid	= sun4i_rgb_mode_valid,

};



static void
@@ -156,6 +155,7 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder) 
static struct drm_encoder_helper_funcs sun4i_rgb_enc_helper_funcs = {

	.disable	= sun4i_rgb_encoder_disable,

	.enable		= sun4i_rgb_encoder_enable,

	.mode_valid	= sun4i_rgb_mode_valid,

};



static void sun4i_rgb_enc_destroy(struct drm_encoder *encoder)