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.dybcio@xxxxxxxxxx>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 10 +++++-----
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 12 ++++++------
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c
index 1d9d83d7b99e..349c6cb3301d 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c
@@ -230,18 +230,18 @@ static int _dpu_core_perf_crtc_update_bus(struct dpu_kms *kms,
DRM_DEBUG_ATOMIC("crtc=%d bw=%llu paths:%d\n",
tmp_crtc->base.id,
- dpu_cstate->new_perf.bw_ctl, kms->num_paths);
+ dpu_cstate->new_perf.bw_ctl, kms->num_mdp_paths);
}
}
- if (!kms->num_paths)
+ if (!kms->num_mdp_paths)
return 0;
avg_bw = perf.bw_ctl;
- do_div(avg_bw, (kms->num_paths * 1000)); /*Bps_to_icc*/
+ do_div(avg_bw, (kms->num_mdp_paths * 1000)); /*Bps_to_icc*/
- for (i = 0; i < kms->num_paths; i++)
- icc_set_bw(kms->path[i], avg_bw, perf.max_per_pipe_ib);
+ for (i = 0; i < kms->num_mdp_paths; i++)
+ icc_set_bw(kms->mdp_path[i], avg_bw, perf.max_per_pipe_ib);
return ret;
}
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 0e7a68714e9e..dd6c1c40ab9e 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -397,12 +397,12 @@ static int dpu_kms_parse_data_bus_icc_path(struct dpu_kms *dpu_kms)
if (IS_ERR_OR_NULL(path0))
return PTR_ERR_OR_ZERO(path0);
- dpu_kms->path[0] = path0;
- dpu_kms->num_paths = 1;
+ dpu_kms->mdp_path[0] = path0;
+ dpu_kms->num_mdp_paths = 1;
if (!IS_ERR_OR_NULL(path1)) {
- dpu_kms->path[1] = path1;
- dpu_kms->num_paths++;
+ dpu_kms->mdp_path[1] = path1;
+ dpu_kms->num_mdp_paths++;
}
return 0;
}
@@ -1238,8 +1238,8 @@ static int __maybe_unused dpu_runtime_suspend(struct device *dev)
dev_pm_opp_set_rate(dev, 0);
clk_bulk_disable_unprepare(dpu_kms->num_clocks, dpu_kms->clocks);
- for (i = 0; i < dpu_kms->num_paths; i++)
- icc_set_bw(dpu_kms->path[i], 0, 0);
+ for (i = 0; i < dpu_kms->num_mdp_paths; i++)
+ icc_set_bw(dpu_kms->mdp_path[i], 0, 0);
return 0;
}
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
index aca39a4689f4..d5d9bec90705 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
@@ -109,8 +109,8 @@ struct dpu_kms {
* when disabled.
*/
atomic_t bandwidth_ref;
- struct icc_path *path[2];
- u32 num_paths;
+ struct icc_path *mdp_path[2];
+ u32 num_mdp_paths;
};
struct vsync_info {
--
2.40.0
