korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-27 13:05:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/omap: dsi: untangle ulps ops from enable/disable

Browse Source 
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
This commit is contained in:
Sebastian Reichel 2020-12-15 12:46:00 +02:00 committed by Tomi Valkeinen
parent 0c93a61db4
commit 9f0eb51e3c
3 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
View File

@ -230,7 +230,7 @@ static int dsicm_enter_ulps(struct panel_drv_data *ddata)
if (r) if (r)
goto err; goto err;
src->ops->dsi.disable(src, false, true); src->ops->dsi.ulps(src, true);
ddata->ulps_enabled = true; ddata->ulps_enabled = true;
@ -255,7 +255,7 @@ static int dsicm_exit_ulps(struct panel_drv_data *ddata)
if (!ddata->ulps_enabled) if (!ddata->ulps_enabled)
return 0; return 0;
src->ops->enable(src); src->ops->dsi.ulps(src, false);
ddata->dsi->mode_flags &= ~MIPI_DSI_MODE_LPM; ddata->dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
r = _dsicm_enable_te(ddata, true); r = _dsicm_enable_te(ddata, true);
@ -582,7 +582,7 @@ err:
dsicm_hw_reset(ddata); dsicm_hw_reset(ddata);
src->ops->dsi.disable(src, true, false); src->ops->disable(src);
err_regulators: err_regulators:
r = regulator_bulk_disable(ARRAY_SIZE(ddata->supplies), ddata->supplies); r = regulator_bulk_disable(ARRAY_SIZE(ddata->supplies), ddata->supplies);
if (r) if (r)
@ -608,7 +608,7 @@ static void dsicm_power_off(struct panel_drv_data *ddata)
dsicm_hw_reset(ddata); dsicm_hw_reset(ddata);
} }
src->ops->dsi.disable(src, true, false); src->ops->disable(src);
r = regulator_bulk_disable(ARRAY_SIZE(ddata->supplies), ddata->supplies); r = regulator_bulk_disable(ARRAY_SIZE(ddata->supplies), ddata->supplies);
if (r) if (r)

53
drivers/gpu/drm/omapdrm/dss/dsi.c
View File

@ -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; int r;
DSSDBG("dsi_display_enable\n"); WARN_ON(!dsi_bus_is_locked(dsi));
dsi_bus_lock(dsi);
mutex_lock(&dsi->lock); mutex_lock(&dsi->lock);
@ -4075,25 +4072,29 @@ static void dsi_display_enable(struct omap_dss_device *dssdev)
mutex_unlock(&dsi->lock); mutex_unlock(&dsi->lock);
dsi_bus_unlock(dsi);
return; return;
err_init_dsi: err_init_dsi:
dsi_runtime_put(dsi); dsi_runtime_put(dsi);
err_get_dsi: err_get_dsi:
mutex_unlock(&dsi->lock); 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, static void dsi_display_enable(struct omap_dss_device *dssdev)
bool disconnect_lanes, bool enter_ulps)
{ {
struct dsi_data *dsi = to_dsi_data(dssdev); struct dsi_data *dsi = to_dsi_data(dssdev);
DSSDBG("dsi_display_enable\n");
DSSDBG("dsi_display_disable\n");
dsi_bus_lock(dsi); 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); mutex_lock(&dsi->lock);
@ -4107,6 +4108,31 @@ static void dsi_display_disable(struct omap_dss_device *dssdev,
dsi_runtime_put(dsi); dsi_runtime_put(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);
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); dsi_bus_unlock(dsi);
} }
@ -4812,9 +4838,10 @@ static const struct omap_dss_device_ops dsi_ops = {
.connect = dsi_connect, .connect = dsi_connect,
.disconnect = dsi_disconnect, .disconnect = dsi_disconnect,
.enable = dsi_display_enable, .enable = dsi_display_enable,
.disable = dsi_display_disable,
.dsi = { .dsi = {
.disable = dsi_display_disable, .ulps = dsi_ulps,
.set_config = dsi_set_config, .set_config = dsi_set_config,

5
drivers/gpu/drm/omapdrm/dss/omapdss.h
View File

@ -284,10 +284,9 @@ struct omap_dss_writeback_info {
}; };
struct omapdss_dsi_ops { struct omapdss_dsi_ops {
void (*disable)(struct omap_dss_device *dssdev, bool disconnect_lanes,
bool enter_ulps);
/* bus configuration */ /* bus configuration */
void (*ulps)(struct omap_dss_device *dssdev, bool enable);
int (*set_config)(struct omap_dss_device *dssdev, int (*set_config)(struct omap_dss_device *dssdev,
const struct omap_dss_dsi_config *cfg); const struct omap_dss_dsi_config *cfg);