Merge "drm/msm/sde: do not send stop splash signal from eDRM to LK"

3 files changed, 0 insertions, 53 deletions

diff --git a/drivers/gpu/drm/msm/ekms/edrm_kms.c b/drivers/gpu/drm/msm/ekms/edrm_kms.c
index 4749b6a8d776..c78b2f9dc080 100644
--- a/drivers/gpu/drm/msm/ekms/edrm_kms.c
+++ b/drivers/gpu/drm/msm/ekms/edrm_kms.c
@@ -70,12 +70,6 @@ static void edrm_kms_prepare_commit(struct msm_kms *kms,
 	/* Notify bootloader splash to stop */
 	if (valid_commit && edrm_kms->lk_running_flag) {
 
-		/* if LK is still running, notify LK to stop */
-		if (edrm_splash_get_lk_status(kms) !=
-			SPLASH_STATUS_NOT_START) {
-			edrm_splash_notify_lk_stop_splash(kms);
-			edrm_splash_poll_lk_stop_splash(kms);
-		}
 
 		/* next eDRM close will trigger display resources handoff */
 		edrm_kms->handoff_flag = true;
diff --git a/drivers/gpu/drm/msm/ekms/edrm_splash.c b/drivers/gpu/drm/msm/ekms/edrm_splash.c
index ec94586b1261..f29f4926e6fb 100644
--- a/drivers/gpu/drm/msm/ekms/edrm_splash.c
+++ b/drivers/gpu/drm/msm/ekms/edrm_splash.c
@@ -32,38 +32,6 @@
 #define SDE_EXIT_VALUE		0xDEADBEEF
 #define SDE_LK_IMMEDIATE_STOP_VALUE	0xFEFEFEFE
 
-/**
- * edrm_splash_notify_lk_stop_splash.
- *
- * Function to stop early splash in LK.
- */
-void edrm_splash_notify_lk_stop_splash(struct msm_kms *kms)
-{
-	request_early_service_shutdown(EARLY_DISPLAY);
-}
-
-/**
- * edrm_splash_poll_lk_stop_splash.
- *
- * Function to poll for early splash stop in LK.
- */
-void edrm_splash_poll_lk_stop_splash(struct msm_kms *kms)
-{
-	int i = 0;
-	struct msm_edrm_kms *edrm_kms = to_edrm_kms(kms);
-
-	/* each read may wait up to 10000us, worst case polling is 4 sec */
-	while (i < 400) {
-		/* read LK status from scratch register*/
-		if (!get_early_service_status(EARLY_DISPLAY)) {
-			edrm_kms->lk_running_flag = false;
-			break;
-		}
-		usleep_range(8000, 10000);
-		i++;
-	}
-}
-
 /*
  * Below function will indicate early display exited or not started.
  */
diff --git a/drivers/gpu/drm/msm/ekms/edrm_splash.h b/drivers/gpu/drm/msm/ekms/edrm_splash.h
index 78d3806a7adf..658394dbddea 100644
--- a/drivers/gpu/drm/msm/ekms/edrm_splash.h
+++ b/drivers/gpu/drm/msm/ekms/edrm_splash.h
@@ -20,21 +20,6 @@
 /* APIs for early splash handoff functions */
 
 /**
- * edrm_splash_notify_lk_stop_splash.
- *
- * Tell LK to stop display splash.  LK may continue to run until last frame.
- */
-void edrm_splash_notify_lk_stop_splash(struct msm_kms *kms);
-
-
-/**
- * edrm_splash_poll_lk_stop_splash.
- *
- * Wait unitl LK stop the spash at last frame or it exited the splash app.
- */
-void edrm_splash_poll_lk_stop_splash(struct msm_kms *kms);
-
-/**
  * edrm_splash_get_lk_status
  *
  * Get early display status to set the status flag.