summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-06-05 13:34:06 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-06-10 19:47:36 +0200
commite72f9fbf99c4277b2ccfd4d55d66aa6caf922f42 (patch)
treec5a5270aba0ec73a85e4ad90200f0aaf18400921 /drivers/gpu/drm/i915/intel_drv.h
parentdrm/i915: lock down pch pll accouting some more (diff)
downloadlinux-e72f9fbf99c4277b2ccfd4d55d66aa6caf922f42.tar.xz
linux-e72f9fbf99c4277b2ccfd4d55d66aa6caf922f42.zip
drm/i915: s/pch_pll/shared_dpll/
For fastboot we need some support to read out the sharing state of plls, at least for platforms where they can be shared (or freely assigned at least). Now for ivb we already have pretty extensive infrastructure for tracking pch plls, and it took us an aweful lot of tries to get that remotely right. Note that hsw could also share plls, but even now they're already freely assignable. So we need this on more than just ivb. So on top of the usual fastboot fun pll sharing seems to be an additional step up in fragility. Hence a common infrastructure for all shared/freely assignable display plls seems to be in order. The plan is to have a bit of dpll hw state readout code, which can be used individually, but also to fill in the pipe config. The hw state cross check code will then use that information to make sure that after every modeset every pipe still is connected to a pll which still has the correct configuration - a lot of the pch pll sharing bugs where due to incorrect sharing. We start this endeavour with a simple s/pch_pll/shared_dpll/ rename job. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index bb4822a6c41e..b094260f1e2b 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -317,7 +317,7 @@ struct intel_crtc {
struct intel_crtc_config config;
/* We can share PLLs across outputs if the timings match */
- struct intel_pch_pll *pch_pll;
+ struct intel_shared_dpll *shared_dpll;
uint32_t ddi_pll_sel;
/* reset counter value when the last flip was submitted */