Commit 3804a982 authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm/dpu: Further cleanups for static inline functions 



Remove more static inline functions that are lightly used and/or
very simple and easy to build into the calling functions.

v3: Fix a nit from Sean Paul
v2: Removed another unused function from dpu_hw_lm.c and add back
dpu_crtc_get_client_type() since there was a question regarding
its usefulness.

Reviewed-by: default avatarSean Paul <sean@poorly.run>
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 3d688410

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

+3 −9
Original line number Diff line number Diff line
@@ -46,12 +46,6 @@ 
#define LEFT_MIXER 0

#define RIGHT_MIXER 1



static inline int _dpu_crtc_get_mixer_width(struct dpu_crtc_state *cstate,

					    struct drm_display_mode *mode)

{

	return mode->hdisplay / cstate->num_mixers;

}



static struct dpu_kms *_dpu_crtc_get_kms(struct drm_crtc *crtc)

{

	struct msm_drm_private *priv = crtc->dev->dev_private;
@@ -497,7 +491,7 @@ static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc, 
{

	struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);

	struct drm_display_mode *adj_mode = &state->adjusted_mode;

	u32 crtc_split_width = _dpu_crtc_get_mixer_width(cstate, adj_mode);

	u32 crtc_split_width = adj_mode->hdisplay / cstate->num_mixers;

	int i;



	for (i = 0; i < cstate->num_mixers; i++) {
@@ -952,7 +946,7 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, 


	memset(pipe_staged, 0, sizeof(pipe_staged));



	mixer_width = _dpu_crtc_get_mixer_width(cstate, mode);

	mixer_width = mode->hdisplay / cstate->num_mixers;



	_dpu_crtc_setup_lm_bounds(crtc, state);
@@ -1193,7 +1187,7 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data) 
	cstate = to_dpu_crtc_state(crtc->state);



	mode = &crtc->state->adjusted_mode;

	out_width = _dpu_crtc_get_mixer_width(cstate, mode);

	out_width = mode->hdisplay / cstate->num_mixers;



	seq_printf(s, "crtc:%d width:%d height:%d\n", crtc->base.id,

				mode->hdisplay, mode->vdisplay);

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

+0 −10
Original line number Diff line number Diff line
@@ -226,16 +226,6 @@ struct dpu_crtc_state { 
#define to_dpu_crtc_state(x) \

	container_of(x, struct dpu_crtc_state, base)



/**

 * dpu_crtc_state_is_stereo - Is crtc virtualized with two mixers?

 * @cstate: Pointer to dpu crtc state

 * @Return: true - has two mixers, false - has one mixer

 */

static inline bool dpu_crtc_state_is_stereo(struct dpu_crtc_state *cstate)

{

	return cstate->num_mixers == CRTC_DUAL_MIXERS;

}



/**

 * dpu_crtc_frame_pending - retun the number of pending frames

 * @crtc: Pointer to drm crtc object

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

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static inline enum dpu_3d_blend_mode dpu_encoder_helper_get_3d_blend_mode( 
	dpu_cstate = to_dpu_crtc_state(phys_enc->parent->crtc->state);



	if (phys_enc->split_role == ENC_ROLE_SOLO &&

	    dpu_crtc_state_is_stereo(dpu_cstate))

	    dpu_cstate->num_mixers == CRTC_DUAL_MIXERS)

		return BLEND_3D_H_ROW_INT;



	return BLEND_3D_NONE;

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

+2 −9
Original line number Diff line number Diff line
@@ -44,14 +44,7 @@ 


#define DPU_ENC_WR_PTR_START_TIMEOUT_US 20000



static inline int _dpu_encoder_phys_cmd_get_idle_timeout(

		struct dpu_encoder_phys_cmd *cmd_enc)

{

	return KICKOFF_TIMEOUT_MS;

}



static inline bool dpu_encoder_phys_cmd_is_master(

		struct dpu_encoder_phys *phys_enc)

static bool dpu_encoder_phys_cmd_is_master(struct dpu_encoder_phys *phys_enc)

{

	return (phys_enc->split_role != ENC_ROLE_SLAVE) ? true : false;

}
@@ -723,7 +716,7 @@ static int dpu_encoder_phys_cmd_wait_for_vblank( 


	wait_info.wq = &cmd_enc->pending_vblank_wq;

	wait_info.atomic_cnt = &cmd_enc->pending_vblank_cnt;

	wait_info.timeout_ms = _dpu_encoder_phys_cmd_get_idle_timeout(cmd_enc);

	wait_info.timeout_ms = KICKOFF_TIMEOUT_MS;



	atomic_inc(&cmd_enc->pending_vblank_cnt);

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

+0 −9
Original line number Diff line number Diff line
@@ -736,13 +736,4 @@ struct dpu_mdss_cfg *dpu_hw_catalog_init(u32 hw_rev); 
 */

void dpu_hw_catalog_deinit(struct dpu_mdss_cfg *dpu_cfg);



/**

 * dpu_hw_sspp_multirect_enabled - check multirect enabled for the sspp

 * @cfg:          pointer to sspp cfg

 */

static inline bool dpu_hw_sspp_multirect_enabled(const struct dpu_sspp_cfg *cfg)

{

	return test_bit(DPU_SSPP_SMART_DMA_V1, &cfg->features) ||

			 test_bit(DPU_SSPP_SMART_DMA_V2, &cfg->features);

}

#endif /* _DPU_HW_CATALOG_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE