Re: [PATCH] drm/i915: Move some hdmi enable function name to vlv specific.

Ville Syrjälä
2013-10-16T09:53:38Z

On Wed, Oct 16, 2013 at 05:07:41PM +0800, Chon Ming Lee wrote:
> There is no functional change on this patch. Only rename several
> hdmi encoder function name which suppose to use only by valleyview from
> intel_hdmi_pre_pll_enable to vlv_hdmi_pre_pll_enable, and etc.
>
> Signed-off-by: Chon Ming Lee <chon.ming.lee@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

As a followup you could also remove the pointless IS_VALLEYVIEW() checks
from pre_enable and pre_pll_enable.

> ---
> drivers/gpu/drm/i915/intel_hdmi.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 4f4d346..51a8336 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -1074,7 +1074,7 @@ done:
> return 0;
> }
>
> -static void intel_hdmi_pre_enable(struct intel_encoder *encoder)
> +static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)
> {
> struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
> struct drm_device *dev = encoder->base.dev;
> @@ -1127,7 +1127,7 @@ static void intel_hdmi_pre_enable(struct intel_encoder *encoder)
> vlv_wait_port_ready(dev_priv, port);
> }
>
> -static void intel_hdmi_pre_pll_enable(struct intel_encoder *encoder)
> +static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder)
> {
> struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
> struct drm_device *dev = encoder->base.dev;
> @@ -1163,7 +1163,7 @@ static void intel_hdmi_pre_pll_enable(struct intel_encoder *encoder)
> mutex_unlock(&dev_priv->dpio_lock);
> }
>
> -static void intel_hdmi_post_disable(struct intel_encoder *encoder)
> +static void vlv_hdmi_post_disable(struct intel_encoder *encoder)
> {
> struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
> struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
> @@ -1313,10 +1313,10 @@ void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port)
> intel_encoder->get_hw_state = intel_hdmi_get_hw_state;
> intel_encoder->get_config = intel_hdmi_get_config;
> if (IS_VALLEYVIEW(dev)) {
> - intel_encoder->pre_pll_enable = intel_hdmi_pre_pll_enable;
> - intel_encoder->pre_enable = intel_hdmi_pre_enable;
> + intel_encoder->pre_pll_enable = vlv_hdmi_pre_pll_enable;
> + intel_encoder->pre_enable = vlv_hdmi_pre_enable;
> intel_encoder->enable = vlv_enable_hdmi;
> - intel_encoder->post_disable = intel_hdmi_post_disable;
> + intel_encoder->post_disable = vlv_hdmi_post_disable;
> } else {
> intel_encoder->enable = intel_enable_hdmi;
> }
> --
> 1.7.7.6
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Ville Syrjälä
Intel OTC