Commit 862adb5b authored by Hsin-Yi, Wang's avatar Hsin-Yi, Wang Committed by Greg Kroah-Hartman

drm/panel: panel-innolux: set display off in innolux_panel_unprepare

[ Upstream commit 46f3ceaf ]

Move mipi_dsi_dcs_set_display_off() from innolux_panel_disable()
to innolux_panel_unprepare(), so they are consistent with
innolux_panel_enable() and innolux_panel_prepare().

This also fixes some mode check and irq timeout issue in MTK dsi code.

Since some dsi code (e.g. mtk_dsi) have following call trace:
1. drm_panel_disable(), which calls innolux_panel_disable()
2. switch to cmd mode
3. drm_panel_unprepare(), which calls innolux_panel_unprepare()

However, mtk_dsi needs to be in cmd mode to be able to send commands
(e.g. mipi_dsi_dcs_set_display_off() and mipi_dsi_dcs_enter_sleep_mode()),
so we need these functions to be called after the switch to cmd mode happens,
i.e. in innolux_panel_unprepare.
Signed-off-by: default avatarHsin-Yi, Wang <hsinyi@chromium.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190109065922.231753-1-hsinyi@chromium.orgSigned-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2be8987a
...@@ -70,18 +70,12 @@ static inline struct innolux_panel *to_innolux_panel(struct drm_panel *panel) ...@@ -70,18 +70,12 @@ static inline struct innolux_panel *to_innolux_panel(struct drm_panel *panel)
static int innolux_panel_disable(struct drm_panel *panel) static int innolux_panel_disable(struct drm_panel *panel)
{ {
struct innolux_panel *innolux = to_innolux_panel(panel); struct innolux_panel *innolux = to_innolux_panel(panel);
int err;
if (!innolux->enabled) if (!innolux->enabled)
return 0; return 0;
backlight_disable(innolux->backlight); backlight_disable(innolux->backlight);
err = mipi_dsi_dcs_set_display_off(innolux->link);
if (err < 0)
DRM_DEV_ERROR(panel->dev, "failed to set display off: %d\n",
err);
innolux->enabled = false; innolux->enabled = false;
return 0; return 0;
...@@ -95,6 +89,11 @@ static int innolux_panel_unprepare(struct drm_panel *panel) ...@@ -95,6 +89,11 @@ static int innolux_panel_unprepare(struct drm_panel *panel)
if (!innolux->prepared) if (!innolux->prepared)
return 0; return 0;
err = mipi_dsi_dcs_set_display_off(innolux->link);
if (err < 0)
DRM_DEV_ERROR(panel->dev, "failed to set display off: %d\n",
err);
err = mipi_dsi_dcs_enter_sleep_mode(innolux->link); err = mipi_dsi_dcs_enter_sleep_mode(innolux->link);
if (err < 0) { if (err < 0) {
DRM_DEV_ERROR(panel->dev, "failed to enter sleep mode: %d\n", DRM_DEV_ERROR(panel->dev, "failed to enter sleep mode: %d\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment