Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a81fc37 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: sde: use high bandwidth threshold for crtc check"

parents 84f87add 14d6b4a3

msm/sde/sde_core_perf.c

+1 −28
Original line number Diff line number Diff line
@@ -81,28 +81,6 @@ static bool _sde_core_perf_crtc_is_power_on(struct drm_crtc *crtc) 
	return sde_crtc_is_enabled(crtc);

}



static bool _sde_core_video_mode_intf_connected(struct drm_crtc *crtc)

{

	struct drm_crtc *tmp_crtc;

	bool intf_connected = false;



	if (!crtc)

		goto end;



	drm_for_each_crtc(tmp_crtc, crtc->dev) {

		if ((sde_crtc_get_intf_mode(tmp_crtc) == INTF_MODE_VIDEO) &&

				_sde_core_perf_crtc_is_power_on(tmp_crtc)) {

			SDE_DEBUG("video interface connected crtc:%d\n",

				tmp_crtc->base.id);

			intf_connected = true;

			goto end;

		}

	}



end:

	return intf_connected;

}



static void _sde_core_perf_calc_crtc(struct sde_kms *kms,

		struct drm_crtc *crtc,

		struct drm_crtc_state *state,
@@ -199,7 +177,6 @@ int sde_core_perf_crtc_check(struct drm_crtc *crtc, 
	u32 bw, threshold;

	u64 bw_sum_of_intfs = 0;

	enum sde_crtc_client_type curr_client_type;

	bool is_video_mode;

	struct sde_crtc_state *sde_cstate;

	struct drm_crtc *tmp_crtc;

	struct sde_kms *kms;
@@ -252,11 +229,7 @@ int sde_core_perf_crtc_check(struct drm_crtc *crtc, 
		bw = DIV_ROUND_UP_ULL(bw_sum_of_intfs, 1000);

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



		is_video_mode = sde_crtc_get_intf_mode(crtc) == INTF_MODE_VIDEO;

		threshold = (is_video_mode ||

			_sde_core_video_mode_intf_connected(crtc)) ?

			kms->catalog->perf.max_bw_low :

			kms->catalog->perf.max_bw_high;

		threshold = kms->catalog->perf.max_bw_high;



		SDE_DEBUG("final threshold bw limit = %d\n", threshold);