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: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180320220637.21480-7-lucas.demarchi@intel.com

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5f79444d12c5533f49b6774246955e39830a86a8..64dd88e49bd9173255352a939db36e2af8f07cf9 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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);
 
-       if (!(pll->flags & INTEL_DPLL_ALWAYS_ON)) {
+       if (!(pll->info->flags & INTEL_DPLL_ALWAYS_ON)) {
                I915_STATE_WARN(!pll->on && pll->active_mask,
                     "pll in active use but not on in sw tracking\n");
                I915_STATE_WARN(pll->on && !pll->active_mask,

diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
index 48466b19d1f60bb878d772d61f063c587256dbd9..bda69e1ccd7677802c60e9306443203db3f97657 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
@@ -2433,8 +2433,6 @@ void intel_shared_dpll_init(struct drm_device *dev)
        for (i = 0; dpll_info[i].id >= 0; i++) {
                WARN_ON(i != dpll_info[i].id);
                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;

diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.h b/drivers/gpu/drm/i915/intel_dpll_mgr.h
index 7c95ecce41ee384a05657a35f2b862e642757d35..e4c01e487be745a4999e05794e4390b93e98f013 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dpll_mgr.h
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.h
@@ -222,6 +222,14 @@ struct dpll_info {
         * @funcs: platform specific hooks
         */
        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;
 };
 
@@ -251,16 +259,6 @@ struct intel_shared_dpll {
         * @info: platform specific 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