diff options
author | Damien Lespiau <damien.lespiau@intel.com> | 2014-07-29 13:06:16 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-08-08 11:43:33 -0400 |
commit | dcfc3552136fb6996e19b9f6980dc5a6721defd5 (patch) | |
tree | 10cd481cb8032a23b6bd6d7c06a1fe8cb5efa381 | |
parent | aad3d14d25c33c8e510c41aaaf2668e8d32811ab (diff) |
drm/i915: Specify when the PLL hw state fields are valid
Not all those fields are valid on a given platform. Make it explicit.
Unions could also be used, but were cluttering some code paths with
if/else ladders.
v2: Don't use anonymous unions (Daniel)
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-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 c70b2b67282e..c3beb08813c6 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -197,10 +197,13 @@ enum intel_dpll_id { | |||
197 | #define I915_NUM_PLLS 2 | 197 | #define I915_NUM_PLLS 2 |
198 | 198 | ||
199 | struct intel_dpll_hw_state { | 199 | struct intel_dpll_hw_state { |
200 | /* i9xx, pch plls */ | ||
200 | uint32_t dpll; | 201 | uint32_t dpll; |
201 | uint32_t dpll_md; | 202 | uint32_t dpll_md; |
202 | uint32_t fp0; | 203 | uint32_t fp0; |
203 | uint32_t fp1; | 204 | uint32_t fp1; |
205 | |||
206 | /* hsw, bdw */ | ||
204 | uint32_t wrpll; | 207 | uint32_t wrpll; |
205 | }; | 208 | }; |
206 | 209 | ||