From 4060bdee77b22d4210cc494e4dd6c5d3d5b9d844 Mon Sep 17 00:00:00 2001 From: Rajeev Nandan Date: Tue, 15 Dec 2020 18:05:38 +0530 Subject: [PATCH] Revert "disp: msm: dsi: move backlight operations to post kickoff" This reverts commit e60959b052f8301dc157fdf46489f194beaa5026. Change-Id: I539522a6a01297fecfafb446a44e725679bc39c0 Signed-off-by: Rajeev Nandan --- msm/dsi/dsi_drm.c | 3 --- msm/sde/sde_connector.c | 12 +----------- msm/sde/sde_connector.h | 6 ------ 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/msm/dsi/dsi_drm.c b/msm/dsi/dsi_drm.c index 8adea12ae80b..4ce96806851e 100644 --- a/msm/dsi/dsi_drm.c +++ b/msm/dsi/dsi_drm.c @@ -1094,9 +1094,6 @@ int dsi_conn_post_kickoff(struct drm_connector *connector, dsi_ctrl_setup_avr(display->ctrl[i].ctrl, enable); } - if (display->drm_conn) - sde_connector_helper_post_kickoff(display->drm_conn); - return 0; } diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c index aa1bc31e47fd..c31c9731bd13 100644 --- a/msm/sde/sde_connector.c +++ b/msm/sde/sde_connector.c @@ -945,17 +945,6 @@ void sde_connector_helper_bridge_disable(struct drm_connector *connector) } void sde_connector_helper_bridge_enable(struct drm_connector *connector) -{ - struct sde_connector *c_conn = NULL; - - if (!connector) - return; - - c_conn = to_sde_connector(connector); - c_conn->panel_dead = false; -} - -void sde_connector_helper_post_kickoff(struct drm_connector *connector) { struct sde_connector *c_conn = NULL; struct dsi_display *display; @@ -987,6 +976,7 @@ void sde_connector_helper_post_kickoff(struct drm_connector *connector) c_conn->bl_device->props.state &= ~BL_CORE_FBBLANK; backlight_update_status(c_conn->bl_device); } + c_conn->panel_dead = false; } int sde_connector_clk_ctrl(struct drm_connector *connector, bool enable) diff --git a/msm/sde/sde_connector.h b/msm/sde/sde_connector.h index 2e02ef640d2d..aad04d29f2f4 100644 --- a/msm/sde/sde_connector.h +++ b/msm/sde/sde_connector.h @@ -1086,10 +1086,4 @@ int sde_connector_get_panel_vfp(struct drm_connector *connector, */ int sde_connector_esd_status(struct drm_connector *connector); -/** - * sde_connector_helper_post_kickoff - helper function for drm connector post kickoff - * @connector: Pointer to DRM connector object - */ -void sde_connector_helper_post_kickoff(struct drm_connector *connector); - #endif /* _SDE_CONNECTOR_H_ */