p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Giulio Benetti <giulio.benetti@micronovasrl.com>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1520941017-81177-1-git-send-email-giulio.benetti@micronovasrl.com
This commit is contained in:
Giulio Benetti 2018-03-13 12:36:57 +01:00 committed by Maxime Ripard
parent fd1eabd880
commit cde8b75482
No known key found for this signature in database
GPG Key ID: D2B4C094214DAF74
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/sun4i/sun4i_rgb.c
View File

@ -52,10 +52,10 @@ static int sun4i_rgb_get_modes(struct drm_connector *connector)
return drm_panel_get_modes(tcon->panel); return drm_panel_get_modes(tcon->panel);
} }
static int sun4i_rgb_mode_valid(struct drm_connector *connector, static enum drm_mode_status sun4i_rgb_mode_valid(struct drm_encoder *crtc,
struct drm_display_mode *mode) 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; struct sun4i_tcon *tcon = rgb->tcon;
u32 hsync = mode->hsync_end - mode->hsync_start; u32 hsync = mode->hsync_end - mode->hsync_start;
u32 vsync = mode->vsync_end - mode->vsync_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 = { static struct drm_connector_helper_funcs sun4i_rgb_con_helper_funcs = {
.get_modes = sun4i_rgb_get_modes, .get_modes = sun4i_rgb_get_modes,
.mode_valid = sun4i_rgb_mode_valid,
}; };
static void 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 = { static struct drm_encoder_helper_funcs sun4i_rgb_enc_helper_funcs = {
.disable = sun4i_rgb_encoder_disable, .disable = sun4i_rgb_encoder_disable,
.enable = sun4i_rgb_encoder_enable, .enable = sun4i_rgb_encoder_enable,
.mode_valid = sun4i_rgb_mode_valid,
}; };
static void sun4i_rgb_enc_destroy(struct drm_encoder *encoder) static void sun4i_rgb_enc_destroy(struct drm_encoder *encoder)