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

Commit 4212dd40 authored by Alan Kwong's avatar Alan Kwong Committed by Gerrit - the friendly Code Review server
Browse files

drm/msm/sde: allow writeback to support null fb 



Allow writeback to support null fb so that user mode
can perform null commit to select drm mode for
topology determination.

Change-Id: I505f26da2555531a63e93a99cdfe49e5c01bce90
Signed-off-by: default avatarAlan Kwong <akwong@codeaurora.org>
parent b1bca60c

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

+17 −3
Original line number Diff line number Diff line
@@ -2399,8 +2399,8 @@ static inline void _sde_encoder_trigger_flush(struct drm_encoder *drm_enc, 
	}



	ctl = phys->hw_ctl;

	if (!ctl || !ctl->ops.trigger_flush) {

		SDE_ERROR("missing trigger cb\n");

	if (!ctl || !phys->ops.trigger_flush) {

		SDE_ERROR("missing ctl/trigger cb\n");

		return;

	}
@@ -2420,7 +2420,7 @@ static inline void _sde_encoder_trigger_flush(struct drm_encoder *drm_enc, 
	if (extra_flush_bits && ctl->ops.update_pending_flush)

		ctl->ops.update_pending_flush(ctl, extra_flush_bits);



	ctl->ops.trigger_flush(ctl);

	phys->ops.trigger_flush(phys);



	if (ctl->ops.get_pending_flush)

		SDE_EVT32(DRMID(drm_enc), phys->intf_idx, pending_kickoff_cnt,
@@ -2460,6 +2460,20 @@ static inline void _sde_encoder_trigger_start(struct sde_encoder_phys *phys) 
		phys->ops.trigger_start(phys);

}



void sde_encoder_helper_trigger_flush(struct sde_encoder_phys *phys_enc)

{

	struct sde_hw_ctl *ctl;



	if (!phys_enc) {

		SDE_ERROR("invalid encoder\n");

		return;

	}



	ctl = phys_enc->hw_ctl;

	if (ctl && ctl->ops.trigger_flush)

		ctl->ops.trigger_flush(ctl);

}



void sde_encoder_helper_trigger_start(struct sde_encoder_phys *phys_enc)

{

	struct sde_hw_ctl *ctl;

drivers/gpu/drm/msm/sde/sde_encoder_phys.h

+10 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ struct sde_encoder_virt_ops { 
 * @prepare_for_kickoff:	Do any work necessary prior to a kickoff

 *				For CMD encoder, may wait for previous tx done

 * @handle_post_kickoff:	Do any work necessary post-kickoff work

 * @trigger_flush:		Process flush event on physical encoder

 * @trigger_start:		Process start event on physical encoder

 * @needs_single_flush:		Whether encoder slaves need to be flushed

 * @setup_misr:		Sets up MISR, enable and disables based on sysfs
@@ -160,6 +161,7 @@ struct sde_encoder_phys_ops { 
	void (*prepare_for_kickoff)(struct sde_encoder_phys *phys_enc,

			struct sde_encoder_kickoff_params *params);

	void (*handle_post_kickoff)(struct sde_encoder_phys *phys_enc);

	void (*trigger_flush)(struct sde_encoder_phys *phys_enc);

	void (*trigger_start)(struct sde_encoder_phys *phys_enc);

	bool (*needs_single_flush)(struct sde_encoder_phys *phys_enc);
@@ -462,6 +464,14 @@ void sde_encoder_phys_setup_cdm(struct sde_encoder_phys *phys_enc, 
		struct drm_framebuffer *fb, const struct sde_format *format,

		struct sde_rect *wb_roi);



/**

 * sde_encoder_helper_trigger_flush - control flush helper function

 *	This helper function may be optionally specified by physical

 *	encoders if they require ctl_flush triggering.

 * @phys_enc: Pointer to physical encoder structure

 */

void sde_encoder_helper_trigger_flush(struct sde_encoder_phys *phys_enc);



/**

 * sde_encoder_helper_trigger_start - control start helper function

 *	This helper function may be optionally specified by physical

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

+1 −0
Original line number Diff line number Diff line
@@ -1254,6 +1254,7 @@ static void sde_encoder_phys_cmd_init_ops( 
	ops->prepare_for_kickoff = sde_encoder_phys_cmd_prepare_for_kickoff;

	ops->wait_for_tx_complete = sde_encoder_phys_cmd_wait_for_tx_complete;

	ops->wait_for_vblank = sde_encoder_phys_cmd_wait_for_vblank;

	ops->trigger_flush = sde_encoder_helper_trigger_flush;

	ops->trigger_start = sde_encoder_phys_cmd_trigger_start;

	ops->needs_single_flush = sde_encoder_phys_cmd_needs_single_flush;

	ops->hw_reset = sde_encoder_helper_hw_reset;

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

+1 −0
Original line number Diff line number Diff line
@@ -942,6 +942,7 @@ static void sde_encoder_phys_vid_init_ops(struct sde_encoder_phys_ops *ops) 
	ops->needs_single_flush = sde_encoder_phys_vid_needs_single_flush;

	ops->setup_misr = sde_encoder_phys_vid_setup_misr;

	ops->collect_misr = sde_encoder_phys_vid_collect_misr;

	ops->trigger_flush = sde_encoder_helper_trigger_flush;

	ops->hw_reset = sde_encoder_helper_hw_reset;

	ops->get_line_count = sde_encoder_phys_vid_get_line_count;

}

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

+46 −16
Original line number Diff line number Diff line
@@ -458,10 +458,11 @@ static int sde_encoder_phys_wb_atomic_check( 
	SDE_DEBUG("[roi:%u,%u,%u,%u]\n", wb_roi.x, wb_roi.y,

			wb_roi.w, wb_roi.h);



	/* bypass check if commit with no framebuffer */

	fb = sde_wb_connector_state_get_output_fb(conn_state);

	if (!fb) {

		SDE_ERROR("no output framebuffer\n");

		return -EINVAL;

		SDE_DEBUG("no output framebuffer\n");

		return 0;

	}



	SDE_DEBUG("[fb_id:%u][fb:%u,%u]\n", fb->base.id,
@@ -847,7 +848,14 @@ static int sde_encoder_phys_wb_wait_for_commit_done( 
		return -EWOULDBLOCK;

	}



	SDE_EVT32(DRMID(phys_enc->parent), WBID(wb_enc), wb_enc->frame_count);

	SDE_EVT32(DRMID(phys_enc->parent), WBID(wb_enc), wb_enc->frame_count,

			!!wb_enc->wb_fb);



	/* signal completion if commit with no framebuffer */

	if (!wb_enc->wb_fb) {

		SDE_DEBUG("no output framebuffer\n");

		sde_encoder_phys_wb_done_irq(wb_enc, wb_enc->irq_idx);

	}



	ret = wait_for_completion_timeout(&wb_enc->wbdone_complete,

			msecs_to_jiffies(timeout));
@@ -949,6 +957,30 @@ static void sde_encoder_phys_wb_prepare_for_kickoff( 
	SDE_EVT32(DRMID(phys_enc->parent), WBID(wb_enc), wb_enc->kickoff_count);

}



/**

 * sde_encoder_phys_wb_trigger_flush - trigger flush processing

 * @phys_enc:	Pointer to physical encoder

 */

static void sde_encoder_phys_wb_trigger_flush(struct sde_encoder_phys *phys_enc)

{

	struct sde_encoder_phys_wb *wb_enc = to_sde_encoder_phys_wb(phys_enc);



	if (!phys_enc || !wb_enc->hw_wb) {

		SDE_ERROR("invalid encoder\n");

		return;

	}



	SDE_DEBUG("[wb:%d]\n", wb_enc->hw_wb->idx - WB_0);



	/* clear pending flush if commit with no framebuffer */

	if (!wb_enc->wb_fb) {

		SDE_DEBUG("no output framebuffer\n");

		return;

	}



	sde_encoder_helper_trigger_flush(phys_enc);

}



/**

 * sde_encoder_phys_wb_handle_post_kickoff - post-kickoff processing

 * @phys_enc:	Pointer to physical encoder
@@ -1167,7 +1199,7 @@ static void sde_encoder_phys_wb_get_hw_resources( 
	struct sde_encoder_phys_wb *wb_enc = to_sde_encoder_phys_wb(phys_enc);

	struct sde_hw_wb *hw_wb;

	struct drm_framebuffer *fb;

	const struct sde_format *fmt;

	const struct sde_format *fmt = NULL;



	if (!phys_enc) {

		SDE_ERROR("invalid encoder\n");
@@ -1175,11 +1207,7 @@ static void sde_encoder_phys_wb_get_hw_resources( 
	}



	fb = sde_wb_connector_state_get_output_fb(conn_state);

	if (!fb) {

		SDE_ERROR("no output framebuffer\n");

		return;

	}



	if (fb) {

		fmt = sde_get_sde_format_ext(fb->pixel_format, fb->modifier,

				drm_format_num_planes(fb->pixel_format));

		if (!fmt) {
@@ -1187,10 +1215,11 @@ static void sde_encoder_phys_wb_get_hw_resources( 
					fb->pixel_format);

			return;

		}

	}



	hw_wb = wb_enc->hw_wb;

	hw_res->wbs[hw_wb->idx - WB_0] = phys_enc->intf_mode;

	hw_res->needs_cdm = SDE_FORMAT_IS_YUV(fmt);

	hw_res->needs_cdm = fmt ? SDE_FORMAT_IS_YUV(fmt) : false;

	SDE_DEBUG("[wb:%d] intf_mode=%d needs_cdm=%d\n", hw_wb->idx - WB_0,

			hw_res->wbs[hw_wb->idx - WB_0],

			hw_res->needs_cdm);
@@ -1274,6 +1303,7 @@ static void sde_encoder_phys_wb_init_ops(struct sde_encoder_phys_ops *ops) 
	ops->wait_for_commit_done = sde_encoder_phys_wb_wait_for_commit_done;

	ops->prepare_for_kickoff = sde_encoder_phys_wb_prepare_for_kickoff;

	ops->handle_post_kickoff = sde_encoder_phys_wb_handle_post_kickoff;

	ops->trigger_flush = sde_encoder_phys_wb_trigger_flush;

	ops->trigger_start = sde_encoder_helper_trigger_start;

	ops->hw_reset = sde_encoder_helper_hw_reset;

}