From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: move infoframe setting to after pll enable v2 Date: Sat, 5 Apr 2014 17:21:04 +0200 Message-ID: <20140405152104.GW7225@phenom.ffwll.local> References: <1396647521-9250-1-git-send-email-jbarnes@virtuousgeek.org> <1396649528-12392-1-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f173.google.com (mail-we0-f173.google.com [74.125.82.173]) by gabe.freedesktop.org (Postfix) with ESMTP id 226EE6E059 for ; Sat, 5 Apr 2014 08:21:07 -0700 (PDT) Received: by mail-we0-f173.google.com with SMTP id w61so4696463wes.4 for ; Sat, 05 Apr 2014 08:21:07 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1396649528-12392-1-git-send-email-jbarnes@virtuousgeek.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Apr 04, 2014 at 03:12:08PM -0700, Jesse Barnes wrote: > Needs to happen after clock is running or it doesn't behave correctly. > > v2: fix subject (Ville) > make it clearer that this occurs in pre_enable (Paulo) > > Signed-off-by: Jesse Barnes Resent the wrong version or failed to git add? -Daniel > --- > drivers/gpu/drm/i915/intel_hdmi.c | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c > index fb9839b..05055f6 100644 > --- a/drivers/gpu/drm/i915/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > @@ -669,8 +669,6 @@ static void intel_hdmi_mode_set(struct intel_encoder *encoder) > > I915_WRITE(intel_hdmi->hdmi_reg, hdmi_val); > POSTING_READ(intel_hdmi->hdmi_reg); > - > - intel_hdmi->set_infoframes(&encoder->base, adjusted_mode); > } > > static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder, > @@ -1115,13 +1113,26 @@ done: > return 0; > } > > +static void intel_hdmi_pre_enable(struct intel_encoder *encoder) > +{ > + struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); > + struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); > + struct drm_display_mode *adjusted_mode = > + &intel_crtc->config.adjusted_mode; > + > + intel_hdmi->set_infoframes(&encoder->base, adjusted_mode); > +} > + > static void vlv_hdmi_pre_enable(struct intel_encoder *encoder) > { > + struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); > struct intel_digital_port *dport = enc_to_dig_port(&encoder->base); > struct drm_device *dev = encoder->base.dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = > to_intel_crtc(encoder->base.crtc); > + struct drm_display_mode *adjusted_mode = > + &intel_crtc->config.adjusted_mode; > enum dpio_channel port = vlv_dport_to_channel(dport); > int pipe = intel_crtc->pipe; > u32 val; > @@ -1155,6 +1166,8 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder) > vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW23(port), 0x00400888); > mutex_unlock(&dev_priv->dpio_lock); > > + intel_hdmi->set_infoframes(&encoder->base, adjusted_mode); > + > intel_enable_hdmi(encoder); > > vlv_wait_port_ready(dev_priv, dport); > @@ -1344,6 +1357,7 @@ void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port) > intel_encoder->disable = intel_disable_hdmi; > intel_encoder->get_hw_state = intel_hdmi_get_hw_state; > intel_encoder->get_config = intel_hdmi_get_config; > + intel_encoder->pre_enable = intel_hdmi_pre_enable; > if (IS_VALLEYVIEW(dev)) { > intel_encoder->pre_pll_enable = vlv_hdmi_pre_pll_enable; > intel_encoder->pre_enable = vlv_hdmi_pre_enable; > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch