diff options
| author | Sebastian Reichel <sebastian.reichel@collabora.com> | 2020-12-15 12:46:00 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2020-12-15 16:08:23 +0200 |
| commit | 9f0eb51e3c658a767c3fa89b3894f45f5319c208 (patch) | |
| tree | 64c0e97a5c8ae6ed84b4862ddd8847d874c5ea34 /drivers/gpu/drm/omapdrm/dss/dsi.c | |
| parent | 0c93a61db462e3fe1a2c63d908549d4e353a56fb (diff) | |
| download | linux-9f0eb51e3c658a767c3fa89b3894f45f5319c208.tar.gz linux-9f0eb51e3c658a767c3fa89b3894f45f5319c208.tar.bz2 linux-9f0eb51e3c658a767c3fa89b3894f45f5319c208.zip | |
drm/omap: dsi: untangle ulps ops from enable/disable
Create a custom function pointer for ULPS and use it instead of
reusing disable/enable functions for ULPS mode switch. This allows
us to use the common disable/enable functions pointers for DSI.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201215104657.802264-28-tomi.valkeinen@ti.com
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/dsi.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dsi.c | 53 |
1 files changed, 40 insertions, 13 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 211415135682..5853f89aebbe 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -4052,14 +4052,11 @@ static void dsi_display_uninit_dsi(struct dsi_data *dsi, bool disconnect_lanes, } } -static void dsi_display_enable(struct omap_dss_device *dssdev) +static void _dsi_display_enable(struct dsi_data *dsi) { - struct dsi_data *dsi = to_dsi_data(dssdev); int r; - DSSDBG("dsi_display_enable\n"); - - dsi_bus_lock(dsi); + WARN_ON(!dsi_bus_is_locked(dsi)); mutex_lock(&dsi->lock); @@ -4075,25 +4072,29 @@ static void dsi_display_enable(struct omap_dss_device *dssdev) mutex_unlock(&dsi->lock); - dsi_bus_unlock(dsi); - return; err_init_dsi: dsi_runtime_put(dsi); err_get_dsi: mutex_unlock(&dsi->lock); - DSSDBG("dsi_display_enable FAILED\n"); + DSSDBG("dsi_display_ulps_enable FAILED\n"); } -static void dsi_display_disable(struct omap_dss_device *dssdev, - bool disconnect_lanes, bool enter_ulps) +static void dsi_display_enable(struct omap_dss_device *dssdev) { struct dsi_data *dsi = to_dsi_data(dssdev); - - DSSDBG("dsi_display_disable\n"); + DSSDBG("dsi_display_enable\n"); dsi_bus_lock(dsi); + _dsi_display_enable(dsi); + dsi_bus_unlock(dsi); +} + +static void _dsi_display_disable(struct dsi_data *dsi, + bool disconnect_lanes, bool enter_ulps) +{ + WARN_ON(!dsi_bus_is_locked(dsi)); mutex_lock(&dsi->lock); @@ -4107,6 +4108,31 @@ static void dsi_display_disable(struct omap_dss_device *dssdev, dsi_runtime_put(dsi); mutex_unlock(&dsi->lock); +} + +static void dsi_display_disable(struct omap_dss_device *dssdev) +{ + struct dsi_data *dsi = to_dsi_data(dssdev); + + DSSDBG("dsi_display_disable\n"); + + dsi_bus_lock(dsi); + _dsi_display_disable(dsi, true, false); + dsi_bus_unlock(dsi); +} + +static void dsi_ulps(struct omap_dss_device *dssdev, bool enable) +{ + struct dsi_data *dsi = to_dsi_data(dssdev); + + DSSDBG("dsi_ulps %d\n", enable); + + dsi_bus_lock(dsi); + + if (enable) + _dsi_display_disable(dsi, false, true); + else + _dsi_display_enable(dsi); dsi_bus_unlock(dsi); } @@ -4812,9 +4838,10 @@ static const struct omap_dss_device_ops dsi_ops = { .connect = dsi_connect, .disconnect = dsi_disconnect, .enable = dsi_display_enable, + .disable = dsi_display_disable, .dsi = { - .disable = dsi_display_disable, + .ulps = dsi_ulps, .set_config = dsi_set_config, |