Skip to content

Commit

Permalink
drm/i915: s/intel_encoder_disable/intel_encoder_noop
Browse files Browse the repository at this point in the history 
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: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Sep 6, 2012
1 parent 976f8a2 commit 1f70385
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_crt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ static void intel_crt_reset(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs crt_encoder_funcs = {
.mode_fixup = intel_crt_mode_fixup,
.mode_set = intel_crt_mode_set,
.disable = intel_encoder_disable,
.disable = intel_encoder_noop,
};

static const struct drm_connector_funcs intel_crt_connector_funcs = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_dp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
.mode_fixup = intel_dp_mode_fixup,
.mode_set = intel_dp_mode_set,
.disable = intel_encoder_disable,
.disable = intel_encoder_noop,
};

static const struct drm_connector_funcs intel_dp_connector_funcs = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
extern void intel_crtc_load_lut(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_dpms(struct intel_encoder *encoder, int mode);
extern bool intel_encoder_check_is_cloned(struct intel_encoder *encoder);
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_dvo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ static void intel_dvo_destroy(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = {
.mode_fixup = intel_dvo_mode_fixup,
.mode_set = intel_dvo_mode_set,
.disable = intel_encoder_disable,
.disable = intel_encoder_noop,
};

static const struct drm_connector_funcs intel_dvo_connector_funcs = {
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/intel_hdmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
.mode_fixup = intel_hdmi_mode_fixup,
.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 = {
.mode_fixup = intel_hdmi_mode_fixup,
.mode_set = intel_hdmi_mode_set,
.disable = intel_encoder_disable,
.disable = intel_encoder_noop,
};

static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_lvds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
.mode_fixup = intel_lvds_mode_fixup,
.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 = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_sdvo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1936,7 +1936,7 @@ intel_sdvo_set_property(struct drm_connector *connector,
static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = {
.mode_fixup = intel_sdvo_mode_fixup,
.mode_set = intel_sdvo_mode_set,
.disable = intel_encoder_disable
.disable = intel_encoder_noop,
};

static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_tv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
.mode_fixup = intel_tv_mode_fixup,
.mode_set = intel_tv_mode_set,
.disable = intel_encoder_disable,
.disable = intel_encoder_noop,
};

static const struct drm_connector_funcs intel_tv_connector_funcs = {
Expand Down

0 comments on commit 1f70385

Please sign in to comment.