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

Commit 758f28b9 authored by Chandan Uddaraju's avatar Chandan Uddaraju Committed by Gerrit - the friendly Code Review server
Browse files

drm/msm/sde: update Resource manager with specific resource IDs 



For cont-splash feature, the LMs, CTLs and DSC blocks that are
configured in bootloader need to be reused. Add support
to RM APIs so that we can specify resource IDs for each MDP
resource so that the specified resources can be allocated
instead of using the default resources.

Change-Id: Ie1c35c5f7a48b09662a9492c90d786f3f780e879
Signed-off-by: default avatarChandan Uddaraju <chandanu@codeaurora.org>
parent 9bb109a6

drivers/gpu/drm/msm/sde/sde_rm.c

+43 −8
Original line number Diff line number Diff line
@@ -714,7 +714,8 @@ static bool _sde_rm_check_lm_and_get_connected_blks( 
static int _sde_rm_reserve_lms(

		struct sde_rm *rm,

		struct sde_rm_rsvp *rsvp,

		struct sde_rm_requirements *reqs)

		struct sde_rm_requirements *reqs,

		u8 *_lm_ids)



{

	struct sde_rm_hw_blk *lm[MAX_BLOCKS];
@@ -742,6 +743,14 @@ static int _sde_rm_reserve_lms( 
		lm_count = 0;

		lm[lm_count] = iter_i.blk;



		SDE_DEBUG("blk id = %d, _lm_ids[%d] = %d\n",

			iter_i.blk->id,

			lm_count,

			_lm_ids ? _lm_ids[lm_count] : -1);



		if (_lm_ids && (lm[lm_count])->id != _lm_ids[lm_count])

			continue;



		if (!_sde_rm_check_lm_and_get_connected_blks(

				rm, rsvp, reqs, lm[lm_count],

				&dspp[lm_count], &ds[lm_count],
@@ -765,6 +774,14 @@ static int _sde_rm_reserve_lms( 
				continue;



			lm[lm_count] = iter_j.blk;

			SDE_DEBUG("blk id = %d, _lm_ids[%d] = %d\n",

				iter_i.blk->id,

				lm_count,

				_lm_ids ? _lm_ids[lm_count] : -1);



			if (_lm_ids && (lm[lm_count])->id != _lm_ids[lm_count])

				continue;



			++lm_count;

		}

	}
@@ -818,7 +835,8 @@ static int _sde_rm_reserve_ctls( 
		struct sde_rm *rm,

		struct sde_rm_rsvp *rsvp,

		struct sde_rm_requirements *reqs,

		const struct sde_rm_topology_def *top)

		const struct sde_rm_topology_def *top,

		u8 *_ctl_ids)

{

	struct sde_rm_hw_blk *ctls[MAX_BLOCKS];

	struct sde_rm_hw_iter iter;
@@ -860,6 +878,14 @@ static int _sde_rm_reserve_ctls( 
		}



		ctls[i] = iter.blk;



		SDE_DEBUG("blk id = %d, _ctl_ids[%d] = %d\n",

			iter.blk->id, i,

			_ctl_ids ? _ctl_ids[i] : -1);



		if (_ctl_ids && (ctls[i]->id != _ctl_ids[i]))

			continue;



		SDE_DEBUG("ctl %d match\n", iter.blk->id);



		if (++i == top->num_ctl)
@@ -880,7 +906,8 @@ static int _sde_rm_reserve_ctls( 
static int _sde_rm_reserve_dsc(

		struct sde_rm *rm,

		struct sde_rm_rsvp *rsvp,

		const struct sde_rm_topology_def *top)

		const struct sde_rm_topology_def *top,

		u8 *_dsc_ids)

{

	struct sde_rm_hw_iter iter;

	int alloc_count = 0;
@@ -895,6 +922,14 @@ static int _sde_rm_reserve_dsc( 
		if (RESERVED_BY_OTHER(iter.blk, rsvp))

			continue;



		SDE_DEBUG("blk id = %d, _dsc_ids[%d] = %d\n",

			iter.blk->id,

			alloc_count,

			_dsc_ids ? _dsc_ids[alloc_count] : -1);



		if (_dsc_ids && (iter.blk->id != _dsc_ids[alloc_count]))

			continue;



		iter.blk->rsvp_nxt = rsvp;

		SDE_EVT32(iter.blk->type, rsvp->enc_id, iter.blk->id);
@@ -1043,10 +1078,10 @@ static int _sde_rm_make_next_rsvp( 
	 * - Check mixers without DSPPs

	 * - Only then allow to grab from mixers with DSPP capability

	 */

	ret = _sde_rm_reserve_lms(rm, rsvp, reqs);

	ret = _sde_rm_reserve_lms(rm, rsvp, reqs, NULL);

	if (ret && !RM_RQ_DSPP(reqs)) {

		reqs->top_ctrl |= BIT(SDE_RM_TOPCTL_DSPP);

		ret = _sde_rm_reserve_lms(rm, rsvp, reqs);

		ret = _sde_rm_reserve_lms(rm, rsvp, reqs, NULL);

	}



	if (ret) {
@@ -1059,11 +1094,11 @@ static int _sde_rm_make_next_rsvp( 
	 * - Check mixers without Split Display

	 * - Only then allow to grab from CTLs with split display capability

	 */

	_sde_rm_reserve_ctls(rm, rsvp, reqs, reqs->topology);

	_sde_rm_reserve_ctls(rm, rsvp, reqs, reqs->topology, NULL);

	if (ret && !reqs->topology->needs_split_display) {

		memcpy(&topology, reqs->topology, sizeof(topology));

		topology.needs_split_display = true;

		_sde_rm_reserve_ctls(rm, rsvp, reqs, &topology);

		_sde_rm_reserve_ctls(rm, rsvp, reqs, &topology, NULL);

	}

	if (ret) {

		SDE_ERROR("unable to find appropriate CTL\n");
@@ -1075,7 +1110,7 @@ static int _sde_rm_make_next_rsvp( 
	if (ret)

		return ret;



	ret = _sde_rm_reserve_dsc(rm, rsvp, reqs->topology);

	ret = _sde_rm_reserve_dsc(rm, rsvp, reqs->topology, NULL);

	if (ret)

		return ret;