| Message ID | 20201105120333.947408-20-tomi.valkeinen@ti.com |
|---|---|
| State | Superseded |
| 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:56PM +0200, Tomi Valkeinen wrote: > From: Sebastian Reichel <sebastian.reichel@collabora.com> > > The get_te() callback is not used, so we can drop the > custom API. > > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> You could squash this with the previous and next patches. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 13 ------------- > drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 - > 2 files changed, 14 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c > index dd9112ca76ba..92ac90035fec 100644 > --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c > +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c > @@ -919,18 +919,6 @@ static int dsicm_enable_te(struct omap_dss_device *dssdev, bool enable) > return r; > } > > -static int dsicm_get_te(struct omap_dss_device *dssdev) > -{ > - struct panel_drv_data *ddata = to_panel_data(dssdev); > - int r; > - > - mutex_lock(&ddata->lock); > - r = ddata->te_enabled; > - 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, > @@ -1002,7 +990,6 @@ static const struct omap_dss_driver dsicm_dss_driver = { > .sync = dsicm_sync, > > .enable_te = dsicm_enable_te, > - .get_te = dsicm_get_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 e67928373560..aa307f5ab9cf 100644 > --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h > +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h > @@ -388,7 +388,6 @@ struct omap_dss_driver { > int (*sync)(struct omap_dss_device *dssdev); > > int (*enable_te)(struct omap_dss_device *dssdev, bool enable); > - int (*get_te)(struct omap_dss_device *dssdev); > }; > > struct dss_device *omapdss_get_dss(void); -- Regards, Laurent Pinchart
On 09/11/2020 10:45, Laurent Pinchart wrote: > Hi Tomi and Sebastian, > > Thank you for the patch. > > On Thu, Nov 05, 2020 at 02:02:56PM +0200, Tomi Valkeinen wrote: >> From: Sebastian Reichel <sebastian.reichel@collabora.com> >> >> The get_te() callback is not used, so we can drop the >> custom API. >> >> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> >> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > > You could squash this with the previous and next patches. I'd rather keep them separate. They are independent changes, and managing conflicts is easier when the patches do only a single thing. Tomi -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index dd9112ca76ba..92ac90035fec 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -919,18 +919,6 @@ static int dsicm_enable_te(struct omap_dss_device *dssdev, bool enable) return r; } -static int dsicm_get_te(struct omap_dss_device *dssdev) -{ - struct panel_drv_data *ddata = to_panel_data(dssdev); - int r; - - mutex_lock(&ddata->lock); - r = ddata->te_enabled; - 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, @@ -1002,7 +990,6 @@ static const struct omap_dss_driver dsicm_dss_driver = { .sync = dsicm_sync, .enable_te = dsicm_enable_te, - .get_te = dsicm_get_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 e67928373560..aa307f5ab9cf 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -388,7 +388,6 @@ struct omap_dss_driver { int (*sync)(struct omap_dss_device *dssdev); int (*enable_te)(struct omap_dss_device *dssdev, bool enable); - int (*get_te)(struct omap_dss_device *dssdev); }; struct dss_device *omapdss_get_dss(void);