diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-06-05 07:34:20 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-06-12 15:32:56 -0400 |
commit | 66e985c035f4554939b8b63a8e21418271160ab0 (patch) | |
tree | fd5260bbb53bc04a56062beff336a763ac145963 /drivers/gpu/drm/i915/i915_drv.h | |
parent | 87a875bbffcfac7cb7c9a106fda40f04de1f60a2 (diff) |
drm/i915: hw state readout and cross-checking for shared dplls
Just the plumbing, all the modeset and enable code has not yet been
switched over to use the new state. It seems to be decently broken
anyway, at least wrt to handling of the special pixel mutliplier
enabling sequence. Follow-up patches will clean up that mess.
Another missing piece is more careful handling (and fixup) of the fp1
alternate divisor state. The BIOS most likely doesn't bother to
program that one to what we expect. So we need to be more careful with
comparing that state, both for cross checking but also when checking
for dpll sharing when acquiring shared dpll. Otherwise fastboot will
deny a few shared dpll configurations which would otherwise work.
v2: We need to memcpy the pipe config dpll hw state into the pll, for
otherwise the cross-check code will get angry.
v3: Don't forget to read the pch pll state in the crtc get_pipe_config
function for ibx/ilk platforms.
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 7b998dcae089..42ef7cb39e62 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -143,6 +143,9 @@ enum intel_dpll_id { | |||
143 | #define I915_NUM_PLLS 2 | 143 | #define I915_NUM_PLLS 2 |
144 | 144 | ||
145 | struct intel_dpll_hw_state { | 145 | struct intel_dpll_hw_state { |
146 | uint32_t dpll; | ||
147 | uint32_t fp0; | ||
148 | uint32_t fp1; | ||
146 | }; | 149 | }; |
147 | 150 | ||
148 | struct intel_shared_dpll { | 151 | struct intel_shared_dpll { |