From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915: Move some hdmi enable function name to vlv specific. Date: Wed, 16 Oct 2013 12:53:34 +0300 Message-ID: <20131016095334.GT13047@intel.com> References: <1381914461-23125-1-git-send-email-chon.ming.lee@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 358C2E7CC5 for ; Wed, 16 Oct 2013 02:53:38 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1381914461-23125-1-git-send-email-chon.ming.lee@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Chon Ming Lee Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org 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 Reviewed-by: Ville Syrj=E4l=E4 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/int= el_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 =3D enc_to_dig_port(&encoder->base); > struct drm_device *dev =3D encoder->base.dev; > @@ -1127,7 +1127,7 @@ static void intel_hdmi_pre_enable(struct intel_enco= der *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 =3D enc_to_dig_port(&encoder->base); > struct drm_device *dev =3D 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 =3D enc_to_dig_port(&encoder->base); > struct drm_i915_private *dev_priv =3D 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 =3D intel_hdmi_get_hw_state; > intel_encoder->get_config =3D intel_hdmi_get_config; > if (IS_VALLEYVIEW(dev)) { > - intel_encoder->pre_pll_enable =3D intel_hdmi_pre_pll_enable; > - intel_encoder->pre_enable =3D intel_hdmi_pre_enable; > + intel_encoder->pre_pll_enable =3D vlv_hdmi_pre_pll_enable; > + intel_encoder->pre_enable =3D vlv_hdmi_pre_enable; > intel_encoder->enable =3D vlv_enable_hdmi; > - intel_encoder->post_disable =3D intel_hdmi_post_disable; > + intel_encoder->post_disable =3D vlv_hdmi_post_disable; > } else { > intel_encoder->enable =3D 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=E4l=E4 Intel OTC