On Wed, Jan 08, 2014 at 11:12:27AM -0200, Paulo Zanoni wrote: > From: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> > > Properly zero the refcounts and crtc->ddi_pll_set so the previous HW > state doesn't affect the result of reading the current HW state. > > This fixes WARNs about WRPLL refcount if we have an HDMI monitor on > HSW and then suspend/resume. > > Cc: stable@xxxxxxxxxxxxxxx > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64379 > Tested-by: Qingshuai Tian <qingshuai.tian@xxxxxxxxx> > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> Reviewed-by: Damien Lespiau <damien.lespiau@xxxxxxxxx> -- Damien > --- > drivers/gpu/drm/i915/intel_ddi.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c > index 4ec1665..0def5ef 100644 > --- a/drivers/gpu/drm/i915/intel_ddi.c > +++ b/drivers/gpu/drm/i915/intel_ddi.c > @@ -1136,12 +1136,18 @@ void intel_ddi_setup_hw_pll_state(struct drm_device *dev) > enum pipe pipe; > struct intel_crtc *intel_crtc; > > + dev_priv->ddi_plls.spll_refcount = 0; > + dev_priv->ddi_plls.wrpll1_refcount = 0; > + dev_priv->ddi_plls.wrpll2_refcount = 0; > + > for_each_pipe(pipe) { > intel_crtc = > to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]); > > - if (!intel_crtc->active) > + if (!intel_crtc->active) { > + intel_crtc->ddi_pll_sel = PORT_CLK_SEL_NONE; > continue; > + } > > intel_crtc->ddi_pll_sel = intel_ddi_get_crtc_pll(dev_priv, > pipe); > -- > 1.8.4.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
