Commit ee216bd1 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: drop unused lm_max_width from RM 



No code uses lm_max_width from resource manager, so drop it. Instead of
calculating the lm_max_width, code can use max_mixer_width field from
the hw catalog.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Link: https://lore.kernel.org/r/20220121210618.3482550-2-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 03490e11

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

+0 −12
Original line number Diff line number Diff line
@@ -114,18 +114,6 @@ int dpu_rm_init(struct dpu_rm *rm, 
			goto fail;

		}

		rm->mixer_blks[lm->id - LM_0] = &hw->base;



		if (!rm->lm_max_width) {

			rm->lm_max_width = lm->sblk->maxwidth;

		} else if (rm->lm_max_width != lm->sblk->maxwidth) {

			/*

			 * Don't expect to have hw where lm max widths differ.

			 * If found, take the min.

			 */

			DPU_ERROR("unsupported: lm maxwidth differs\n");

			if (rm->lm_max_width > lm->sblk->maxwidth)

				rm->lm_max_width = lm->sblk->maxwidth;

		}

	}



	for (i = 0; i < cat->merge_3d_count; i++) {

drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h

+0 −4
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ struct dpu_global_state; 
 * @ctl_blks: array of ctl hardware resources

 * @intf_blks: array of intf hardware resources

 * @dspp_blks: array of dspp hardware resources

 * @lm_max_width: cached layer mixer maximum width

 * @rm_lock: resource manager mutex

 */

struct dpu_rm {

	struct dpu_hw_blk *pingpong_blks[PINGPONG_MAX - PINGPONG_0];
@@ -30,8 +28,6 @@ struct dpu_rm { 
	struct dpu_hw_blk *intf_blks[INTF_MAX - INTF_0];

	struct dpu_hw_blk *dspp_blks[DSPP_MAX - DSPP_0];

	struct dpu_hw_blk *merge_3d_blks[MERGE_3D_MAX - MERGE_3D_0];



	uint32_t lm_max_width;

};



/**