diff options
-rw-r--r-- | drivers/gpu/drm/panel/panel-s6e8aa0.c | 22 |
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 | ||
893 | static int s6e8aa0_disable(struct drm_panel *panel) | 893 | static int s6e8aa0_disable(struct drm_panel *panel) |
894 | { | 894 | { |
895 | return 0; | ||
896 | } | ||
897 | |||
898 | static 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 | ||
906 | static int s6e8aa0_unprepare(struct drm_panel *panel) | ||
907 | { | ||
908 | return 0; | ||
909 | } | ||
910 | |||
911 | static int s6e8aa0_prepare(struct drm_panel *panel) | 911 | static int s6e8aa0_prepare(struct drm_panel *panel) |
912 | { | 912 | { |
913 | return 0; | ||
914 | } | ||
915 | |||
916 | static 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 | ||
929 | static int s6e8aa0_enable(struct drm_panel *panel) | ||
930 | { | ||
931 | return 0; | ||
932 | } | ||
933 | |||
934 | static int s6e8aa0_get_modes(struct drm_panel *panel) | 934 | static int s6e8aa0_get_modes(struct drm_panel *panel) |
935 | { | 935 | { |
936 | struct drm_connector *connector = panel->connector; | 936 | struct drm_connector *connector = panel->connector; |