[Intel-gfx] [PATCH 6/7] drm/i915: use flags from dpll_info embedded in intel_shared_dpll

[Lucas De Marchi]

Replace all users of pll->flags to use pll->info.flags.

Signed-off-by: Lucas De Marchi <lucas.demar...@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c  |  2 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.c |  2 --
 drivers/gpu/drm/i915/intel_dpll_mgr.h | 18 ++++++++----------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index 53fce46380e0..1dfaf28bc641 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11649,7 +11649,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 823752f725d3..436fca8efe8c 100644
--- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
@@ -2416,8 +2416,6 @@ void intel_shared_dpll_init(struct drm_device *dev)
                WARN_ON(i != dpll_info[i].id);
                memcpy(&dev_priv->shared_dplls[i].info, &dpll_info[i],
                       sizeof(struct dpll_info));
-
-               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 0fe5f2beefd5..4f21fb9108b5 100644
--- 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
         */
        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
-- 
2.14.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx