Commit 1f703855 authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: s/intel_encoder_disable/intel_encoder_noop

Because that's what it is. Unfortunately we can't rip this out because
the fb helper has an incetious relationship with the crtc helper - it
likes to call disable_unused_functions, among other things.
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 976f8a20
...@@ -641,7 +641,7 @@ static void intel_crt_reset(struct drm_connector *connector) ...@@ -641,7 +641,7 @@ static void intel_crt_reset(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs crt_encoder_funcs = { static const struct drm_encoder_helper_funcs crt_encoder_funcs = {
.mode_fixup = intel_crt_mode_fixup, .mode_fixup = intel_crt_mode_fixup,
.mode_set = intel_crt_mode_set, .mode_set = intel_crt_mode_set,
.disable = intel_encoder_disable, .disable = intel_encoder_noop,
}; };
static const struct drm_connector_funcs intel_crt_connector_funcs = { static const struct drm_connector_funcs intel_crt_connector_funcs = {
......
...@@ -3553,7 +3553,7 @@ static void intel_crtc_disable(struct drm_crtc *crtc) ...@@ -3553,7 +3553,7 @@ static void intel_crtc_disable(struct drm_crtc *crtc)
} }
} }
void intel_encoder_disable(struct drm_encoder *encoder) void intel_encoder_noop(struct drm_encoder *encoder)
{ {
} }
......
...@@ -2393,7 +2393,7 @@ static void intel_dp_encoder_destroy(struct drm_encoder *encoder) ...@@ -2393,7 +2393,7 @@ static void intel_dp_encoder_destroy(struct drm_encoder *encoder)
static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = { static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = {
.mode_fixup = intel_dp_mode_fixup, .mode_fixup = intel_dp_mode_fixup,
.mode_set = intel_dp_mode_set, .mode_set = intel_dp_mode_set,
.disable = intel_encoder_disable, .disable = intel_encoder_noop,
}; };
static const struct drm_connector_funcs intel_dp_connector_funcs = { static const struct drm_connector_funcs intel_dp_connector_funcs = {
......
...@@ -451,7 +451,7 @@ extern bool intel_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode, ...@@ -451,7 +451,7 @@ extern bool intel_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
int x, int y, struct drm_framebuffer *old_fb); int x, int y, struct drm_framebuffer *old_fb);
extern void intel_crtc_load_lut(struct drm_crtc *crtc); extern void intel_crtc_load_lut(struct drm_crtc *crtc);
extern void intel_crtc_update_dpms(struct drm_crtc *crtc); extern void intel_crtc_update_dpms(struct drm_crtc *crtc);
extern void intel_encoder_disable(struct drm_encoder *encoder); extern void intel_encoder_noop(struct drm_encoder *encoder);
extern void intel_encoder_destroy(struct drm_encoder *encoder); extern void intel_encoder_destroy(struct drm_encoder *encoder);
extern void intel_encoder_dpms(struct intel_encoder *encoder, int mode); extern void intel_encoder_dpms(struct intel_encoder *encoder, int mode);
extern bool intel_encoder_check_is_cloned(struct intel_encoder *encoder); extern bool intel_encoder_check_is_cloned(struct intel_encoder *encoder);
......
...@@ -346,7 +346,7 @@ static void intel_dvo_destroy(struct drm_connector *connector) ...@@ -346,7 +346,7 @@ static void intel_dvo_destroy(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = { static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = {
.mode_fixup = intel_dvo_mode_fixup, .mode_fixup = intel_dvo_mode_fixup,
.mode_set = intel_dvo_mode_set, .mode_set = intel_dvo_mode_set,
.disable = intel_encoder_disable, .disable = intel_encoder_noop,
}; };
static const struct drm_connector_funcs intel_dvo_connector_funcs = { static const struct drm_connector_funcs intel_dvo_connector_funcs = {
......
...@@ -907,13 +907,13 @@ static void intel_hdmi_destroy(struct drm_connector *connector) ...@@ -907,13 +907,13 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs_hsw = { static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs_hsw = {
.mode_fixup = intel_hdmi_mode_fixup, .mode_fixup = intel_hdmi_mode_fixup,
.mode_set = intel_ddi_mode_set, .mode_set = intel_ddi_mode_set,
.disable = intel_encoder_disable, .disable = intel_encoder_noop,
}; };
static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs = { static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs = {
.mode_fixup = intel_hdmi_mode_fixup, .mode_fixup = intel_hdmi_mode_fixup,
.mode_set = intel_hdmi_mode_set, .mode_set = intel_hdmi_mode_set,
.disable = intel_encoder_disable, .disable = intel_encoder_noop,
}; };
static const struct drm_connector_funcs intel_hdmi_connector_funcs = { static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
......
...@@ -590,7 +590,7 @@ static int intel_lvds_set_property(struct drm_connector *connector, ...@@ -590,7 +590,7 @@ static int intel_lvds_set_property(struct drm_connector *connector,
static const struct drm_encoder_helper_funcs intel_lvds_helper_funcs = { static const struct drm_encoder_helper_funcs intel_lvds_helper_funcs = {
.mode_fixup = intel_lvds_mode_fixup, .mode_fixup = intel_lvds_mode_fixup,
.mode_set = intel_lvds_mode_set, .mode_set = intel_lvds_mode_set,
.disable = intel_encoder_disable, .disable = intel_encoder_noop,
}; };
static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs = { static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs = {
......
...@@ -1936,7 +1936,7 @@ intel_sdvo_set_property(struct drm_connector *connector, ...@@ -1936,7 +1936,7 @@ intel_sdvo_set_property(struct drm_connector *connector,
static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = { static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = {
.mode_fixup = intel_sdvo_mode_fixup, .mode_fixup = intel_sdvo_mode_fixup,
.mode_set = intel_sdvo_mode_set, .mode_set = intel_sdvo_mode_set,
.disable = intel_encoder_disable .disable = intel_encoder_noop,
}; };
static const struct drm_connector_funcs intel_sdvo_connector_funcs = { static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
......
...@@ -1492,7 +1492,7 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop ...@@ -1492,7 +1492,7 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop
static const struct drm_encoder_helper_funcs intel_tv_helper_funcs = { static const struct drm_encoder_helper_funcs intel_tv_helper_funcs = {
.mode_fixup = intel_tv_mode_fixup, .mode_fixup = intel_tv_mode_fixup,
.mode_set = intel_tv_mode_set, .mode_set = intel_tv_mode_set,
.disable = intel_encoder_disable, .disable = intel_encoder_noop,
}; };
static const struct drm_connector_funcs intel_tv_connector_funcs = { static const struct drm_connector_funcs intel_tv_connector_funcs = {
......
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