drm/i915: Keep the global DPLL state in a DPLL specific struct

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / display / intel_display.c

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 125d5c0..4d4d937 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -9551,7 +9551,7 @@ static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv)
        }
 
        /* Check if any DPLLs are using the SSC source */
-       for (i = 0; i < dev_priv->num_shared_dpll; i++) {
+       for (i = 0; i < dev_priv->dpll.num_shared_dpll; i++) {
                u32 temp = intel_de_read(dev_priv, PCH_DPLL(i));
 
                if (!(temp & DPLL_VCO_ENABLE))
@@ -14371,8 +14371,10 @@ verify_disabled_dpll_state(struct drm_i915_private *dev_priv)
 {
        int i;
 
-       for (i = 0; i < dev_priv->num_shared_dpll; i++)
-               verify_single_dpll_state(dev_priv, &dev_priv->shared_dplls[i], NULL, NULL);
+       for (i = 0; i < dev_priv->dpll.num_shared_dpll; i++)
+               verify_single_dpll_state(dev_priv,
+                                        &dev_priv->dpll.shared_dplls[i],
+                                        NULL, NULL);
 }
 
 static void