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

Commit 9c48fc49 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: convert rm to use common sde_hw_blk base"

parents 63006717 f82d7b9f

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

+7 −10
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ struct sde_rm_hw_blk { 
	struct sde_rm_rsvp *rsvp_nxt;

	enum sde_hw_blk_type type;

	uint32_t id;

	void *hw;

	struct sde_hw_blk *hw;

};



/**
@@ -546,8 +546,7 @@ static bool _sde_rm_check_lm_and_get_connected_blks( 
		struct sde_rm_hw_blk **pp,

		struct sde_rm_hw_blk *primary_lm)

{

	const struct sde_lm_cfg *lm_cfg =

			((struct sde_hw_mixer *)(lm->hw))->cap;

	const struct sde_lm_cfg *lm_cfg = to_sde_hw_mixer(lm->hw)->cap;

	const struct sde_pingpong_cfg *pp_cfg;

	struct sde_rm_hw_iter iter;
@@ -560,7 +559,7 @@ static bool _sde_rm_check_lm_and_get_connected_blks( 
	/* Check if this layer mixer is a peer of the proposed primary LM */

	if (primary_lm) {

		const struct sde_lm_cfg *prim_lm_cfg =

				((struct sde_hw_mixer *)(primary_lm->hw))->cap;

				to_sde_hw_mixer(primary_lm->hw)->cap;



		if (!test_bit(lm_cfg->id, &prim_lm_cfg->lm_pair_mask)) {

			SDE_DEBUG("lm %d not peer of lm %d\n", lm_cfg->id,
@@ -626,7 +625,7 @@ static bool _sde_rm_check_lm_and_get_connected_blks( 
		return false;

	}



	pp_cfg = ((struct sde_hw_pingpong *)((*pp)->hw))->caps;

	pp_cfg = to_sde_hw_pingpong((*pp)->hw)->caps;

	if ((reqs->topology->top_name == SDE_RM_TOPOLOGY_PPSPLIT) &&

			!(test_bit(SDE_PINGPONG_SPLIT, &pp_cfg->features))) {

		SDE_DEBUG("pp %d doesn't support ppsplit\n", pp_cfg->id);
@@ -715,7 +714,7 @@ static int _sde_rm_reserve_lms( 
		sde_rm_init_hw_iter(&iter_i, 0, SDE_HW_BLK_PINGPONG);

		while (_sde_rm_get_hw_locked(rm, &iter_i)) {

			const struct sde_hw_pingpong *pp =

				(struct sde_hw_pingpong *)(iter_i.blk->hw);

					to_sde_hw_pingpong(iter_i.blk->hw);

			const struct sde_pingpong_cfg *pp_cfg = pp->caps;



			if (!(test_bit(SDE_PINGPONG_SLAVE, &pp_cfg->features)))
@@ -745,8 +744,7 @@ static int _sde_rm_reserve_ctls( 


	sde_rm_init_hw_iter(&iter, 0, SDE_HW_BLK_CTL);

	while (_sde_rm_get_hw_locked(rm, &iter)) {

		const struct sde_hw_ctl *ctl =

				(struct sde_hw_ctl *)(iter.blk->hw);

		const struct sde_hw_ctl *ctl = to_sde_hw_ctl(iter.blk->hw);

		unsigned long features = ctl->caps->features;

		bool has_split_display, has_ppsplit;
@@ -823,8 +821,7 @@ static int _sde_rm_reserve_cdm( 


	sde_rm_init_hw_iter(&iter, 0, SDE_HW_BLK_CDM);

	while (_sde_rm_get_hw_locked(rm, &iter)) {

		const struct sde_hw_cdm *cdm =

				(struct sde_hw_cdm *)(iter.blk->hw);

		const struct sde_hw_cdm *cdm = to_sde_hw_cdm(iter.blk->hw);

		const struct sde_cdm_cfg *caps = cdm->caps;

		bool match = false;