diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-02-15 09:37:04 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-02-15 09:37:04 +0000 |
| commit | d650f410518e3a9176c896c39036a35391351577 (patch) | |
| tree | 67815321fe984a0cba16456194ab344df87354e9 /sys/dev/pci/drm/i915/intel_ddi.c | |
| parent | cd3bd9073276f85ef1410df6a032cc8bd6380235 (diff) | |
drm/i915: fix DDI PLLs HW state readout code
From Paulo Zanoni
ab678ee101d7f1bed57e488d807a9f85c15af3fc in ubuntu 3.8
0882dae983707455e97479e5e904e37673517ebc in mainline linux
Diffstat (limited to 'sys/dev/pci/drm/i915/intel_ddi.c')
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_ddi.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/i915/intel_ddi.c b/sys/dev/pci/drm/i915/intel_ddi.c index aa8304cc708..8e265e2828c 100644 --- a/sys/dev/pci/drm/i915/intel_ddi.c +++ b/sys/dev/pci/drm/i915/intel_ddi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_ddi.c,v 1.10 2014/01/23 10:42:57 jsg Exp $ */ +/* $OpenBSD: intel_ddi.c,v 1.11 2014/02/15 09:37:03 jsg Exp $ */ /* * Copyright © 2012 Intel Corporation * @@ -1184,12 +1184,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); |