aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/panel
diff options
context:
space:
mode:
authorAjay Kumar <ajaykumar.rs@samsung.com>2014-07-31 13:42:09 -0400
committerThierry Reding <treding@nvidia.com>2014-08-06 10:44:13 -0400
commit1a670e7b8c4227bcff5119802ef04bbf5916cabb (patch)
tree40985d6dd73d4b9b5cc9d9b029d14ec865da6a4d /drivers/gpu/drm/panel
parent8141028278c2eac32a70d2c5a5178c84a4d0963e (diff)
drm/panel: s6e8aa0: Add proper definition for prepare and unprepare
Move out code from enable and disable routines to prepare and unprepare routines, so that functionality is properly distributed across all the panel functions. Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/drm/panel')
-rw-r--r--drivers/gpu/drm/panel/panel-s6e8aa0.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/panel/panel-s6e8aa0.c b/drivers/gpu/drm/panel/panel-s6e8aa0.c
index 31f2c87eadf6..b5217fe37f02 100644
--- a/drivers/gpu/drm/panel/panel-s6e8aa0.c
+++ b/drivers/gpu/drm/panel/panel-s6e8aa0.c
@@ -892,6 +892,11 @@ static int s6e8aa0_power_off(struct s6e8aa0 *ctx)
892 892
893static int s6e8aa0_disable(struct drm_panel *panel) 893static int s6e8aa0_disable(struct drm_panel *panel)
894{ 894{
895 return 0;
896}
897
898static int s6e8aa0_unprepare(struct drm_panel *panel)
899{
895 struct s6e8aa0 *ctx = panel_to_s6e8aa0(panel); 900 struct s6e8aa0 *ctx = panel_to_s6e8aa0(panel);
896 901
897 s6e8aa0_dcs_write_seq_static(ctx, MIPI_DCS_ENTER_SLEEP_MODE); 902 s6e8aa0_dcs_write_seq_static(ctx, MIPI_DCS_ENTER_SLEEP_MODE);
@@ -903,18 +908,8 @@ static int s6e8aa0_disable(struct drm_panel *panel)
903 return s6e8aa0_power_off(ctx); 908 return s6e8aa0_power_off(ctx);
904} 909}
905 910
906static int s6e8aa0_unprepare(struct drm_panel *panel)
907{
908 return 0;
909}
910
911static int s6e8aa0_prepare(struct drm_panel *panel) 911static int s6e8aa0_prepare(struct drm_panel *panel)
912{ 912{
913 return 0;
914}
915
916static int s6e8aa0_enable(struct drm_panel *panel)
917{
918 struct s6e8aa0 *ctx = panel_to_s6e8aa0(panel); 913 struct s6e8aa0 *ctx = panel_to_s6e8aa0(panel);
919 int ret; 914 int ret;
920 915
@@ -926,11 +921,16 @@ static int s6e8aa0_enable(struct drm_panel *panel)
926 ret = ctx->error; 921 ret = ctx->error;
927 922
928 if (ret < 0) 923 if (ret < 0)
929 s6e8aa0_disable(panel); 924 s6e8aa0_unprepare(panel);
930 925
931 return ret; 926 return ret;
932} 927}
933 928
929static int s6e8aa0_enable(struct drm_panel *panel)
930{
931 return 0;
932}
933
934static int s6e8aa0_get_modes(struct drm_panel *panel) 934static int s6e8aa0_get_modes(struct drm_panel *panel)
935{ 935{
936 struct drm_connector *connector = panel->connector; 936 struct drm_connector *connector = panel->connector;