drm/i915/dpll: Rename macro for_each_shared_dpll

Rename the macro for_each_shared_dpll to for_each_dpll since
this loop will not necessarily be used for only shared
dpll in future.

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20250515071801.2221120-5-suraj.kandpal@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 9df8995e5bac6b1fb84c01a0ce903ce765a7ab7c..11a7fec202327d2fbe65b5ddd523dcd5670f1d44 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -627,7 +627,7 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused)
                   display->dpll.ref_clks.nssc,
                   display->dpll.ref_clks.ssc);
 
-       for_each_shared_dpll(display, pll, i) {
+       for_each_dpll(display, pll, i) {
                drm_printf(&p, "DPLL%i: %s, id: %i\n", pll->index,
                           pll->info->name, pll->info->id);
                drm_printf(&p, " pipe_mask: 0x%x, active: 0x%x, on: %s\n",

diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index 6b4eb230f4b3ca2ba92fdb0e1576070a5e791432..9974fdb6eaeb510c95f22d81b7ebc6bb207bae17 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@ -127,8 +127,8 @@ intel_atomic_duplicate_dpll_state(struct intel_display *display,
        struct intel_shared_dpll *pll;
        int i;
 
-       /* Copy shared dpll state */
-       for_each_shared_dpll(display, pll, i)
+       /* Copy dpll state */
+       for_each_dpll(display, pll, i)
                dpll_state[pll->index] = pll->state;
 }
 
@@ -165,7 +165,7 @@ intel_get_shared_dpll_by_id(struct intel_display *display,
        struct intel_shared_dpll *pll;
        int i;
 
-       for_each_shared_dpll(display, pll, i) {
+       for_each_dpll(display, pll, i) {
                if (pll->info->id == id)
                        return pll;
        }
@@ -348,7 +348,7 @@ intel_dpll_mask_all(struct intel_display *display)
        unsigned long dpll_mask = 0;
        int i;
 
-       for_each_shared_dpll(display, pll, i) {
+       for_each_dpll(display, pll, i) {
                drm_WARN_ON(display->drm, dpll_mask & BIT(pll->info->id));
 
                dpll_mask |= BIT(pll->info->id);
@@ -521,7 +521,7 @@ void intel_shared_dpll_swap_state(struct intel_atomic_state *state)
        if (!state->dpll_set)
                return;
 
-       for_each_shared_dpll(display, pll, i)
+       for_each_dpll(display, pll, i)
                swap(pll->state, dpll_state[pll->index]);
 }
 
@@ -4542,7 +4542,7 @@ void intel_dpll_readout_hw_state(struct intel_display *display)
        struct intel_shared_dpll *pll;
        int i;
 
-       for_each_shared_dpll(display, pll, i)
+       for_each_dpll(display, pll, i)
                readout_dpll_hw_state(display, pll);
 }
 
@@ -4571,7 +4571,7 @@ void intel_dpll_sanitize_state(struct intel_display *display)
 
        intel_cx0_pll_power_save_wa(display);
 
-       for_each_shared_dpll(display, pll, i)
+       for_each_dpll(display, pll, i)
                sanitize_dpll_state(display, pll);
 }
 
@@ -4720,6 +4720,6 @@ void intel_shared_dpll_verify_disabled(struct intel_atomic_state *state)
        struct intel_shared_dpll *pll;
        int i;
 
-       for_each_shared_dpll(display, pll, i)
+       for_each_dpll(display, pll, i)
                verify_single_dpll_state(display, pll, NULL, NULL);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
index fe6c676737bb4ee1b188d1d2214ced82ad849d97..d930724868313da6c041408b71b941215581f7c6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
@@ -30,7 +30,7 @@
 #include "intel_display_power.h"
 #include "intel_wakeref.h"
 
-#define for_each_shared_dpll(__display, __pll, __i) \
+#define for_each_dpll(__display, __pll, __i) \
        for ((__i) = 0; (__i) < (__display)->dpll.num_shared_dpll && \
                     ((__pll) = &(__display)->dpll.shared_dplls[(__i)]) ; (__i)++)
 

diff --git a/drivers/gpu/drm/i915/display/intel_pch_refclk.c b/drivers/gpu/drm/i915/display/intel_pch_refclk.c
index 693b90e3dfc3cfed83ab0e697b330584c2f2c20b..8bec55deff9fe1f64e84dc1c467bd4ae13ce8799 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_pch_refclk.c
+++ b/drivers/gpu/drm/i915/display/intel_pch_refclk.c
@@ -535,7 +535,7 @@ static void ilk_init_pch_refclk(struct intel_display *display)
        }
 
        /* Check if any DPLLs are using the SSC source */
-       for_each_shared_dpll(display, pll, i) {
+       for_each_dpll(display, pll, i) {
                u32 temp;
 
                temp = intel_de_read(display, PCH_DPLL(pll->info->id));