Commit b06b31d5 authored by Daniel Vetter's avatar Daniel Vetter

Merge branch 'topic/mode_fixup-optional' into topic/drm-misc

Pull in pile of patches from Carlos to remove now redundant mode_fixup
hooks for encoders.
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 49f718c5 cc92da51
...@@ -3624,16 +3624,8 @@ dce_v10_0_ext_dpms(struct drm_encoder *encoder, int mode) ...@@ -3624,16 +3624,8 @@ dce_v10_0_ext_dpms(struct drm_encoder *encoder, int mode)
} }
static bool dce_v10_0_ext_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static const struct drm_encoder_helper_funcs dce_v10_0_ext_helper_funcs = { static const struct drm_encoder_helper_funcs dce_v10_0_ext_helper_funcs = {
.dpms = dce_v10_0_ext_dpms, .dpms = dce_v10_0_ext_dpms,
.mode_fixup = dce_v10_0_ext_mode_fixup,
.prepare = dce_v10_0_ext_prepare, .prepare = dce_v10_0_ext_prepare,
.mode_set = dce_v10_0_ext_mode_set, .mode_set = dce_v10_0_ext_mode_set,
.commit = dce_v10_0_ext_commit, .commit = dce_v10_0_ext_commit,
......
...@@ -3619,16 +3619,8 @@ dce_v11_0_ext_dpms(struct drm_encoder *encoder, int mode) ...@@ -3619,16 +3619,8 @@ dce_v11_0_ext_dpms(struct drm_encoder *encoder, int mode)
} }
static bool dce_v11_0_ext_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static const struct drm_encoder_helper_funcs dce_v11_0_ext_helper_funcs = { static const struct drm_encoder_helper_funcs dce_v11_0_ext_helper_funcs = {
.dpms = dce_v11_0_ext_dpms, .dpms = dce_v11_0_ext_dpms,
.mode_fixup = dce_v11_0_ext_mode_fixup,
.prepare = dce_v11_0_ext_prepare, .prepare = dce_v11_0_ext_prepare,
.mode_set = dce_v11_0_ext_mode_set, .mode_set = dce_v11_0_ext_mode_set,
.commit = dce_v11_0_ext_commit, .commit = dce_v11_0_ext_commit,
......
...@@ -3554,16 +3554,8 @@ dce_v8_0_ext_dpms(struct drm_encoder *encoder, int mode) ...@@ -3554,16 +3554,8 @@ dce_v8_0_ext_dpms(struct drm_encoder *encoder, int mode)
} }
static bool dce_v8_0_ext_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static const struct drm_encoder_helper_funcs dce_v8_0_ext_helper_funcs = { static const struct drm_encoder_helper_funcs dce_v8_0_ext_helper_funcs = {
.dpms = dce_v8_0_ext_dpms, .dpms = dce_v8_0_ext_dpms,
.mode_fixup = dce_v8_0_ext_mode_fixup,
.prepare = dce_v8_0_ext_prepare, .prepare = dce_v8_0_ext_prepare,
.mode_set = dce_v8_0_ext_mode_set, .mode_set = dce_v8_0_ext_mode_set,
.commit = dce_v8_0_ext_commit, .commit = dce_v8_0_ext_commit,
......
...@@ -710,13 +710,6 @@ static void ast_encoder_dpms(struct drm_encoder *encoder, int mode) ...@@ -710,13 +710,6 @@ static void ast_encoder_dpms(struct drm_encoder *encoder, int mode)
} }
static bool ast_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void ast_encoder_mode_set(struct drm_encoder *encoder, static void ast_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -736,7 +729,6 @@ static void ast_encoder_commit(struct drm_encoder *encoder) ...@@ -736,7 +729,6 @@ static void ast_encoder_commit(struct drm_encoder *encoder)
static const struct drm_encoder_helper_funcs ast_enc_helper_funcs = { static const struct drm_encoder_helper_funcs ast_enc_helper_funcs = {
.dpms = ast_encoder_dpms, .dpms = ast_encoder_dpms,
.mode_fixup = ast_mode_fixup,
.prepare = ast_encoder_prepare, .prepare = ast_encoder_prepare,
.commit = ast_encoder_commit, .commit = ast_encoder_commit,
.mode_set = ast_encoder_mode_set, .mode_set = ast_encoder_mode_set,
......
...@@ -152,13 +152,6 @@ static void bochs_crtc_init(struct drm_device *dev) ...@@ -152,13 +152,6 @@ static void bochs_crtc_init(struct drm_device *dev)
drm_crtc_helper_add(crtc, &bochs_helper_funcs); drm_crtc_helper_add(crtc, &bochs_helper_funcs);
} }
static bool bochs_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void bochs_encoder_mode_set(struct drm_encoder *encoder, static void bochs_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -179,7 +172,6 @@ static void bochs_encoder_commit(struct drm_encoder *encoder) ...@@ -179,7 +172,6 @@ static void bochs_encoder_commit(struct drm_encoder *encoder)
static const struct drm_encoder_helper_funcs bochs_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs bochs_encoder_helper_funcs = {
.dpms = bochs_encoder_dpms, .dpms = bochs_encoder_dpms,
.mode_fixup = bochs_encoder_mode_fixup,
.mode_set = bochs_encoder_mode_set, .mode_set = bochs_encoder_mode_set,
.prepare = bochs_encoder_prepare, .prepare = bochs_encoder_prepare,
.commit = bochs_encoder_commit, .commit = bochs_encoder_commit,
......
...@@ -430,14 +430,6 @@ void cirrus_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, ...@@ -430,14 +430,6 @@ void cirrus_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
*blue = cirrus_crtc->lut_b[regno]; *blue = cirrus_crtc->lut_b[regno];
} }
static bool cirrus_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void cirrus_encoder_mode_set(struct drm_encoder *encoder, static void cirrus_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -466,7 +458,6 @@ static void cirrus_encoder_destroy(struct drm_encoder *encoder) ...@@ -466,7 +458,6 @@ static void cirrus_encoder_destroy(struct drm_encoder *encoder)
static const struct drm_encoder_helper_funcs cirrus_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs cirrus_encoder_helper_funcs = {
.dpms = cirrus_encoder_dpms, .dpms = cirrus_encoder_dpms,
.mode_fixup = cirrus_encoder_mode_fixup,
.mode_set = cirrus_encoder_mode_set, .mode_set = cirrus_encoder_mode_set,
.prepare = cirrus_encoder_prepare, .prepare = cirrus_encoder_prepare,
.commit = cirrus_encoder_commit, .commit = cirrus_encoder_commit,
......
...@@ -1155,13 +1155,6 @@ static int exynos_dp_create_connector(struct drm_encoder *encoder) ...@@ -1155,13 +1155,6 @@ static int exynos_dp_create_connector(struct drm_encoder *encoder)
return 0; return 0;
} }
static bool exynos_dp_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void exynos_dp_mode_set(struct drm_encoder *encoder, static void exynos_dp_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -1177,7 +1170,6 @@ static void exynos_dp_disable(struct drm_encoder *encoder) ...@@ -1177,7 +1170,6 @@ static void exynos_dp_disable(struct drm_encoder *encoder)
} }
static const struct drm_encoder_helper_funcs exynos_dp_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs exynos_dp_encoder_helper_funcs = {
.mode_fixup = exynos_dp_mode_fixup,
.mode_set = exynos_dp_mode_set, .mode_set = exynos_dp_mode_set,
.enable = exynos_dp_enable, .enable = exynos_dp_enable,
.disable = exynos_dp_disable, .disable = exynos_dp_disable,
......
...@@ -128,13 +128,6 @@ static int exynos_dpi_create_connector(struct drm_encoder *encoder) ...@@ -128,13 +128,6 @@ static int exynos_dpi_create_connector(struct drm_encoder *encoder)
return 0; return 0;
} }
static bool exynos_dpi_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void exynos_dpi_mode_set(struct drm_encoder *encoder, static void exynos_dpi_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -162,7 +155,6 @@ static void exynos_dpi_disable(struct drm_encoder *encoder) ...@@ -162,7 +155,6 @@ static void exynos_dpi_disable(struct drm_encoder *encoder)
} }
static const struct drm_encoder_helper_funcs exynos_dpi_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs exynos_dpi_encoder_helper_funcs = {
.mode_fixup = exynos_dpi_mode_fixup,
.mode_set = exynos_dpi_mode_set, .mode_set = exynos_dpi_mode_set,
.enable = exynos_dpi_enable, .enable = exynos_dpi_enable,
.disable = exynos_dpi_disable, .disable = exynos_dpi_disable,
......
...@@ -1597,13 +1597,6 @@ static int exynos_dsi_create_connector(struct drm_encoder *encoder) ...@@ -1597,13 +1597,6 @@ static int exynos_dsi_create_connector(struct drm_encoder *encoder)
return 0; return 0;
} }
static bool exynos_dsi_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void exynos_dsi_mode_set(struct drm_encoder *encoder, static void exynos_dsi_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -1623,7 +1616,6 @@ static void exynos_dsi_mode_set(struct drm_encoder *encoder, ...@@ -1623,7 +1616,6 @@ static void exynos_dsi_mode_set(struct drm_encoder *encoder,
} }
static const struct drm_encoder_helper_funcs exynos_dsi_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs exynos_dsi_encoder_helper_funcs = {
.mode_fixup = exynos_dsi_mode_fixup,
.mode_set = exynos_dsi_mode_set, .mode_set = exynos_dsi_mode_set,
.enable = exynos_dsi_enable, .enable = exynos_dsi_enable,
.disable = exynos_dsi_disable, .disable = exynos_dsi_disable,
......
...@@ -410,13 +410,6 @@ static int vidi_create_connector(struct drm_encoder *encoder) ...@@ -410,13 +410,6 @@ static int vidi_create_connector(struct drm_encoder *encoder)
return 0; return 0;
} }
static bool exynos_vidi_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void exynos_vidi_mode_set(struct drm_encoder *encoder, static void exynos_vidi_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -432,7 +425,6 @@ static void exynos_vidi_disable(struct drm_encoder *encoder) ...@@ -432,7 +425,6 @@ static void exynos_vidi_disable(struct drm_encoder *encoder)
} }
static const struct drm_encoder_helper_funcs exynos_vidi_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs exynos_vidi_encoder_helper_funcs = {
.mode_fixup = exynos_vidi_mode_fixup,
.mode_set = exynos_vidi_mode_set, .mode_set = exynos_vidi_mode_set,
.enable = exynos_vidi_enable, .enable = exynos_vidi_enable,
.disable = exynos_vidi_disable, .disable = exynos_vidi_disable,
......
...@@ -217,7 +217,6 @@ static int cdv_intel_crt_set_property(struct drm_connector *connector, ...@@ -217,7 +217,6 @@ static int cdv_intel_crt_set_property(struct drm_connector *connector,
static const struct drm_encoder_helper_funcs cdv_intel_crt_helper_funcs = { static const struct drm_encoder_helper_funcs cdv_intel_crt_helper_funcs = {
.dpms = cdv_intel_crt_dpms, .dpms = cdv_intel_crt_dpms,
.mode_fixup = gma_encoder_mode_fixup,
.prepare = gma_encoder_prepare, .prepare = gma_encoder_prepare,
.commit = gma_encoder_commit, .commit = gma_encoder_commit,
.mode_set = cdv_intel_crt_mode_set, .mode_set = cdv_intel_crt_mode_set,
......
...@@ -255,7 +255,6 @@ static void cdv_hdmi_destroy(struct drm_connector *connector) ...@@ -255,7 +255,6 @@ static void cdv_hdmi_destroy(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs cdv_hdmi_helper_funcs = { static const struct drm_encoder_helper_funcs cdv_hdmi_helper_funcs = {
.dpms = cdv_hdmi_dpms, .dpms = cdv_hdmi_dpms,
.mode_fixup = gma_encoder_mode_fixup,
.prepare = gma_encoder_prepare, .prepare = gma_encoder_prepare,
.mode_set = cdv_hdmi_mode_set, .mode_set = cdv_hdmi_mode_set,
.commit = gma_encoder_commit, .commit = gma_encoder_commit,
......
...@@ -478,13 +478,6 @@ int gma_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) ...@@ -478,13 +478,6 @@ int gma_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
return 0; return 0;
} }
bool gma_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
bool gma_crtc_mode_fixup(struct drm_crtc *crtc, bool gma_crtc_mode_fixup(struct drm_crtc *crtc,
const struct drm_display_mode *mode, const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
......
...@@ -90,9 +90,6 @@ extern void gma_crtc_restore(struct drm_crtc *crtc); ...@@ -90,9 +90,6 @@ extern void gma_crtc_restore(struct drm_crtc *crtc);
extern void gma_encoder_prepare(struct drm_encoder *encoder); extern void gma_encoder_prepare(struct drm_encoder *encoder);
extern void gma_encoder_commit(struct drm_encoder *encoder); extern void gma_encoder_commit(struct drm_encoder *encoder);
extern void gma_encoder_destroy(struct drm_encoder *encoder); extern void gma_encoder_destroy(struct drm_encoder *encoder);
extern bool gma_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode);
/* Common clock related functions */ /* Common clock related functions */
extern const struct gma_limit_t *gma_limit(struct drm_crtc *crtc, int refclk); extern const struct gma_limit_t *gma_limit(struct drm_crtc *crtc, int refclk);
......
...@@ -601,7 +601,6 @@ static void oaktrail_hdmi_destroy(struct drm_connector *connector) ...@@ -601,7 +601,6 @@ static void oaktrail_hdmi_destroy(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs oaktrail_hdmi_helper_funcs = { static const struct drm_encoder_helper_funcs oaktrail_hdmi_helper_funcs = {
.dpms = oaktrail_hdmi_dpms, .dpms = oaktrail_hdmi_dpms,
.mode_fixup = gma_encoder_mode_fixup,
.prepare = gma_encoder_prepare, .prepare = gma_encoder_prepare,
.mode_set = oaktrail_hdmi_mode_set, .mode_set = oaktrail_hdmi_mode_set,
.commit = gma_encoder_commit, .commit = gma_encoder_commit,
......
...@@ -109,13 +109,6 @@ static void dw_hdmi_imx_encoder_disable(struct drm_encoder *encoder) ...@@ -109,13 +109,6 @@ static void dw_hdmi_imx_encoder_disable(struct drm_encoder *encoder)
{ {
} }
static bool dw_hdmi_imx_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adj_mode)
{
return true;
}
static void dw_hdmi_imx_encoder_mode_set(struct drm_encoder *encoder, static void dw_hdmi_imx_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adj_mode) struct drm_display_mode *adj_mode)
...@@ -138,7 +131,6 @@ static void dw_hdmi_imx_encoder_prepare(struct drm_encoder *encoder) ...@@ -138,7 +131,6 @@ static void dw_hdmi_imx_encoder_prepare(struct drm_encoder *encoder)
} }
static const struct drm_encoder_helper_funcs dw_hdmi_imx_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs dw_hdmi_imx_encoder_helper_funcs = {
.mode_fixup = dw_hdmi_imx_encoder_mode_fixup,
.mode_set = dw_hdmi_imx_encoder_mode_set, .mode_set = dw_hdmi_imx_encoder_mode_set,
.prepare = dw_hdmi_imx_encoder_prepare, .prepare = dw_hdmi_imx_encoder_prepare,
.commit = dw_hdmi_imx_encoder_commit, .commit = dw_hdmi_imx_encoder_commit,
......
...@@ -139,13 +139,6 @@ static void imx_ldb_encoder_dpms(struct drm_encoder *encoder, int mode) ...@@ -139,13 +139,6 @@ static void imx_ldb_encoder_dpms(struct drm_encoder *encoder, int mode)
{ {
} }
static bool imx_ldb_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void imx_ldb_set_clock(struct imx_ldb *ldb, int mux, int chno, static void imx_ldb_set_clock(struct imx_ldb *ldb, int mux, int chno,
unsigned long serial_clk, unsigned long di_clk) unsigned long serial_clk, unsigned long di_clk)
{ {
...@@ -376,7 +369,6 @@ static const struct drm_encoder_funcs imx_ldb_encoder_funcs = { ...@@ -376,7 +369,6 @@ static const struct drm_encoder_funcs imx_ldb_encoder_funcs = {
static const struct drm_encoder_helper_funcs imx_ldb_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs imx_ldb_encoder_helper_funcs = {
.dpms = imx_ldb_encoder_dpms, .dpms = imx_ldb_encoder_dpms,
.mode_fixup = imx_ldb_encoder_mode_fixup,
.prepare = imx_ldb_encoder_prepare, .prepare = imx_ldb_encoder_prepare,
.commit = imx_ldb_encoder_commit, .commit = imx_ldb_encoder_commit,
.mode_set = imx_ldb_encoder_mode_set, .mode_set = imx_ldb_encoder_mode_set,
......
...@@ -286,13 +286,6 @@ static void imx_tve_encoder_dpms(struct drm_encoder *encoder, int mode) ...@@ -286,13 +286,6 @@ static void imx_tve_encoder_dpms(struct drm_encoder *encoder, int mode)
dev_err(tve->dev, "failed to disable TVOUT: %d\n", ret); dev_err(tve->dev, "failed to disable TVOUT: %d\n", ret);
} }
static bool imx_tve_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void imx_tve_encoder_prepare(struct drm_encoder *encoder) static void imx_tve_encoder_prepare(struct drm_encoder *encoder)
{ {
struct imx_tve *tve = enc_to_tve(encoder); struct imx_tve *tve = enc_to_tve(encoder);
...@@ -379,7 +372,6 @@ static const struct drm_encoder_funcs imx_tve_encoder_funcs = { ...@@ -379,7 +372,6 @@ static const struct drm_encoder_funcs imx_tve_encoder_funcs = {
static const struct drm_encoder_helper_funcs imx_tve_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs imx_tve_encoder_helper_funcs = {
.dpms = imx_tve_encoder_dpms, .dpms = imx_tve_encoder_dpms,
.mode_fixup = imx_tve_encoder_mode_fixup,
.prepare = imx_tve_encoder_prepare, .prepare = imx_tve_encoder_prepare,
.mode_set = imx_tve_encoder_mode_set, .mode_set = imx_tve_encoder_mode_set,
.commit = imx_tve_encoder_commit, .commit = imx_tve_encoder_commit,
......
...@@ -112,13 +112,6 @@ static void imx_pd_encoder_dpms(struct drm_encoder *encoder, int mode) ...@@ -112,13 +112,6 @@ static void imx_pd_encoder_dpms(struct drm_encoder *encoder, int mode)
drm_panel_enable(imxpd->panel); drm_panel_enable(imxpd->panel);
} }
static bool imx_pd_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void imx_pd_encoder_prepare(struct drm_encoder *encoder) static void imx_pd_encoder_prepare(struct drm_encoder *encoder)
{ {
struct imx_parallel_display *imxpd = enc_to_imxpd(encoder); struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
...@@ -166,7 +159,6 @@ static const struct drm_encoder_funcs imx_pd_encoder_funcs = { ...@@ -166,7 +159,6 @@ static const struct drm_encoder_funcs imx_pd_encoder_funcs = {
static const struct drm_encoder_helper_funcs imx_pd_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs imx_pd_encoder_helper_funcs = {
.dpms = imx_pd_encoder_dpms, .dpms = imx_pd_encoder_dpms,
.mode_fixup = imx_pd_encoder_mode_fixup,
.prepare = imx_pd_encoder_prepare, .prepare = imx_pd_encoder_prepare,
.commit = imx_pd_encoder_commit, .commit = imx_pd_encoder_commit,
.mode_set = imx_pd_encoder_mode_set, .mode_set = imx_pd_encoder_mode_set,
......
...@@ -1479,13 +1479,6 @@ void mga_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, ...@@ -1479,13 +1479,6 @@ void mga_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
* These functions are analagous to those in the CRTC code, but are intended * These functions are analagous to those in the CRTC code, but are intended
* to handle any encoder-specific limitations * to handle any encoder-specific limitations
*/ */
static bool mga_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void mga_encoder_mode_set(struct drm_encoder *encoder, static void mga_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -1515,7 +1508,6 @@ static void mga_encoder_destroy(struct drm_encoder *encoder) ...@@ -1515,7 +1508,6 @@ static void mga_encoder_destroy(struct drm_encoder *encoder)
static const struct drm_encoder_helper_funcs mga_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs mga_encoder_helper_funcs = {
.dpms = mga_encoder_dpms, .dpms = mga_encoder_dpms,
.mode_fixup = mga_encoder_mode_fixup,
.mode_set = mga_encoder_mode_set, .mode_set = mga_encoder_mode_set,
.prepare = mga_encoder_prepare, .prepare = mga_encoder_prepare,
.commit = mga_encoder_commit, .commit = mga_encoder_commit,
......
...@@ -47,13 +47,6 @@ static const struct drm_encoder_funcs mdp4_dsi_encoder_funcs = { ...@@ -47,13 +47,6 @@ static const struct drm_encoder_funcs mdp4_dsi_encoder_funcs = {
.destroy = mdp4_dsi_encoder_destroy, .destroy = mdp4_dsi_encoder_destroy,
}; };
static bool mdp4_dsi_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void mdp4_dsi_encoder_mode_set(struct drm_encoder *encoder, static void mdp4_dsi_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -163,7 +156,6 @@ static void mdp4_dsi_encoder_enable(struct drm_encoder *encoder) ...@@ -163,7 +156,6 @@ static void mdp4_dsi_encoder_enable(struct drm_encoder *encoder)
} }
static const struct drm_encoder_helper_funcs mdp4_dsi_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs mdp4_dsi_encoder_helper_funcs = {
.mode_fixup = mdp4_dsi_encoder_mode_fixup,
.mode_set = mdp4_dsi_encoder_mode_set, .mode_set = mdp4_dsi_encoder_mode_set,
.disable = mdp4_dsi_encoder_disable, .disable = mdp4_dsi_encoder_disable,
.enable = mdp4_dsi_encoder_enable, .enable = mdp4_dsi_encoder_enable,
......
...@@ -94,13 +94,6 @@ static const struct drm_encoder_funcs mdp4_dtv_encoder_funcs = { ...@@ -94,13 +94,6 @@ static const struct drm_encoder_funcs mdp4_dtv_encoder_funcs = {
.destroy = mdp4_dtv_encoder_destroy, .destroy = mdp4_dtv_encoder_destroy,
}; };
static bool mdp4_dtv_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void mdp4_dtv_encoder_mode_set(struct drm_encoder *encoder, static void mdp4_dtv_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -234,7 +227,6 @@ static void mdp4_dtv_encoder_enable(struct drm_encoder *encoder) ...@@ -234,7 +227,6 @@ static void mdp4_dtv_encoder_enable(struct drm_encoder *encoder)
} }
static const struct drm_encoder_helper_funcs mdp4_dtv_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs mdp4_dtv_encoder_helper_funcs = {
.mode_fixup = mdp4_dtv_encoder_mode_fixup,
.mode_set = mdp4_dtv_encoder_mode_set, .mode_set = mdp4_dtv_encoder_mode_set,
.enable = mdp4_dtv_encoder_enable, .enable = mdp4_dtv_encoder_enable,
.disable = mdp4_dtv_encoder_disable, .disable = mdp4_dtv_encoder_disable,
......
...@@ -260,13 +260,6 @@ static void setup_phy(struct drm_encoder *encoder) ...@@ -260,13 +260,6 @@ static void setup_phy(struct drm_encoder *encoder)
mdp4_write(mdp4_kms, REG_MDP4_LVDS_PHY_CFG0, lvds_phy_cfg0); mdp4_write(mdp4_kms, REG_MDP4_LVDS_PHY_CFG0, lvds_phy_cfg0);
} }
static bool mdp4_lcdc_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void mdp4_lcdc_encoder_mode_set(struct drm_encoder *encoder, static void mdp4_lcdc_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -430,7 +423,6 @@ static void mdp4_lcdc_encoder_enable(struct drm_encoder *encoder) ...@@ -430,7 +423,6 @@ static void mdp4_lcdc_encoder_enable(struct drm_encoder *encoder)
} }
static const struct drm_encoder_helper_funcs mdp4_lcdc_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs mdp4_lcdc_encoder_helper_funcs = {
.mode_fixup = mdp4_lcdc_encoder_mode_fixup,
.mode_set = mdp4_lcdc_encoder_mode_set, .mode_set = mdp4_lcdc_encoder_mode_set,
.disable = mdp4_lcdc_encoder_disable, .disable = mdp4_lcdc_encoder_disable,
.enable = mdp4_lcdc_encoder_enable, .enable = mdp4_lcdc_encoder_enable,
......
...@@ -188,13 +188,6 @@ static const struct drm_encoder_funcs mdp5_cmd_encoder_funcs = { ...@@ -188,13 +188,6 @@ static const struct drm_encoder_funcs mdp5_cmd_encoder_funcs = {
.destroy = mdp5_cmd_encoder_destroy, .destroy = mdp5_cmd_encoder_destroy,
}; };
static bool mdp5_cmd_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void mdp5_cmd_encoder_mode_set(struct drm_encoder *encoder, static void mdp5_cmd_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -256,7 +249,6 @@ static void mdp5_cmd_encoder_enable(struct drm_encoder *encoder) ...@@ -256,7 +249,6 @@ static void mdp5_cmd_encoder_enable(struct drm_encoder *encoder)
} }
static const struct drm_encoder_helper_funcs mdp5_cmd_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs mdp5_cmd_encoder_helper_funcs = {
.mode_fixup = mdp5_cmd_encoder_mode_fixup,
.mode_set = mdp5_cmd_encoder_mode_set, .mode_set = mdp5_cmd_encoder_mode_set,
.disable = mdp5_cmd_encoder_disable, .disable = mdp5_cmd_encoder_disable,
.enable = mdp5_cmd_encoder_enable, .enable = mdp5_cmd_encoder_enable,
...@@ -340,4 +332,3 @@ struct drm_encoder *mdp5_cmd_encoder_init(struct drm_device *dev, ...@@ -340,4 +332,3 @@ struct drm_encoder *mdp5_cmd_encoder_init(struct drm_device *dev,
return ERR_PTR(ret); return ERR_PTR(ret);
} }
...@@ -112,13 +112,6 @@ static const struct drm_encoder_funcs mdp5_encoder_funcs = { ...@@ -112,13 +112,6 @@ static const struct drm_encoder_funcs mdp5_encoder_funcs = {
.destroy = mdp5_encoder_destroy, .destroy = mdp5_encoder_destroy,
}; };
static bool mdp5_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void mdp5_encoder_mode_set(struct drm_encoder *encoder, static void mdp5_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -287,7 +280,6 @@ static void mdp5_encoder_enable(struct drm_encoder *encoder) ...@@ -287,7 +280,6 @@ static void mdp5_encoder_enable(struct drm_encoder *encoder)
} }
static const struct drm_encoder_helper_funcs mdp5_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs mdp5_encoder_helper_funcs = {
.mode_fixup = mdp5_encoder_mode_fixup,
.mode_set = mdp5_encoder_mode_set, .mode_set = mdp5_encoder_mode_set,
.disable = mdp5_encoder_disable, .disable = mdp5_encoder_disable,
.enable = mdp5_encoder_enable, .enable = mdp5_encoder_enable,
......
...@@ -734,14 +734,6 @@ static void qxl_enc_dpms(struct drm_encoder *encoder, int mode) ...@@ -734,14 +734,6 @@ static void qxl_enc_dpms(struct drm_encoder *encoder, int mode)
DRM_DEBUG("\n"); DRM_DEBUG("\n");
} }
static bool qxl_enc_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
DRM_DEBUG("\n");
return true;
}
static void qxl_enc_prepare(struct drm_encoder *encoder) static void qxl_enc_prepare(struct drm_encoder *encoder)
{ {
DRM_DEBUG("\n"); DRM_DEBUG("\n");
...@@ -864,7 +856,6 @@ static struct drm_encoder *qxl_best_encoder(struct drm_connector *connector) ...@@ -864,7 +856,6 @@ static struct drm_encoder *qxl_best_encoder(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs qxl_enc_helper_funcs = { static const struct drm_encoder_helper_funcs qxl_enc_helper_funcs = {
.dpms = qxl_enc_dpms, .dpms = qxl_enc_dpms,
.mode_fixup = qxl_enc_mode_fixup,
.prepare = qxl_enc_prepare, .prepare = qxl_enc_prepare,
.mode_set = qxl_enc_mode_set, .mode_set = qxl_enc_mode_set,
.commit = qxl_enc_commit, .commit = qxl_enc_commit,
......
...@@ -2623,16 +2623,8 @@ radeon_atom_ext_dpms(struct drm_encoder *encoder, int mode) ...@@ -2623,16 +2623,8 @@ radeon_atom_ext_dpms(struct drm_encoder *encoder, int mode)
} }
static bool radeon_atom_ext_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static const struct drm_encoder_helper_funcs radeon_atom_ext_helper_funcs = { static const struct drm_encoder_helper_funcs radeon_atom_ext_helper_funcs = {
.dpms = radeon_atom_ext_dpms, .dpms = radeon_atom_ext_dpms,
.mode_fixup = radeon_atom_ext_mode_fixup,
.prepare = radeon_atom_ext_prepare, .prepare = radeon_atom_ext_prepare,
.mode_set = radeon_atom_ext_mode_set, .mode_set = radeon_atom_ext_mode_set,
.commit = radeon_atom_ext_commit, .commit = radeon_atom_ext_commit,
......
...@@ -875,13 +875,6 @@ static void dw_mipi_dsi_encoder_disable(struct drm_encoder *encoder) ...@@ -875,13 +875,6 @@ static void dw_mipi_dsi_encoder_disable(struct drm_encoder *encoder)
clk_disable_unprepare(dsi->pclk); clk_disable_unprepare(dsi->pclk);
} }
static bool dw_mipi_dsi_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void dw_mipi_dsi_encoder_commit(struct drm_encoder *encoder) static void dw_mipi_dsi_encoder_commit(struct drm_encoder *encoder)
{ {
struct dw_mipi_dsi *dsi = encoder_to_dsi(encoder); struct dw_mipi_dsi *dsi = encoder_to_dsi(encoder);
...@@ -931,7 +924,6 @@ static void dw_mipi_dsi_encoder_commit(struct drm_encoder *encoder) ...@@ -931,7 +924,6 @@ static void dw_mipi_dsi_encoder_commit(struct drm_encoder *encoder)
static struct drm_encoder_helper_funcs static struct drm_encoder_helper_funcs
dw_mipi_dsi_encoder_helper_funcs = { dw_mipi_dsi_encoder_helper_funcs = {
.mode_fixup = dw_mipi_dsi_encoder_mode_fixup,
.commit = dw_mipi_dsi_encoder_commit, .commit = dw_mipi_dsi_encoder_commit,
.mode_set = dw_mipi_dsi_encoder_mode_set, .mode_set = dw_mipi_dsi_encoder_mode_set,
.disable = dw_mipi_dsi_encoder_disable, .disable = dw_mipi_dsi_encoder_disable,
......
...@@ -440,13 +440,6 @@ static void sti_tvout_encoder_dpms(struct drm_encoder *encoder, int mode) ...@@ -440,13 +440,6 @@ static void sti_tvout_encoder_dpms(struct drm_encoder *encoder, int mode)
{ {
} }
static bool sti_tvout_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void sti_tvout_encoder_mode_set(struct drm_encoder *encoder, static void sti_tvout_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -486,7 +479,6 @@ static void sti_dvo_encoder_disable(struct drm_encoder *encoder) ...@@ -486,7 +479,6 @@ static void sti_dvo_encoder_disable(struct drm_encoder *encoder)
static const struct drm_encoder_helper_funcs sti_dvo_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs sti_dvo_encoder_helper_funcs = {
.dpms = sti_tvout_encoder_dpms, .dpms = sti_tvout_encoder_dpms,
.mode_fixup = sti_tvout_encoder_mode_fixup,
.mode_set = sti_tvout_encoder_mode_set, .mode_set = sti_tvout_encoder_mode_set,
.prepare = sti_tvout_encoder_prepare, .prepare = sti_tvout_encoder_prepare,
.commit = sti_dvo_encoder_commit, .commit = sti_dvo_encoder_commit,
...@@ -540,7 +532,6 @@ static void sti_hda_encoder_disable(struct drm_encoder *encoder) ...@@ -540,7 +532,6 @@ static void sti_hda_encoder_disable(struct drm_encoder *encoder)
static const struct drm_encoder_helper_funcs sti_hda_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs sti_hda_encoder_helper_funcs = {
.dpms = sti_tvout_encoder_dpms, .dpms = sti_tvout_encoder_dpms,
.mode_fixup = sti_tvout_encoder_mode_fixup,
.mode_set = sti_tvout_encoder_mode_set, .mode_set = sti_tvout_encoder_mode_set,
.prepare = sti_tvout_encoder_prepare, .prepare = sti_tvout_encoder_prepare,
.commit = sti_hda_encoder_commit, .commit = sti_hda_encoder_commit,
...@@ -589,7 +580,6 @@ static void sti_hdmi_encoder_disable(struct drm_encoder *encoder) ...@@ -589,7 +580,6 @@ static void sti_hdmi_encoder_disable(struct drm_encoder *encoder)
static const struct drm_encoder_helper_funcs sti_hdmi_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs sti_hdmi_encoder_helper_funcs = {
.dpms = sti_tvout_encoder_dpms, .dpms = sti_tvout_encoder_dpms,
.mode_fixup = sti_tvout_encoder_mode_fixup,
.mode_set = sti_tvout_encoder_mode_set, .mode_set = sti_tvout_encoder_mode_set,
.prepare = sti_tvout_encoder_prepare, .prepare = sti_tvout_encoder_prepare,
.commit = sti_hdmi_encoder_commit, .commit = sti_hdmi_encoder_commit,
......
...@@ -70,14 +70,6 @@ static void panel_encoder_dpms(struct drm_encoder *encoder, int mode) ...@@ -70,14 +70,6 @@ static void panel_encoder_dpms(struct drm_encoder *encoder, int mode)
mode == DRM_MODE_DPMS_ON ? 1 : 0); mode == DRM_MODE_DPMS_ON ? 1 : 0);
} }
static bool panel_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
/* nothing needed */
return true;
}
static void panel_encoder_prepare(struct drm_encoder *encoder) static void panel_encoder_prepare(struct drm_encoder *encoder)
{ {
struct panel_encoder *panel_encoder = to_panel_encoder(encoder); struct panel_encoder *panel_encoder = to_panel_encoder(encoder);
...@@ -103,7 +95,6 @@ static const struct drm_encoder_funcs panel_encoder_funcs = { ...@@ -103,7 +95,6 @@ static const struct drm_encoder_funcs panel_encoder_funcs = {
static const struct drm_encoder_helper_funcs panel_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs panel_encoder_helper_funcs = {
.dpms = panel_encoder_dpms, .dpms = panel_encoder_dpms,
.mode_fixup = panel_encoder_mode_fixup,
.prepare = panel_encoder_prepare, .prepare = panel_encoder_prepare,
.commit = panel_encoder_commit, .commit = panel_encoder_commit,
.mode_set = panel_encoder_mode_set, .mode_set = panel_encoder_mode_set,
......
...@@ -80,14 +80,6 @@ static void tfp410_encoder_dpms(struct drm_encoder *encoder, int mode) ...@@ -80,14 +80,6 @@ static void tfp410_encoder_dpms(struct drm_encoder *encoder, int mode)
tfp410_encoder->dpms = mode; tfp410_encoder->dpms = mode;
} }
static bool tfp410_encoder_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
/* nothing needed */
return true;
}
static void tfp410_encoder_prepare(struct drm_encoder *encoder) static void tfp410_encoder_prepare(struct drm_encoder *encoder)
{ {
tfp410_encoder_dpms(encoder, DRM_MODE_DPMS_OFF); tfp410_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
...@@ -112,7 +104,6 @@ static const struct drm_encoder_funcs tfp410_encoder_funcs = { ...@@ -112,7 +104,6 @@ static const struct drm_encoder_funcs tfp410_encoder_funcs = {
static const struct drm_encoder_helper_funcs tfp410_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs tfp410_encoder_helper_funcs = {
.dpms = tfp410_encoder_dpms, .dpms = tfp410_encoder_dpms,
.mode_fixup = tfp410_encoder_mode_fixup,
.prepare = tfp410_encoder_prepare, .prepare = tfp410_encoder_prepare,
.commit = tfp410_encoder_commit, .commit = tfp410_encoder_commit,
.mode_set = tfp410_encoder_mode_set, .mode_set = tfp410_encoder_mode_set,
......
...@@ -26,13 +26,6 @@ static void udl_encoder_disable(struct drm_encoder *encoder) ...@@ -26,13 +26,6 @@ static void udl_encoder_disable(struct drm_encoder *encoder)
{ {
} }
static bool udl_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void udl_encoder_prepare(struct drm_encoder *encoder) static void udl_encoder_prepare(struct drm_encoder *encoder)
{ {
} }
...@@ -54,7 +47,6 @@ udl_encoder_dpms(struct drm_encoder *encoder, int mode) ...@@ -54,7 +47,6 @@ udl_encoder_dpms(struct drm_encoder *encoder, int mode)
static const struct drm_encoder_helper_funcs udl_helper_funcs = { static const struct drm_encoder_helper_funcs udl_helper_funcs = {
.dpms = udl_encoder_dpms, .dpms = udl_encoder_dpms,
.mode_fixup = udl_mode_fixup,
.prepare = udl_encoder_prepare, .prepare = udl_encoder_prepare,
.mode_set = udl_encoder_mode_set, .mode_set = udl_encoder_mode_set,
.commit = udl_encoder_commit, .commit = udl_encoder_commit,
......
...@@ -282,13 +282,6 @@ static const struct drm_crtc_helper_funcs virtio_gpu_crtc_helper_funcs = { ...@@ -282,13 +282,6 @@ static const struct drm_crtc_helper_funcs virtio_gpu_crtc_helper_funcs = {
.atomic_check = virtio_gpu_crtc_atomic_check, .atomic_check = virtio_gpu_crtc_atomic_check,
}; };
static bool virtio_gpu_enc_mode_fixup(struct drm_encoder *encoder,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
static void virtio_gpu_enc_mode_set(struct drm_encoder *encoder, static void virtio_gpu_enc_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -362,7 +355,6 @@ virtio_gpu_best_encoder(struct drm_connector *connector) ...@@ -362,7 +355,6 @@ virtio_gpu_best_encoder(struct drm_connector *connector)
} }
static const struct drm_encoder_helper_funcs virtio_gpu_enc_helper_funcs = { static const struct drm_encoder_helper_funcs virtio_gpu_enc_helper_funcs = {
.mode_fixup = virtio_gpu_enc_mode_fixup,
.mode_set = virtio_gpu_enc_mode_set, .mode_set = virtio_gpu_enc_mode_set,
.enable = virtio_gpu_enc_enable, .enable = virtio_gpu_enc_enable,
.disable = virtio_gpu_enc_disable, .disable = virtio_gpu_enc_disable,
......
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