Commit 795aef6f authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: remove duplicate code calculating sum of bandwidths 



The code in dpu_core_perf_crtc_check() mostly duplicates code in
dpu_core_perf_aggregate(). Remove the duplication by reusing the latter
function.

Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/636059/
Link: https://lore.kernel.org/r/20250209-dpu-perf-rework-v5-2-87e936cf3004@linaro.org
parent b9aedd32

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c

+38 −56
Original line number Diff line number Diff line
@@ -140,6 +140,30 @@ static void _dpu_core_perf_calc_crtc(const struct dpu_core_perf *core_perf, 
			perf->max_per_pipe_ib, perf->bw_ctl);

}



static void dpu_core_perf_aggregate(struct drm_device *ddev,

				    enum dpu_crtc_client_type curr_client_type,

				    struct dpu_core_perf_params *perf)

{

	struct dpu_crtc_state *dpu_cstate;

	struct drm_crtc *tmp_crtc;



	drm_for_each_crtc(tmp_crtc, ddev) {

		if (tmp_crtc->enabled &&

		    curr_client_type == dpu_crtc_get_client_type(tmp_crtc)) {

			dpu_cstate = to_dpu_crtc_state(tmp_crtc->state);



			perf->max_per_pipe_ib = max(perf->max_per_pipe_ib,

						    dpu_cstate->new_perf.max_per_pipe_ib);



			perf->bw_ctl += dpu_cstate->new_perf.bw_ctl;



			DRM_DEBUG_ATOMIC("crtc=%d bw=%llu\n",

					 tmp_crtc->base.id,

					 dpu_cstate->new_perf.bw_ctl);

		}

	}

}



/**

 * dpu_core_perf_crtc_check - validate performance of the given crtc state

 * @crtc: Pointer to crtc
@@ -150,11 +174,9 @@ int dpu_core_perf_crtc_check(struct drm_crtc *crtc, 
		struct drm_crtc_state *state)

{

	u32 bw, threshold;

	u64 bw_sum_of_intfs = 0;

	enum dpu_crtc_client_type curr_client_type;

	struct dpu_crtc_state *dpu_cstate;

	struct drm_crtc *tmp_crtc;

	struct dpu_kms *kms;

	struct dpu_core_perf_params perf;



	if (!crtc || !state) {

		DPU_ERROR("invalid crtc\n");
@@ -172,25 +194,10 @@ int dpu_core_perf_crtc_check(struct drm_crtc *crtc, 
	/* obtain new values */

	_dpu_core_perf_calc_crtc(&kms->perf, crtc, state, &dpu_cstate->new_perf);



	bw_sum_of_intfs = dpu_cstate->new_perf.bw_ctl;

	curr_client_type = dpu_crtc_get_client_type(crtc);



	drm_for_each_crtc(tmp_crtc, crtc->dev) {

		if (tmp_crtc->enabled &&

		    dpu_crtc_get_client_type(tmp_crtc) == curr_client_type &&

		    tmp_crtc != crtc) {

			struct dpu_crtc_state *tmp_cstate =

				to_dpu_crtc_state(tmp_crtc->state);



			DRM_DEBUG_ATOMIC("crtc:%d bw:%llu ctrl:%d\n",

					 tmp_crtc->base.id, tmp_cstate->new_perf.bw_ctl,

					 tmp_cstate->bw_control);



			bw_sum_of_intfs += tmp_cstate->new_perf.bw_ctl;

		}

	dpu_core_perf_aggregate(crtc->dev, dpu_crtc_get_client_type(crtc), &perf);



	/* convert bandwidth to kb */

		bw = DIV_ROUND_UP_ULL(bw_sum_of_intfs, 1000);

	bw = DIV_ROUND_UP_ULL(perf.bw_ctl, 1000);

	DRM_DEBUG_ATOMIC("calculated bandwidth=%uk\n", bw);



	threshold = kms->perf.perf_cfg->max_bw_high;
@@ -205,35 +212,10 @@ int dpu_core_perf_crtc_check(struct drm_crtc *crtc, 
				threshold);

		return -E2BIG;

	}

	}



	return 0;

}



static void dpu_core_perf_aggregate(struct drm_device *ddev,

				    enum dpu_crtc_client_type curr_client_type,

				    struct dpu_core_perf_params *perf)

{

	struct dpu_crtc_state *dpu_cstate;

	struct drm_crtc *tmp_crtc;



	drm_for_each_crtc(tmp_crtc, ddev) {

		if (tmp_crtc->enabled &&

		    curr_client_type == dpu_crtc_get_client_type(tmp_crtc)) {

			dpu_cstate = to_dpu_crtc_state(tmp_crtc->state);



			perf->max_per_pipe_ib = max(perf->max_per_pipe_ib,

						    dpu_cstate->new_perf.max_per_pipe_ib);



			perf->bw_ctl += dpu_cstate->new_perf.bw_ctl;



			DRM_DEBUG_ATOMIC("crtc=%d bw=%llu\n",

					 tmp_crtc->base.id,

					 dpu_cstate->new_perf.bw_ctl);

		}

	}

}



static int _dpu_core_perf_crtc_update_bus(struct dpu_kms *kms,

					  struct drm_crtc *crtc)

{