Message ID | 20201208122855.254819-2-tomi.valkeinen@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Convert DSI code to use drm_mipi_dsi and drm_panel (second half) | expand |
Hi, On Tue, Dec 08, 2020 at 02:28:27PM +0200, Tomi Valkeinen wrote: > Simplify the code by moving code from _dsicm_enable_te() into > dsicm_power_on(). > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > Reviewed-by: Sam Ravnborg <sam@ravnborg.org> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> -- Sebastian > drivers/gpu/drm/panel/panel-dsi-cm.c | 23 ++++------------------- > 1 file changed, 4 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/panel/panel-dsi-cm.c b/drivers/gpu/drm/panel/panel-dsi-cm.c > index 729b42b4dabd..38f79dca1fd0 100644 > --- a/drivers/gpu/drm/panel/panel-dsi-cm.c > +++ b/drivers/gpu/drm/panel/panel-dsi-cm.c > @@ -68,8 +68,6 @@ static inline struct panel_drv_data *panel_to_ddata(struct drm_panel *panel) > return container_of(panel, struct panel_drv_data, panel); > } > > -static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable); > - > static void dsicm_bl_power(struct panel_drv_data *ddata, bool enable) > { > struct backlight_device *backlight; > @@ -313,10 +311,13 @@ static int dsicm_power_on(struct panel_drv_data *ddata) > if (r) > goto err; > > - r = _dsicm_enable_te(ddata, true); > + r = mipi_dsi_dcs_set_tear_on(ddata->dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK); > if (r) > goto err; > > + /* possible panel bug */ > + msleep(100); > + > ddata->enabled = true; > > if (!ddata->intro_printed) { > @@ -417,22 +418,6 @@ static int dsicm_disable(struct drm_panel *panel) > return r; > } > > -static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable) > -{ > - struct mipi_dsi_device *dsi = ddata->dsi; > - int r; > - > - if (enable) > - r = mipi_dsi_dcs_set_tear_on(dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK); > - else > - r = mipi_dsi_dcs_set_tear_off(dsi); > - > - /* possible panel bug */ > - msleep(100); > - > - return r; > -} > - > static int dsicm_get_modes(struct drm_panel *panel, > struct drm_connector *connector) > { > -- > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki >
diff --git a/drivers/gpu/drm/panel/panel-dsi-cm.c b/drivers/gpu/drm/panel/panel-dsi-cm.c index 729b42b4dabd..38f79dca1fd0 100644 --- a/drivers/gpu/drm/panel/panel-dsi-cm.c +++ b/drivers/gpu/drm/panel/panel-dsi-cm.c @@ -68,8 +68,6 @@ static inline struct panel_drv_data *panel_to_ddata(struct drm_panel *panel) return container_of(panel, struct panel_drv_data, panel); } -static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable); - static void dsicm_bl_power(struct panel_drv_data *ddata, bool enable) { struct backlight_device *backlight; @@ -313,10 +311,13 @@ static int dsicm_power_on(struct panel_drv_data *ddata) if (r) goto err; - r = _dsicm_enable_te(ddata, true); + r = mipi_dsi_dcs_set_tear_on(ddata->dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK); if (r) goto err; + /* possible panel bug */ + msleep(100); + ddata->enabled = true; if (!ddata->intro_printed) { @@ -417,22 +418,6 @@ static int dsicm_disable(struct drm_panel *panel) return r; } -static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable) -{ - struct mipi_dsi_device *dsi = ddata->dsi; - int r; - - if (enable) - r = mipi_dsi_dcs_set_tear_on(dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK); - else - r = mipi_dsi_dcs_set_tear_off(dsi); - - /* possible panel bug */ - msleep(100); - - return r; -} - static int dsicm_get_modes(struct drm_panel *panel, struct drm_connector *connector) {