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

Commit 821985b9 authored by Ingrid Gallardo's avatar Ingrid Gallardo
Browse files

drm/msm/sde: fix errors with pp-split video mode 



Current driver flushes the bits for both interfaces
and triggers the frame updates in the case of pp-split.
This is not expected, given that in pp-split only the
master interface has the full control of the updates
and causes multiple errors to be thrown by the driver.
Fix this problem by avoiding the flush of the slave
interface as well as the frame update notification.

Change-Id: Ia95db70326f80128b6e68dab123930006b0af71b
Signed-off-by: default avatarIngrid Gallardo <ingridg@codeaurora.org>
parent ea5149e3

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

+11 −0
Original line number Diff line number Diff line
@@ -644,9 +644,20 @@ static void sde_encoder_phys_cmd_enable_helper( 


	_sde_encoder_phys_cmd_pingpong_config(phys_enc);



	/*

	 * For pp-split, skip setting the flush bit for the slave intf, since

	 * both intfs use same ctl and HW will only flush the master.

	 */

	if (_sde_encoder_phys_is_ppsplit(phys_enc) &&

		!sde_encoder_phys_cmd_is_master(phys_enc))

		goto skip_flush;



	ctl = phys_enc->hw_ctl;

	ctl->ops.get_bitmask_intf(ctl, &flush_mask, phys_enc->intf_idx);

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



skip_flush:

	return;

}



static void sde_encoder_phys_cmd_enable(struct sde_encoder_phys *phys_enc)

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

+12 −2
Original line number Diff line number Diff line
@@ -609,9 +609,18 @@ static void sde_encoder_phys_vid_enable(struct sde_encoder_phys *phys_enc) 
		goto end;

	}



	/*

	 * For pp-split, skip setting the flush bit for the slave intf, since

	 * both intfs use same ctl and HW will only flush the master.

	 */

	if (_sde_encoder_phys_is_ppsplit(phys_enc) &&

		!sde_encoder_phys_vid_is_master(phys_enc))

		goto skip_flush;



	ctl->ops.get_bitmask_intf(ctl, &flush_mask, intf->idx);

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



skip_flush:

	SDE_DEBUG_VIDENC(vid_enc, "update pending flush ctl %d flush_mask %x\n",

		ctl->idx - CTL_0, flush_mask);
@@ -669,8 +678,9 @@ static int sde_encoder_phys_vid_wait_for_vblank( 
	int ret;



	if (!sde_encoder_phys_vid_is_master(phys_enc)) {

		/* always signal done for slave video encoder */

		if (notify && phys_enc->parent_ops.handle_frame_done)

		/* signal done for slave video encoder, unless it is pp-split */

		if (!_sde_encoder_phys_is_ppsplit(phys_enc) &&

			notify && phys_enc->parent_ops.handle_frame_done)

			phys_enc->parent_ops.handle_frame_done(

					phys_enc->parent, phys_enc,

					SDE_ENCODER_FRAME_EVENT_DONE);