| Message ID | 20201124124538.660710-74-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, Thank you for the patch. On Tue, Nov 24, 2020 at 02:45:31PM +0200, Tomi Valkeinen wrote: > We can drop dsi_display_enable(), which just calls > _dsi_display_enable(), and rename _dsi_display_enable() to > dsi_display_enable(). How about adding a comment here to explain why the WARN_ON() is needed anymore ? Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > --- > drivers/gpu/drm/omapdrm/dss/dsi.c | 16 +++------------- > 1 file changed, 3 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c > index 4f79d6c664ff..e50418db71ef 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dsi.c > +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c > @@ -3738,7 +3738,7 @@ static void dsi_display_uninit_dsi(struct dsi_data *dsi, bool disconnect_lanes, > } > } > > -static void _dsi_display_enable(struct dsi_data *dsi) > +static void dsi_display_enable(struct dsi_data *dsi) > { > int r; > > @@ -3767,16 +3767,6 @@ static void _dsi_display_enable(struct dsi_data *dsi) > DSSDBG("dsi_display_ulps_enable FAILED\n"); > } > > -static void dsi_display_enable(struct omap_dss_device *dssdev) > -{ > - struct dsi_data *dsi = to_dsi_data(dssdev); > - DSSDBG("dsi_display_enable\n"); > - > - WARN_ON(!dsi_bus_is_locked(dsi)); > - > - _dsi_display_enable(dsi); > -} > - > static void _dsi_display_disable(struct dsi_data *dsi, > bool disconnect_lanes, bool enter_ulps) > { > @@ -3851,7 +3841,7 @@ static void dsi_set_ulps_auto(struct dsi_data *dsi, bool enable) > return; > > dsi_bus_lock(dsi); > - _dsi_display_enable(dsi); > + dsi_display_enable(dsi); > dsi_enable_te(dsi, true); > dsi_bus_unlock(dsi); > } > @@ -4942,7 +4932,7 @@ static void dsi_bridge_enable(struct drm_bridge *bridge) > > dsi_bus_lock(dsi); > > - dsi_display_enable(dssdev); > + dsi_display_enable(dsi); > > dsi_enable_video_output(dssdev, VC_VIDEO); >
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 4f79d6c664ff..e50418db71ef 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -3738,7 +3738,7 @@ static void dsi_display_uninit_dsi(struct dsi_data *dsi, bool disconnect_lanes, } } -static void _dsi_display_enable(struct dsi_data *dsi) +static void dsi_display_enable(struct dsi_data *dsi) { int r; @@ -3767,16 +3767,6 @@ static void _dsi_display_enable(struct dsi_data *dsi) DSSDBG("dsi_display_ulps_enable FAILED\n"); } -static void dsi_display_enable(struct omap_dss_device *dssdev) -{ - struct dsi_data *dsi = to_dsi_data(dssdev); - DSSDBG("dsi_display_enable\n"); - - WARN_ON(!dsi_bus_is_locked(dsi)); - - _dsi_display_enable(dsi); -} - static void _dsi_display_disable(struct dsi_data *dsi, bool disconnect_lanes, bool enter_ulps) { @@ -3851,7 +3841,7 @@ static void dsi_set_ulps_auto(struct dsi_data *dsi, bool enable) return; dsi_bus_lock(dsi); - _dsi_display_enable(dsi); + dsi_display_enable(dsi); dsi_enable_te(dsi, true); dsi_bus_unlock(dsi); } @@ -4942,7 +4932,7 @@ static void dsi_bridge_enable(struct drm_bridge *bridge) dsi_bus_lock(dsi); - dsi_display_enable(dssdev); + dsi_display_enable(dsi); dsi_enable_video_output(dssdev, VC_VIDEO);
We can drop dsi_display_enable(), which just calls _dsi_display_enable(), and rename _dsi_display_enable() to dsi_display_enable(). Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/gpu/drm/omapdrm/dss/dsi.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)