The DPU1 driver needs to handle all MDPn<->DDR paths, as well as
CPU<->SLAVE_DISPLAY_CFG. The former ones share how their values are
calculated, but the latter one has static predefines spanning all SoCs.

In preparation for supporting the CPU<->SLAVE_DISPLAY_CFG path, rename
the path-related struct members to include "mdp_".

Signed-off-by: Konrad Dybcio <konrad.dyb...@linaro.org>
---
 drivers/gpu/drm/msm/msm_mdss.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c
index e8c93731aaa1..9e2ce7f22677 100644
--- a/drivers/gpu/drm/msm/msm_mdss.c
+++ b/drivers/gpu/drm/msm/msm_mdss.c
@@ -48,8 +48,8 @@ struct msm_mdss {
                struct irq_domain *domain;
        } irq_controller;
        const struct msm_mdss_data *mdss_data;
-       struct icc_path *path[2];
-       u32 num_paths;
+       struct icc_path *mdp_path[2];
+       u32 num_mdp_paths;
 };
 
 static int msm_mdss_parse_data_bus_icc_path(struct device *dev,
@@ -62,13 +62,13 @@ static int msm_mdss_parse_data_bus_icc_path(struct device 
*dev,
        if (IS_ERR_OR_NULL(path0))
                return PTR_ERR_OR_ZERO(path0);
 
-       msm_mdss->path[0] = path0;
-       msm_mdss->num_paths = 1;
+       msm_mdss->mdp_path[0] = path0;
+       msm_mdss->num_mdp_paths = 1;
 
        path1 = of_icc_get(dev, "mdp1-mem");
        if (!IS_ERR_OR_NULL(path1)) {
-               msm_mdss->path[1] = path1;
-               msm_mdss->num_paths++;
+               msm_mdss->mdp_path[1] = path1;
+               msm_mdss->num_mdp_paths++;
        }
 
        return 0;
@@ -79,16 +79,16 @@ static void msm_mdss_put_icc_path(void *data)
        struct msm_mdss *msm_mdss = data;
        int i;
 
-       for (i = 0; i < msm_mdss->num_paths; i++)
-               icc_put(msm_mdss->path[i]);
+       for (i = 0; i < msm_mdss->num_mdp_paths; i++)
+               icc_put(msm_mdss->mdp_path[i]);
 }
 
 static void msm_mdss_icc_request_bw(struct msm_mdss *msm_mdss, unsigned long 
bw)
 {
        int i;
 
-       for (i = 0; i < msm_mdss->num_paths; i++)
-               icc_set_bw(msm_mdss->path[i], 0, Bps_to_icc(bw));
+       for (i = 0; i < msm_mdss->num_mdp_paths; i++)
+               icc_set_bw(msm_mdss->mdp_path[i], 0, Bps_to_icc(bw));
 }
 
 static void msm_mdss_irq(struct irq_desc *desc)

-- 
2.40.0

Reply via email to