Commit ead05b53 authored by Tomi Valkeinen's avatar Tomi Valkeinen

drm/omap: dsi: display_disable cleanup

We can drop dsi_display_disable() which just calls
_dsi_display_disable(), and rename _dsi_display_disable() to
dsi_display_disable().

The WARN_ON(!dsi_bus_is_locked(dsi)) in dsi_display_disable is extra and
can be dropped, as _dsi_display_disable() has the same WARN_ON().
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201215104657.802264-78-tomi.valkeinen@ti.com
parent 1f056053
...@@ -63,8 +63,6 @@ static int dsi_vc_send_null(struct dsi_data *dsi, int vc, int channel); ...@@ -63,8 +63,6 @@ static int dsi_vc_send_null(struct dsi_data *dsi, int vc, int channel);
static ssize_t _omap_dsi_host_transfer(struct dsi_data *dsi, int vc, static ssize_t _omap_dsi_host_transfer(struct dsi_data *dsi, int vc,
const struct mipi_dsi_msg *msg); const struct mipi_dsi_msg *msg);
static void dsi_display_disable(struct omap_dss_device *dssdev);
#ifdef DSI_PERF_MEASURE #ifdef DSI_PERF_MEASURE
static bool dsi_perf; static bool dsi_perf;
module_param(dsi_perf, bool, 0644); module_param(dsi_perf, bool, 0644);
...@@ -3769,7 +3767,7 @@ static void dsi_display_enable(struct dsi_data *dsi) ...@@ -3769,7 +3767,7 @@ static void dsi_display_enable(struct dsi_data *dsi)
DSSDBG("dsi_display_ulps_enable FAILED\n"); DSSDBG("dsi_display_ulps_enable FAILED\n");
} }
static void _dsi_display_disable(struct dsi_data *dsi, static void dsi_display_disable(struct dsi_data *dsi,
bool disconnect_lanes, bool enter_ulps) bool disconnect_lanes, bool enter_ulps)
{ {
WARN_ON(!dsi_bus_is_locked(dsi)); WARN_ON(!dsi_bus_is_locked(dsi));
...@@ -3788,17 +3786,6 @@ static void _dsi_display_disable(struct dsi_data *dsi, ...@@ -3788,17 +3786,6 @@ static void _dsi_display_disable(struct dsi_data *dsi,
mutex_unlock(&dsi->lock); mutex_unlock(&dsi->lock);
} }
static void dsi_display_disable(struct omap_dss_device *dssdev)
{
struct dsi_data *dsi = to_dsi_data(dssdev);
WARN_ON(!dsi_bus_is_locked(dsi));
DSSDBG("dsi_display_disable\n");
_dsi_display_disable(dsi, true, false);
}
static int dsi_enable_te(struct dsi_data *dsi, bool enable) static int dsi_enable_te(struct dsi_data *dsi, bool enable)
{ {
dsi->te_enabled = enable; dsi->te_enabled = enable;
...@@ -3822,7 +3809,7 @@ static void omap_dsi_ulps_work_callback(struct work_struct *work) ...@@ -3822,7 +3809,7 @@ static void omap_dsi_ulps_work_callback(struct work_struct *work)
dsi_enable_te(dsi, false); dsi_enable_te(dsi, false);
_dsi_display_disable(dsi, false, true); dsi_display_disable(dsi, false, true);
dsi_bus_unlock(dsi); dsi_bus_unlock(dsi);
} }
...@@ -4956,7 +4943,7 @@ static void dsi_bridge_disable(struct drm_bridge *bridge) ...@@ -4956,7 +4943,7 @@ static void dsi_bridge_disable(struct drm_bridge *bridge)
dsi_disable_video_output(dssdev, VC_VIDEO); dsi_disable_video_output(dssdev, VC_VIDEO);
dsi_display_disable(dssdev); dsi_display_disable(dsi, true, false);
dsi_bus_unlock(dsi); dsi_bus_unlock(dsi);
} }
......
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