Message ID | 20201105120333.947408-21-tomi.valkeinen@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Convert DSI code to use drm_mipi_dsi and drm_panel | expand |
Hi Tomi and Sebastian, Thank you for the patch. On Thu, Nov 05, 2020 at 02:02:57PM +0200, Tomi Valkeinen wrote: > From: Sebastian Reichel <sebastian.reichel@collabora.com> > > enable_te() is not used, so the custom API can be dropped. > > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 39 ------------------- > drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 - > 2 files changed, 41 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c > index 92ac90035fec..f59775cabe2d 100644 > --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c > +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c > @@ -882,43 +882,6 @@ static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable) > return r; > } > > -static int dsicm_enable_te(struct omap_dss_device *dssdev, bool enable) > -{ > - struct panel_drv_data *ddata = to_panel_data(dssdev); > - struct omap_dss_device *src = ddata->src; > - int r; > - > - mutex_lock(&ddata->lock); > - > - if (ddata->te_enabled == enable) > - goto end; > - > - src->ops->dsi.bus_lock(src); > - > - if (ddata->enabled) { > - r = dsicm_wake_up(ddata); > - if (r) > - goto err; > - > - r = _dsicm_enable_te(ddata, enable); > - if (r) > - goto err; > - } > - > - ddata->te_enabled = enable; > - > - src->ops->dsi.bus_unlock(src); > -end: > - mutex_unlock(&ddata->lock); > - > - return 0; > -err: > - src->ops->dsi.bus_unlock(src); > - mutex_unlock(&ddata->lock); > - > - return r; > -} > - > static void dsicm_ulps_work(struct work_struct *work) > { > struct panel_drv_data *ddata = container_of(work, struct panel_drv_data, > @@ -988,8 +951,6 @@ static const struct omap_dss_device_ops dsicm_ops = { > static const struct omap_dss_driver dsicm_dss_driver = { > .update = dsicm_update, > .sync = dsicm_sync, > - > - .enable_te = dsicm_enable_te, > }; > > static int dsicm_probe_of(struct mipi_dsi_device *dsi) > diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h > index aa307f5ab9cf..55d5bca59f81 100644 > --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h > +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h > @@ -386,8 +386,6 @@ struct omap_dss_driver { > int (*update)(struct omap_dss_device *dssdev, > u16 x, u16 y, u16 w, u16 h); > int (*sync)(struct omap_dss_device *dssdev); > - > - int (*enable_te)(struct omap_dss_device *dssdev, bool enable); > }; > > struct dss_device *omapdss_get_dss(void);
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index 92ac90035fec..f59775cabe2d 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -882,43 +882,6 @@ static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable) return r; } -static int dsicm_enable_te(struct omap_dss_device *dssdev, bool enable) -{ - struct panel_drv_data *ddata = to_panel_data(dssdev); - struct omap_dss_device *src = ddata->src; - int r; - - mutex_lock(&ddata->lock); - - if (ddata->te_enabled == enable) - goto end; - - src->ops->dsi.bus_lock(src); - - if (ddata->enabled) { - r = dsicm_wake_up(ddata); - if (r) - goto err; - - r = _dsicm_enable_te(ddata, enable); - if (r) - goto err; - } - - ddata->te_enabled = enable; - - src->ops->dsi.bus_unlock(src); -end: - mutex_unlock(&ddata->lock); - - return 0; -err: - src->ops->dsi.bus_unlock(src); - mutex_unlock(&ddata->lock); - - return r; -} - static void dsicm_ulps_work(struct work_struct *work) { struct panel_drv_data *ddata = container_of(work, struct panel_drv_data, @@ -988,8 +951,6 @@ static const struct omap_dss_device_ops dsicm_ops = { static const struct omap_dss_driver dsicm_dss_driver = { .update = dsicm_update, .sync = dsicm_sync, - - .enable_te = dsicm_enable_te, }; static int dsicm_probe_of(struct mipi_dsi_device *dsi) diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index aa307f5ab9cf..55d5bca59f81 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -386,8 +386,6 @@ struct omap_dss_driver { int (*update)(struct omap_dss_device *dssdev, u16 x, u16 y, u16 w, u16 h); int (*sync)(struct omap_dss_device *dssdev); - - int (*enable_te)(struct omap_dss_device *dssdev, bool enable); }; struct dss_device *omapdss_get_dss(void);