[Intel-gfx] [PATCH 53/58] drm/i915: s/intel_encoder_disable/intel_encoder_noop

[Jesse Barnes]

On Sun, 19 Aug 2012 21:13:10 +0200
Daniel Vetter <daniel.vetter at ffwll.ch> wrote:

> 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.
> 
> Signed-Off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_crt.c     | 2 +-
>  drivers/gpu/drm/i915/intel_display.c | 2 +-
>  drivers/gpu/drm/i915/intel_dp.c      | 2 +-
>  drivers/gpu/drm/i915/intel_drv.h     | 2 +-
>  drivers/gpu/drm/i915/intel_dvo.c     | 2 +-
>  drivers/gpu/drm/i915/intel_hdmi.c    | 4 ++--
>  drivers/gpu/drm/i915/intel_lvds.c    | 2 +-
>  drivers/gpu/drm/i915/intel_sdvo.c    | 2 +-
>  drivers/gpu/drm/i915/intel_tv.c      | 2 +-
>  9 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index 2855eb7..611564b 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -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 = {
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 48d763d..a716893 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -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)
>  {
>  }
>  
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index b07d4b4..3b1c407 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -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 = {
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 4aaf75c..1282bf0 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -452,7 +452,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_non_cloned(struct intel_encoder *encoder);
> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
> index 17dc8be..aa1bf57 100644
> --- a/drivers/gpu/drm/i915/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/intel_dvo.c
> @@ -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 = {
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index e7d5078..7acf2d9 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -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 = {
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index 7f730af..38ba2e8 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -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 = {
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index 198bb89..6f53871 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -1936,7 +1936,7 @@ done:
>  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 = {
> diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
> index 4def811..c9b2fb0 100644
> --- a/drivers/gpu/drm/i915/intel_tv.c
> +++ b/drivers/gpu/drm/i915/intel_tv.c
> @@ -1492,7 +1492,7 @@ out:
>  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 = {

Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>

-- 
Jesse Barnes, Intel Open Source Technology Center