diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-06-05 07:34:12 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-06-10 13:53:50 -0400 |
commit | 46edb027df0d4bd423f7430dd473609caad4674b (patch) | |
tree | f06c4dbd0f547098db741e1908f5a6e8562f234f /drivers/gpu/drm/i915/i915_drv.h | |
parent | 7c74ade1de5b5311e7c886de27aa54e3285bd220 (diff) |
drm/i915: metadata for shared dplls
An id to match the idx (useful for register access macros) and a name
fore neater debug output.
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/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index d83c80a9c0b9..0fc8d616cefb 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -132,23 +132,26 @@ enum hpd_pin { | |||
132 | list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \ | 132 | list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \ |
133 | if ((intel_encoder)->base.crtc == (__crtc)) | 133 | if ((intel_encoder)->base.crtc == (__crtc)) |
134 | 134 | ||
135 | enum intel_dpll_id { | ||
136 | DPLL_ID_PRIVATE = -1, /* non-shared dpll in use */ | ||
137 | /* real shared dpll ids must be >= 0 */ | ||
138 | DPLL_ID_PCH_PLL_A, | ||
139 | DPLL_ID_PCH_PLL_B, | ||
140 | }; | ||
141 | #define I915_NUM_PLLS 2 | ||
142 | |||
135 | struct intel_shared_dpll { | 143 | struct intel_shared_dpll { |
136 | int refcount; /* count of number of CRTCs sharing this PLL */ | 144 | int refcount; /* count of number of CRTCs sharing this PLL */ |
137 | int active; /* count of number of active CRTCs (i.e. DPMS on) */ | 145 | int active; /* count of number of active CRTCs (i.e. DPMS on) */ |
138 | bool on; /* is the PLL actually active? Disabled during modeset */ | 146 | bool on; /* is the PLL actually active? Disabled during modeset */ |
147 | const char *name; | ||
148 | /* should match the index in the dev_priv->shared_dplls array */ | ||
149 | enum intel_dpll_id id; | ||
139 | int pll_reg; | 150 | int pll_reg; |
140 | int fp0_reg; | 151 | int fp0_reg; |
141 | int fp1_reg; | 152 | int fp1_reg; |
142 | }; | 153 | }; |
143 | 154 | ||
144 | enum intel_dpll_id { | ||
145 | DPLL_ID_PRIVATE = -1, /* non-shared dpll in use */ | ||
146 | /* real shared dpll ids must be >= 0 */ | ||
147 | DPLL_ID_PCH_PLL_A, | ||
148 | DPLL_ID_PCH_PLL_B, | ||
149 | }; | ||
150 | #define I915_NUM_PLLS 2 | ||
151 | |||
152 | /* Used by dp and fdi links */ | 155 | /* Used by dp and fdi links */ |
153 | struct intel_link_m_n { | 156 | struct intel_link_m_n { |
154 | uint32_t tu; | 157 | uint32_t tu; |