Commit 5cd281f6 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Rodrigo Vivi

drm/i915: use flags from dpll_info embedded in intel_shared_dpll

Replace all users of pll->flags to use pll->info.flags.
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180320220637.21480-7-lucas.demarchi@intel.com
parent 0823eb9c
...@@ -11657,7 +11657,7 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv, ...@@ -11657,7 +11657,7 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv,
active = pll->info->funcs->get_hw_state(dev_priv, pll, &dpll_hw_state); active = pll->info->funcs->get_hw_state(dev_priv, pll, &dpll_hw_state);
if (!(pll->flags & INTEL_DPLL_ALWAYS_ON)) { if (!(pll->info->flags & INTEL_DPLL_ALWAYS_ON)) {
I915_STATE_WARN(!pll->on && pll->active_mask, I915_STATE_WARN(!pll->on && pll->active_mask,
"pll in active use but not on in sw tracking\n"); "pll in active use but not on in sw tracking\n");
I915_STATE_WARN(pll->on && !pll->active_mask, I915_STATE_WARN(pll->on && !pll->active_mask,
......
...@@ -2433,8 +2433,6 @@ void intel_shared_dpll_init(struct drm_device *dev) ...@@ -2433,8 +2433,6 @@ void intel_shared_dpll_init(struct drm_device *dev)
for (i = 0; dpll_info[i].id >= 0; i++) { for (i = 0; dpll_info[i].id >= 0; i++) {
WARN_ON(i != dpll_info[i].id); WARN_ON(i != dpll_info[i].id);
dev_priv->shared_dplls[i].info = &dpll_info[i]; dev_priv->shared_dplls[i].info = &dpll_info[i];
dev_priv->shared_dplls[i].flags = dpll_info[i].flags;
} }
dev_priv->dpll_mgr = dpll_mgr; dev_priv->dpll_mgr = dpll_mgr;
......
...@@ -222,6 +222,14 @@ struct dpll_info { ...@@ -222,6 +222,14 @@ struct dpll_info {
* @funcs: platform specific hooks * @funcs: platform specific hooks
*/ */
const struct intel_shared_dpll_funcs *funcs; const struct intel_shared_dpll_funcs *funcs;
#define INTEL_DPLL_ALWAYS_ON (1 << 0)
/**
* @flags:
*
* INTEL_DPLL_ALWAYS_ON
* Inform the state checker that the DPLL is kept enabled even if
* not in use by any CRTC.
*/
uint32_t flags; uint32_t flags;
}; };
...@@ -251,16 +259,6 @@ struct intel_shared_dpll { ...@@ -251,16 +259,6 @@ struct intel_shared_dpll {
* @info: platform specific info * @info: platform specific info
*/ */
const struct dpll_info *info; const struct dpll_info *info;
#define INTEL_DPLL_ALWAYS_ON (1 << 0)
/**
* @flags:
*
* INTEL_DPLL_ALWAYS_ON
* Inform the state checker that the DPLL is kept enabled even if
* not in use by any CRTC.
*/
uint32_t flags;
}; };
#define SKL_DPLL0 0 #define SKL_DPLL0 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment