Commit 764332bf authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: switch dpu_encoder to use atomic_mode_set 



Make dpu_encoder use atomic_mode_set to receive connector and CRTC
states as arguments rather than finding connector and CRTC by manually
looping through the respective lists.

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


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

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

+9 −28
Original line number Diff line number Diff line
@@ -927,16 +927,13 @@ static int dpu_encoder_resource_control(struct drm_encoder *drm_enc, 
	return 0;

}



static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,

				      struct drm_display_mode *mode,

				      struct drm_display_mode *adj_mode)

static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc,

					     struct drm_crtc_state *crtc_state,

					     struct drm_connector_state *conn_state)

{

	struct dpu_encoder_virt *dpu_enc;

	struct msm_drm_private *priv;

	struct dpu_kms *dpu_kms;

	struct list_head *connector_list;

	struct drm_connector *conn = NULL, *conn_iter;

	struct drm_crtc *drm_crtc;

	struct dpu_crtc_state *cstate;

	struct dpu_global_state *global_state;

	struct dpu_hw_blk *hw_pp[MAX_CHANNELS_PER_ENC];
@@ -956,7 +953,6 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, 


	priv = drm_enc->dev->dev_private;

	dpu_kms = to_dpu_kms(priv->kms);

	connector_list = &dpu_kms->dev->mode_config.connector_list;



	global_state = dpu_kms_get_existing_global_state(dpu_kms);

	if (IS_ERR_OR_NULL(global_state)) {
@@ -966,22 +962,6 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, 


	trace_dpu_enc_mode_set(DRMID(drm_enc));



	list_for_each_entry(conn_iter, connector_list, head)

		if (conn_iter->encoder == drm_enc)

			conn = conn_iter;



	if (!conn) {

		DPU_ERROR_ENC(dpu_enc, "failed to find attached connector\n");

		return;

	} else if (!conn->state) {

		DPU_ERROR_ENC(dpu_enc, "invalid connector state\n");

		return;

	}



	drm_for_each_crtc(drm_crtc, drm_enc->dev)

		if (drm_crtc->state->encoder_mask & drm_encoder_mask(drm_enc))

			break;



	/* Query resource that have been reserved in atomic check step. */

	num_pp = dpu_rm_get_assigned_resources(&dpu_kms->rm, global_state,

		drm_enc->base.id, DPU_HW_BLK_PINGPONG, hw_pp,
@@ -998,7 +978,7 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, 
		dpu_enc->hw_pp[i] = i < num_pp ? to_dpu_hw_pingpong(hw_pp[i])

						: NULL;



	cstate = to_dpu_crtc_state(drm_crtc->state);

	cstate = to_dpu_crtc_state(crtc_state);



	for (i = 0; i < num_lm; i++) {

		int ctl_idx = (i < num_ctl) ? i : (num_ctl-1);
@@ -1037,9 +1017,10 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, 
			return;

		}



		phys->connector = conn->state->connector;

		if (phys->ops.mode_set)

			phys->ops.mode_set(phys, mode, adj_mode);

		phys->connector = conn_state->connector;

		phys->cached_mode = crtc_state->adjusted_mode;

		if (phys->ops.atomic_mode_set)

			phys->ops.atomic_mode_set(phys, crtc_state, conn_state);

	}

}
@@ -2049,7 +2030,7 @@ static void dpu_encoder_frame_done_timeout(struct timer_list *t) 
}



static const struct drm_encoder_helper_funcs dpu_encoder_helper_funcs = {

	.mode_set = dpu_encoder_virt_mode_set,

	.atomic_mode_set = dpu_encoder_virt_atomic_mode_set,

	.disable = dpu_encoder_virt_disable,

	.enable = dpu_encoder_virt_enable,

	.atomic_check = dpu_encoder_virt_atomic_check,

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

+4 −4
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct dpu_encoder_virt_ops { 
 * @is_master:			Whether this phys_enc is the current master

 *				encoder. Can be switched at enable time. Based

 *				on split_role and current mode (CMD/VID).

 * @mode_set:			DRM Call. Set a DRM mode.

 * @atomic_mode_set:		DRM Call. Set a DRM mode.

 *				This likely caches the mode, for use at enable.

 * @enable:			DRM Call. Enable a DRM mode.

 * @disable:			DRM Call. Disable mode.
@@ -113,9 +113,9 @@ struct dpu_encoder_phys_ops { 
			struct dentry *debugfs_root);

	void (*prepare_commit)(struct dpu_encoder_phys *encoder);

	bool (*is_master)(struct dpu_encoder_phys *encoder);

	void (*mode_set)(struct dpu_encoder_phys *encoder,

			struct drm_display_mode *mode,

			struct drm_display_mode *adjusted_mode);

	void (*atomic_mode_set)(struct dpu_encoder_phys *encoder,

			struct drm_crtc_state *crtc_state,

			struct drm_connector_state *conn_state);

	void (*enable)(struct dpu_encoder_phys *encoder);

	void (*disable)(struct dpu_encoder_phys *encoder);

	int (*atomic_check)(struct dpu_encoder_phys *encoder,

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

+4 −14
Original line number Diff line number Diff line
@@ -135,23 +135,13 @@ static void dpu_encoder_phys_cmd_underrun_irq(void *arg, int irq_idx) 
			phys_enc);

}



static void dpu_encoder_phys_cmd_mode_set(

static void dpu_encoder_phys_cmd_atomic_mode_set(

		struct dpu_encoder_phys *phys_enc,

		struct drm_display_mode *mode,

		struct drm_display_mode *adj_mode)

		struct drm_crtc_state *crtc_state,

		struct drm_connector_state *conn_state)

{

	struct dpu_encoder_phys_cmd *cmd_enc =

		to_dpu_encoder_phys_cmd(phys_enc);

	struct dpu_encoder_irq *irq;



	if (!mode || !adj_mode) {

		DPU_ERROR("invalid args\n");

		return;

	}

	phys_enc->cached_mode = *adj_mode;

	DPU_DEBUG_CMDENC(cmd_enc, "caching mode:\n");

	drm_mode_debug_printmodeline(adj_mode);



	irq = &phys_enc->irq[INTR_IDX_CTL_START];

	irq->irq_idx = phys_enc->hw_ctl->caps->intr_start;
@@ -715,7 +705,7 @@ static void dpu_encoder_phys_cmd_init_ops( 
{

	ops->prepare_commit = dpu_encoder_phys_cmd_prepare_commit;

	ops->is_master = dpu_encoder_phys_cmd_is_master;

	ops->mode_set = dpu_encoder_phys_cmd_mode_set;

	ops->atomic_mode_set = dpu_encoder_phys_cmd_atomic_mode_set;

	ops->enable = dpu_encoder_phys_cmd_enable;

	ops->disable = dpu_encoder_phys_cmd_disable;

	ops->destroy = dpu_encoder_phys_cmd_destroy;

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

+4 −10
Original line number Diff line number Diff line
@@ -348,19 +348,13 @@ static bool dpu_encoder_phys_vid_needs_single_flush( 
	return phys_enc->split_role != ENC_ROLE_SOLO;

}



static void dpu_encoder_phys_vid_mode_set(

static void dpu_encoder_phys_vid_atomic_mode_set(

		struct dpu_encoder_phys *phys_enc,

		struct drm_display_mode *mode,

		struct drm_display_mode *adj_mode)

		struct drm_crtc_state *crtc_state,

		struct drm_connector_state *conn_state)

{

	struct dpu_encoder_irq *irq;



	if (adj_mode) {

		phys_enc->cached_mode = *adj_mode;

		drm_mode_debug_printmodeline(adj_mode);

		DPU_DEBUG_VIDENC(phys_enc, "caching mode:\n");

	}



	irq = &phys_enc->irq[INTR_IDX_VSYNC];

	irq->irq_idx = phys_enc->hw_intf->cap->intr_vsync;
@@ -655,7 +649,7 @@ static int dpu_encoder_phys_vid_get_frame_count( 
static void dpu_encoder_phys_vid_init_ops(struct dpu_encoder_phys_ops *ops)

{

	ops->is_master = dpu_encoder_phys_vid_is_master;

	ops->mode_set = dpu_encoder_phys_vid_mode_set;

	ops->atomic_mode_set = dpu_encoder_phys_vid_atomic_mode_set;

	ops->enable = dpu_encoder_phys_vid_enable;

	ops->disable = dpu_encoder_phys_vid_disable;

	ops->destroy = dpu_encoder_phys_vid_destroy;