drm/msm/dpu: handle perf mode in _dpu_core_perf_crtc_update_bus()

Move perf mode handling for the bandwidth to
_dpu_core_perf_crtc_update_bus() rather than overriding per-CRTC data
and then aggregating known values.

Note, this changes the fix_core_ab_vote. Previously it would be
multiplied per the CRTC number, now it will be used directly for
interconnect voting. This better reflects user requirements in the case
of different resolutions being set on different CRTCs: instead of using
the same bandwidth for each CRTC (which is incorrect) user can now
calculate overall bandwidth required by all outputs and use that value.

Note #2: this also disables threshold checks for user-entered bandwidth
values. First of all, it doesn't make sense to fail atomic commits
because of the debugfs input. Compositors have no way to correlate
failing commits with debugfs settings. Second, it makes sense to allow
users to go beyond these values and check whether this makes any
difference or fixes the issue.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/636072/
Link: https://lore.kernel.org/r/20250209-dpu-perf-rework-v5-8-87e936cf3004@linaro.org

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 c8e20be08aa83c8bdd70065643b46676eeed610f..7ff3405c6867556a8dc776783b91f1da6c86ef3f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c
@@ -118,20 +118,9 @@ static void _dpu_core_perf_calc_crtc(const struct dpu_core_perf *core_perf,
                return;
        }
 
-       memset(perf, 0, sizeof(struct dpu_core_perf_params));
-
-       if (core_perf->perf_tune.mode == DPU_PERF_MODE_MINIMUM) {
-               perf->bw_ctl = 0;
-               perf->max_per_pipe_ib = 0;
-       } else if (core_perf->perf_tune.mode == DPU_PERF_MODE_FIXED) {
-               perf->bw_ctl = core_perf->fix_core_ab_vote * 1000ULL;
-               perf->max_per_pipe_ib = core_perf->fix_core_ib_vote;
-       } else {
-               perf->bw_ctl = _dpu_core_perf_calc_bw(perf_cfg, crtc);
-               perf->max_per_pipe_ib = perf_cfg->min_dram_ib;
-       }
+       perf->bw_ctl = _dpu_core_perf_calc_bw(perf_cfg, crtc);
+       perf->max_per_pipe_ib = perf_cfg->min_dram_ib;
        perf->core_clk_rate = _dpu_core_perf_calc_clk(perf_cfg, crtc, state);
-
        DRM_DEBUG_ATOMIC(
                "crtc=%d clk_rate=%llu core_ib=%u core_ab=%u\n",
                        crtc->base.id, perf->core_clk_rate,
@@ -220,18 +209,29 @@ static int _dpu_core_perf_crtc_update_bus(struct dpu_kms *kms,
 {
        struct dpu_core_perf_params perf = { 0 };
        int i, ret = 0;
-       u64 avg_bw;
+       u32 avg_bw;
+       u32 peak_bw;
 
        if (!kms->num_paths)
                return 0;
 
-       dpu_core_perf_aggregate(crtc->dev, dpu_crtc_get_client_type(crtc), &perf);
+       if (kms->perf.perf_tune.mode == DPU_PERF_MODE_MINIMUM) {
+               avg_bw = 0;
+               peak_bw = 0;
+       } else if (kms->perf.perf_tune.mode == DPU_PERF_MODE_FIXED) {
+               avg_bw = kms->perf.fix_core_ab_vote;
+               peak_bw = kms->perf.fix_core_ib_vote;
+       } else {
+               dpu_core_perf_aggregate(crtc->dev, dpu_crtc_get_client_type(crtc), &perf);
+
+               avg_bw = div_u64(perf.bw_ctl, 1000); /*Bps_to_icc*/
+               peak_bw = perf.max_per_pipe_ib;
+       }
 
-       avg_bw = perf.bw_ctl;
-       do_div(avg_bw, (kms->num_paths * 1000)); /*Bps_to_icc*/
+       avg_bw /= kms->num_paths;
 
        for (i = 0; i < kms->num_paths; i++)
-               icc_set_bw(kms->path[i], avg_bw, perf.max_per_pipe_ib);
+               icc_set_bw(kms->path[i], avg_bw, peak_bw);
 
        return ret;
 }