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

Commit 00ecaf1c authored by Yashwanth's avatar Yashwanth
Browse files

Revert "disp: msm: sde: add secure session flag in sde_crtc state" 



This reverts commit 184653cc.
The original fix was resulting in atomic check failures
while transitioning from secure UI in video mode.

Change-Id: If4da144e0582f8f59d0bf05b52602b1a5f5514c4
Signed-off-by: default avatarYashwanth <yvulapu@codeaurora.org>
parent 92a9a522

msm/sde/sde_crtc.c

+13 −82
Original line number Diff line number Diff line
@@ -1703,12 +1703,8 @@ int sde_crtc_state_find_plane_fb_modes(struct drm_crtc_state *state, 


static void _sde_drm_fb_sec_dir_trans(

	struct sde_kms_smmu_state_data *smmu_state, uint32_t secure_level,

	struct sde_mdss_cfg *catalog, bool old_valid_fb, int *ops,

	struct drm_crtc_state *old_crtc_state)

	struct sde_mdss_cfg *catalog, bool old_valid_fb, int *ops)

{

	struct sde_crtc_state *old_cstate = to_sde_crtc_state(old_crtc_state);

	int old_secure_session = old_cstate->secure_session;



	/* secure display usecase */

	if ((smmu_state->state == ATTACHED)

			&& (secure_level == SDE_DRM_SEC_ONLY)) {
@@ -1729,10 +1725,6 @@ static void _sde_drm_fb_sec_dir_trans( 
		smmu_state->secure_level = secure_level;

		smmu_state->transition_type = PRE_COMMIT;

		*ops |= SDE_KMS_OPS_SECURE_STATE_CHANGE;

		if (old_secure_session ==

			SDE_SECURE_VIDEO_SESSION)

			*ops |= (SDE_KMS_OPS_WAIT_FOR_TX_DONE  |

					SDE_KMS_OPS_CLEANUP_PLANE_FB);

	}

}
@@ -1858,7 +1850,7 @@ int sde_crtc_get_secure_transition_ops(struct drm_crtc *crtc, 
	switch (translation_mode) {

	case SDE_DRM_FB_SEC_DIR_TRANS:

		_sde_drm_fb_sec_dir_trans(smmu_state, secure_level,

			catalog, old_valid_fb, &ops, old_crtc_state);

				catalog, old_valid_fb, &ops);

		if (clone_mode && (ops & SDE_KMS_OPS_SECURE_STATE_CHANGE))

			ops |= SDE_KMS_OPS_WAIT_FOR_TX_DONE;

		break;
@@ -4327,48 +4319,6 @@ static int _sde_crtc_check_secure_single_encoder(struct drm_crtc *crtc, 
	return 0;

}



static int _sde_crtc_check_secure_transition(struct drm_crtc *crtc,

	struct drm_crtc_state *state, bool is_video_mode)

{

	struct sde_crtc_state *old_cstate = to_sde_crtc_state(crtc->state);

	struct sde_crtc_state *new_cstate = to_sde_crtc_state(state);

	int old_secure_session = old_cstate->secure_session;

	int new_secure_session = new_cstate->secure_session;



	/*

	 * Direct transition from Secure Camera to Secure UI(&viceversa)

	 * is not allowed

	 */

	if ((old_secure_session == SDE_SECURE_CAMERA_SESSION &&

			new_secure_session == SDE_SECURE_UI_SESSION) ||

		(old_secure_session == SDE_SECURE_UI_SESSION &&

			new_secure_session == SDE_SECURE_CAMERA_SESSION)) {

		SDE_EVT32(DRMID(crtc), old_secure_session,

			new_secure_session, SDE_EVTLOG_ERROR);

		return -EINVAL;

	}



	/*

	 * In video mode, null commit is required for transition between

	 * secure video & secure camera

	 */

	if (is_video_mode &&

		((old_secure_session == SDE_SECURE_CAMERA_SESSION &&

			new_secure_session == SDE_SECURE_VIDEO_SESSION) ||

		(old_secure_session == SDE_SECURE_VIDEO_SESSION &&

			new_secure_session == SDE_SECURE_CAMERA_SESSION))) {

		SDE_EVT32(DRMID(crtc), old_secure_session,

			new_secure_session, SDE_EVTLOG_ERROR);

		return -EINVAL;

	}



	if (old_secure_session != new_secure_session)

		SDE_EVT32(DRMID(crtc), old_secure_session,

						new_secure_session);



	return 0;

}



static int _sde_crtc_check_secure_state_smmu_translation(struct drm_crtc *crtc,

	struct drm_crtc_state *state, struct sde_kms *sde_kms, int secure,

	int fb_ns, int fb_sec, int fb_sec_dir)
@@ -4383,8 +4333,17 @@ static int _sde_crtc_check_secure_state_smmu_translation(struct drm_crtc *crtc, 
						MSM_DISPLAY_VIDEO_MODE);

	}



	if (_sde_crtc_check_secure_transition(crtc, state, is_video_mode)) {

		SDE_ERROR("Invalid transition between secure & nonsecure\n");

	/*

	 * Secure display to secure camera needs without direct

	 * transition is currently not allowed

	 */

	if (fb_sec_dir && secure == SDE_DRM_SEC_NON_SEC &&

		smmu_state->state != ATTACHED &&

		smmu_state->secure_level == SDE_DRM_SEC_ONLY) {



		SDE_EVT32(DRMID(crtc), fb_ns, fb_sec_dir,

			smmu_state->state, smmu_state->secure_level,

			secure);

		goto sec_err;

	}
@@ -4452,29 +4411,6 @@ static int _sde_crtc_check_secure_conn(struct drm_crtc *crtc, 
	return 0;

}



static int _sde_crtc_populate_secure_session(struct drm_crtc_state *state,

	int secure, int fb_ns, int fb_sec, int fb_sec_dir)

{

	struct sde_crtc_state *cstate = to_sde_crtc_state(state);



	if (secure == SDE_DRM_SEC_ONLY && fb_sec_dir && !fb_sec && !fb_ns)

		cstate->secure_session = SDE_SECURE_UI_SESSION;

	else if (secure == SDE_DRM_SEC_NON_SEC && fb_sec_dir && !fb_sec)

		cstate->secure_session = SDE_SECURE_CAMERA_SESSION;

	else if (secure == SDE_DRM_SEC_NON_SEC && !fb_sec_dir && fb_sec)

		cstate->secure_session = SDE_SECURE_VIDEO_SESSION;

	else if (secure == SDE_DRM_SEC_NON_SEC && !fb_sec_dir &&

			!fb_sec && fb_ns)

		cstate->secure_session = SDE_NON_SECURE_SESSION;

	else if (secure == SDE_DRM_SEC_NON_SEC && !fb_sec_dir &&

			!fb_sec && !fb_ns)

		cstate->secure_session = SDE_NULL_SESSION;

	else

		return -EINVAL;



	return 0;

}



static int _sde_crtc_check_secure_state(struct drm_crtc *crtc,

		struct drm_crtc_state *state, struct plane_state pstates[],

		int cnt)
@@ -4505,11 +4441,6 @@ static int _sde_crtc_check_secure_state(struct drm_crtc *crtc, 
	if (rc)

		return rc;



	rc = _sde_crtc_populate_secure_session(state, secure,

				fb_ns, fb_sec, fb_sec_dir);

	if (rc)

		return rc;



	rc = _sde_crtc_check_secure_blend_config(crtc, state, pstates, cstate,

			sde_kms, cnt, secure, fb_ns, fb_sec, fb_sec_dir);

	if (rc)

msm/sde/sde_crtc.h

+0 −18
Original line number Diff line number Diff line
@@ -35,22 +35,6 @@ 
/* Expand it to 2x for handling atleast 2 connectors safely */

#define SDE_CRTC_FRAME_EVENT_SIZE	(4 * 2)



/**

 * enum sde_session_type: session type

 * @SDE_SECURE_UI_SESSION:     secure UI usecase

 * @SDE_SECURE_CAMERA_SESSION: secure camera usecase

 * @SDE_SECURE_VIDEO_SESSION:  secure video usecase

 * @SDE_NON_SECURE_SESSION:    non secure usecase

 * @SDE_NULL_SESSION:          null commit usecase

 */

enum sde_session_type {

	SDE_SECURE_UI_SESSION,

	SDE_SECURE_CAMERA_SESSION,

	SDE_SECURE_VIDEO_SESSION,

	SDE_NON_SECURE_SESSION,

	SDE_NULL_SESSION,

};



/**

 * enum sde_crtc_client_type: crtc client type

 * @RT_CLIENT:	RealTime client like video/cmd mode display
@@ -396,7 +380,6 @@ struct sde_crtc { 
 * @ds_cfg: Destination scaler config

 * @scl3_lut_cfg: QSEED3 lut config

 * @new_perf: new performance state being requested

 * @secure_session: Indicates the type of secure session

 */

struct sde_crtc_state {

	struct drm_crtc_state base;
@@ -426,7 +409,6 @@ struct sde_crtc_state { 
	struct sde_hw_scaler3_lut_cfg scl3_lut_cfg;



	struct sde_core_perf_params new_perf;

	int secure_session;

};



enum sde_crtc_irq_state {