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

Commit cd6d9231 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/dpu: async commit support 



In addition, moving to kms->flush_commit() lets us drop the only user
of kms->commit().

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarSean Paul <sean@poorly.run>
parent 2d99ced7

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

+0 −13
Original line number Diff line number Diff line
@@ -608,7 +608,6 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc) 
	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);

	struct dpu_kms *dpu_kms = _dpu_crtc_get_kms(crtc);

	struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);

	int ret;



	/*

	 * If no mixers has been allocated in dpu_crtc_atomic_check(),
@@ -628,17 +627,6 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc) 
				  crtc->state->encoder_mask)

		dpu_encoder_prepare_for_kickoff(encoder);



	/* wait for previous frame_event_done completion */

	DPU_ATRACE_BEGIN("wait_for_frame_done_event");

	ret = _dpu_crtc_wait_for_frame_done(crtc);

	DPU_ATRACE_END("wait_for_frame_done_event");

	if (ret) {

		DPU_ERROR("crtc%d wait for frame done failed;frame_pending%d\n",

				crtc->base.id,

				atomic_read(&dpu_crtc->frame_pending));

		goto end;

	}



	if (atomic_inc_return(&dpu_crtc->frame_pending) == 1) {

		/* acquire bandwidth and other resources */

		DPU_DEBUG("crtc%d first commit\n", crtc->base.id);
@@ -652,7 +640,6 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc) 
	drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask)

		dpu_encoder_kickoff(encoder);



end:

	reinit_completion(&dpu_crtc->frame_done_comp);

	DPU_ATRACE_END("crtc_commit");

}

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

+3 −4
Original line number Diff line number Diff line
@@ -1680,8 +1680,7 @@ static u32 _dpu_encoder_calculate_linetime(struct dpu_encoder_virt *dpu_enc, 
	return line_time;

}



static int _dpu_encoder_wakeup_time(struct drm_encoder *drm_enc,

		ktime_t *wakeup_time)

int dpu_encoder_vsync_time(struct drm_encoder *drm_enc, ktime_t *wakeup_time)

{

	struct drm_display_mode *mode;

	struct dpu_encoder_virt *dpu_enc;
@@ -1768,7 +1767,7 @@ static void dpu_encoder_vsync_event_work_handler(struct kthread_work *work) 
		return;

	}



	if (_dpu_encoder_wakeup_time(&dpu_enc->base, &wakeup_time))

	if (dpu_encoder_vsync_time(&dpu_enc->base, &wakeup_time))

		return;



	trace_dpu_enc_vsync_event_work(DRMID(&dpu_enc->base), wakeup_time);
@@ -1842,7 +1841,7 @@ void dpu_encoder_kickoff(struct drm_encoder *drm_enc) 
	}



	if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI &&

			!_dpu_encoder_wakeup_time(drm_enc, &wakeup_time)) {

			!dpu_encoder_vsync_time(drm_enc, &wakeup_time)) {

		trace_dpu_enc_early_kickoff(DRMID(drm_enc),

					    ktime_to_ms(wakeup_time));

		mod_timer(&dpu_enc->vsync_event_timer,

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

+5 −0
Original line number Diff line number Diff line
@@ -85,6 +85,11 @@ void dpu_encoder_trigger_kickoff_pending(struct drm_encoder *encoder); 
 */

void dpu_encoder_kickoff(struct drm_encoder *encoder);



/**

 * dpu_encoder_wakeup_time - get the time of the next vsync

 */

int dpu_encoder_vsync_time(struct drm_encoder *drm_enc, ktime_t *wakeup_time);



/**

 * dpu_encoder_wait_for_event - Waits for encoder events

 * @encoder:	encoder pointer

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

+25 −21
Original line number Diff line number Diff line
@@ -262,6 +262,20 @@ static void dpu_kms_disable_commit(struct msm_kms *kms) 
	pm_runtime_put_sync(&dpu_kms->pdev->dev);

}



static ktime_t dpu_kms_vsync_time(struct msm_kms *kms, struct drm_crtc *crtc)

{

	struct drm_encoder *encoder;



	drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask) {

		ktime_t vsync_time;



		if (dpu_encoder_vsync_time(encoder, &vsync_time) == 0)

			return vsync_time;

	}



	return ktime_get();

}



static void dpu_kms_prepare_commit(struct msm_kms *kms,

		struct drm_atomic_state *state)

{
@@ -293,7 +307,16 @@ static void dpu_kms_prepare_commit(struct msm_kms *kms, 


static void dpu_kms_flush_commit(struct msm_kms *kms, unsigned crtc_mask)

{

	/* TODO */

	struct dpu_kms *dpu_kms = to_dpu_kms(kms);

	struct drm_crtc *crtc;



	for_each_crtc_mask(dpu_kms->dev, crtc, crtc_mask) {

		if (!crtc->state->active)

			continue;



		trace_dpu_kms_commit(DRMID(crtc));

		dpu_crtc_commit_kickoff(crtc);

	}

}



/*
@@ -316,25 +339,6 @@ void dpu_kms_encoder_enable(struct drm_encoder *encoder) 
			continue;



		trace_dpu_kms_enc_enable(DRMID(crtc));

		dpu_crtc_commit_kickoff(crtc);

	}

}



static void dpu_kms_commit(struct msm_kms *kms, struct drm_atomic_state *state)

{

	struct drm_crtc *crtc;

	struct drm_crtc_state *crtc_state;

	int i;



	for_each_new_crtc_in_state(state, crtc, crtc_state, i) {

		/* If modeset is required, kickoff is run in encoder_enable */

		if (drm_atomic_crtc_needs_modeset(crtc_state))

			continue;



		if (crtc->state->active) {

			trace_dpu_kms_commit(DRMID(crtc));

			dpu_crtc_commit_kickoff(crtc);

		}

	}

}
@@ -695,9 +699,9 @@ static const struct msm_kms_funcs kms_funcs = { 
	.irq             = dpu_irq,

	.enable_commit   = dpu_kms_enable_commit,

	.disable_commit  = dpu_kms_disable_commit,

	.vsync_time      = dpu_kms_vsync_time,

	.prepare_commit  = dpu_kms_prepare_commit,

	.flush_commit    = dpu_kms_flush_commit,

	.commit          = dpu_kms_commit,

	.wait_flush      = dpu_kms_wait_flush,

	.complete_commit = dpu_kms_complete_commit,

	.enable_vblank   = dpu_kms_enable_vblank,

drivers/gpu/drm/msm/msm_atomic.c

+1 −4
Original line number Diff line number Diff line
@@ -210,10 +210,7 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state) 
	/*

	 * Flush hardware updates:

	 */

	if (kms->funcs->commit) {

	DRM_DEBUG_ATOMIC("triggering commit\n");

		kms->funcs->commit(kms, state);

	}

	kms->funcs->flush_commit(kms, crtc_mask);

	mutex_unlock(&kms->commit_lock);