[v3,12/50] drm/omap: Remove enable checks from display .enable() and .remove()

Message ID	20190211094705.2845-13-laurent.pinchart@ideasonboard.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <dri-devel-bounces@lists.freedesktop.org> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 12/50] drm/omap: Remove enable checks from display .enable() and .remove() Date: Mon, 11 Feb 2019 11:46:27 +0200 Message-Id: <20190211094705.2845-13-laurent.pinchart@ideasonboard.com> In-Reply-To: <20190211094705.2845-1-laurent.pinchart@ideasonboard.com> References: <20190211094705.2845-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Precedence: list Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
Series	omapdrm: drm_bridge and drm_panel support \| expand [v3,00/50] omapdrm: drm_bridge and drm_panel support [v3,01/50] drm/atomic: Constify mode argument to mode_valid_path() [v3,02/50] drm/omap: dsi: Fix crash in DSI debug dumps [v3,03/50] drm/omap: dsi: Fix OF platform depopulate [v3,04/50] drm/omap: dsi: Hack-fix DSI bus flags [v3,05/50] drm/omap: Remove declaration of nonexisting function [v3,06/50] drm/omap: Remove unused kobj field from struct omap_dss_device [v3,07/50] drm/omap: venc: Remove wss_data field from venc_device structure [v3,08/50] drm/omap: Use atomic suspend/resume helpers [v3,09/50] drm/omap: Move common display enable/disable code to encoder [v3,10/50] drm/omap: Remove connection checks from internal encoders .enable() [v3,11/50] drm/omap: Remove connection checks from display .enable() and .remove() [v3,12/50] drm/omap: Remove enable checks from display .enable() and .remove() [v3,13/50] drm/omap: Reverse direction of the DSS device enable/disable operations [v3,14/50] drm/omap: Remove omap_dss_device dst field [v3,15/50] drm/omap: Factor out common init/cleanup code for output devices [v3,16/50] drm/omap: Expose DRM modes instead of timings in display devices [v3,17/50] drm/omap: Merge display .get_modes() and .get_size() operations [v3,18/50] drm/omap: Add a dss device operation flag for .get_modes() [v3,19/50] drm/omap: venc: List both PAL and NTSC modes [v3,20/50] drm/omap: Don't pass display pointer to encoder init function [v3,21/50] drm/omap: Move display alias ID to omap_drm_pipeline [v3,22/50] drm/omap: Don't store display pointer in omap_connector structure [v3,23/50] drm/omap: panel-dsi-cm: Store source pointer internally [v3,24/50] drm/omap: Notify all devices in the pipeline of output disconnection [v3,25/50] drm/omap: Remove src field from omap_dss_device structure [v3,26/50] drm/omap: Move DISPC timing checks to CRTC .mode_valid() operation [v3,27/50] drm/omap: venc: Simplify mode setting by caching configuration [v3,28/50] drm/omap: Factor out common mode validation code [v3,29/50] drm/omap: Pass drm_display_mode to .check_timings() and .set_timings() [v3,30/50] drm/omap: venc: Use drm_display_mode natively [v3,31/50] drm/omap: Store pixel clock instead of full mode in DPI and SDI encoders [v3,32/50] drm/omap: Simplify OF lookup of DSS devices [v3,33/50] drm/omap: Refactor initialization sequence [v3,34/50] drm/omap: Merge omap_dss_device type and output_type fields [v3,35/50] drm: Clarify definition of the DRM_BUS_FLAG_(PIXDATA\|SYNC)_* macros [v3,36/50] drm: Use new DRM_BUS_FLAG_*_(DRIVE\|SAMPLE)_(POS\|NEG)EDGE flags [v3,37/50] drm/bridge: use bus flags in bridge timings [v3,38/50] dt-bindings: display: tfp410: Add bus parameters properties [v3,39/50] drm/bridge: ti-tfp410: Set connector type based on DT connector node [v3,40/50] drm/bridge: ti-tfp410: Add support for the powerdown GPIO [v3,41/50] drm/bridge: ti-tfp410: Report input bus config through bridge timings [v3,42/50] dt-bindings: Add vendor prefix for OSD Displays [v3,43/50] dt-bindings: display: Add OSD Displays OSD070T1718-19TS panel binding [v3,44/50] drm/panel: simple: Add OSD070T1718-19TS panel support [v3,45/50] drm/omap: Add support for drm_bridge [v3,46/50] drm/omap: Add support for drm_panel [v3,47/50] drm/omap: Whitelist DT nodes to fixup with omapdss, prefix [v3,48/50] drm/omap: Remove TFP410 and DVI connector drivers [v3,49/50] drm/omap: Remove panel-dpi driver [v3,50/50] drm: Turn bus flags macros into an enum

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c index 910a5b9c036a..2b5b77627cfb 100644 --- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c +++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c @@ -46,9 +46,6 @@ static void tvc_disable(struct omap_dss_device *dssdev) { struct omap_dss_device *src = dssdev->src; - if (!omapdss_device_is_enabled(dssdev)) - return; - src->ops->disable(src); } @@ -92,7 +89,8 @@ static int __exit tvc_remove(struct platform_device *pdev) omapdss_device_unregister(&ddata->dssdev); - tvc_disable(dssdev); + if (omapdss_device_is_enabled(dssdev)) + tvc_disable(dssdev); return 0; } diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c index 1e0925791c3d..a1784e263835 100644 --- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c +++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c @@ -57,9 +57,6 @@ static void dvic_disable(struct omap_dss_device *dssdev) { struct omap_dss_device *src = dssdev->src; - if (!omapdss_device_is_enabled(dssdev)) - return; - src->ops->disable(src); } @@ -282,7 +279,8 @@ static int __exit dvic_remove(struct platform_device *pdev) omapdss_device_unregister(&ddata->dssdev); - dvic_disable(dssdev); + if (omapdss_device_is_enabled(dssdev)) + dvic_disable(dssdev); i2c_put_adapter(ddata->i2c_adapter); diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c index 649364e04edd..05cd503c4d29 100644 --- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c +++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c @@ -52,9 +52,6 @@ static void hdmic_disable(struct omap_dss_device *dssdev) { struct omap_dss_device *src = dssdev->src; - if (!omapdss_device_is_enabled(dssdev)) - return; - src->ops->disable(src); } @@ -179,7 +176,8 @@ static int __exit hdmic_remove(struct platform_device *pdev) omapdss_device_unregister(&ddata->dssdev); - hdmic_disable(dssdev); + if (omapdss_device_is_enabled(dssdev)) + hdmic_disable(dssdev); return 0; } diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c index 0b1032625e42..ce116c28479f 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c @@ -49,9 +49,6 @@ static int opa362_enable(struct omap_dss_device *dssdev) dev_dbg(dssdev->dev, "enable\n"); - if (omapdss_device_is_enabled(dssdev)) - return 0; - r = src->ops->enable(src); if (r) return r; @@ -71,9 +68,6 @@ static void opa362_disable(struct omap_dss_device *dssdev) dev_dbg(dssdev->dev, "disable\n"); - if (!omapdss_device_is_enabled(dssdev)) - return; - if (ddata->enable_gpio) gpiod_set_value_cansleep(ddata->enable_gpio, 0); diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c index fcc2dc5188a2..d51410ed1e13 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c @@ -42,9 +42,6 @@ static int tfp410_enable(struct omap_dss_device *dssdev) struct omap_dss_device *src = dssdev->src; int r; - if (omapdss_device_is_enabled(dssdev)) - return 0; - r = src->ops->enable(src); if (r) return r; @@ -62,9 +59,6 @@ static void tfp410_disable(struct omap_dss_device *dssdev) struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *src = dssdev->src; - if (!omapdss_device_is_enabled(dssdev)) - return; - if (ddata->pd_gpio) gpiod_set_value_cansleep(ddata->pd_gpio, 0); diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c index ded779a598d3..3ef4596a3698 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c @@ -72,9 +72,6 @@ static void panel_dpi_disable(struct omap_dss_device *dssdev) struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *src = dssdev->src; - if (!omapdss_device_is_enabled(dssdev)) - return; - backlight_disable(ddata->backlight); gpiod_set_value_cansleep(ddata->enable_gpio, 0); @@ -182,7 +179,8 @@ static int __exit panel_dpi_remove(struct platform_device *pdev) omapdss_device_unregister(dssdev); - panel_dpi_disable(dssdev); + if (omapdss_device_is_enabled(dssdev)) + panel_dpi_disable(dssdev); return 0; } diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index e346451647c4..a7c8688237fb 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -829,11 +829,9 @@ static void dsicm_disable(struct omap_dss_device *dssdev) src->ops->dsi.bus_lock(src); - if (omapdss_device_is_enabled(dssdev)) { - r = dsicm_wake_up(ddata); - if (!r) - dsicm_power_off(ddata); - } + r = dsicm_wake_up(ddata); + if (!r) + dsicm_power_off(ddata); src->ops->dsi.bus_unlock(src); @@ -1367,7 +1365,8 @@ static int __exit dsicm_remove(struct platform_device *pdev) omapdss_device_unregister(dssdev); - dsicm_disable(dssdev); + if (omapdss_device_is_enabled(dssdev)) + dsicm_disable(dssdev); omapdss_device_disconnect(dssdev->src, dssdev); sysfs_remove_group(&pdev->dev.kobj, &dsicm_attr_group); diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c index 19c0c3e85aa5..2c3b15ba5a39 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c @@ -144,9 +144,6 @@ static void lb035q02_disable(struct omap_dss_device *dssdev) struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *src = dssdev->src; - if (!omapdss_device_is_enabled(dssdev)) - return; - if (ddata->enable_gpio) gpiod_set_value_cansleep(ddata->enable_gpio, 0); @@ -235,7 +232,8 @@ static int lb035q02_panel_spi_remove(struct spi_device *spi) omapdss_device_unregister(dssdev); - lb035q02_disable(dssdev); + if (omapdss_device_is_enabled(dssdev)) + lb035q02_disable(dssdev); return 0; } diff --git a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c index 9cef1d16d7d3..ef83459611be 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c @@ -138,9 +138,6 @@ static void nec_8048_disable(struct omap_dss_device *dssdev) struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *src = dssdev->src; - if (!omapdss_device_is_enabled(dssdev)) - return; - gpiod_set_value_cansleep(ddata->res_gpio, 0); src->ops->disable(src); @@ -226,7 +223,8 @@ static int nec_8048_remove(struct spi_device *spi) omapdss_device_unregister(dssdev); - nec_8048_disable(dssdev); + if (omapdss_device_is_enabled(dssdev)) + nec_8048_disable(dssdev); return 0; } diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c index 5a06fbb7984a..0c5b405b4c9e 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c @@ -97,9 +97,6 @@ static void sharp_ls_disable(struct omap_dss_device *dssdev) struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *src = dssdev->src; - if (!omapdss_device_is_enabled(dssdev)) - return; - if (ddata->ini_gpio) gpiod_set_value_cansleep(ddata->ini_gpio, 0); @@ -233,7 +230,8 @@ static int __exit sharp_ls_remove(struct platform_device *pdev) omapdss_device_unregister(dssdev); - sharp_ls_disable(dssdev); + if (omapdss_device_is_enabled(dssdev)) + sharp_ls_disable(dssdev); return 0; } diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c index 209a87c70c99..99c2c4f27dd5 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c @@ -605,9 +605,6 @@ static void acx565akm_disable(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); - if (!omapdss_device_is_enabled(dssdev)) - return; - mutex_lock(&ddata->mutex); acx565akm_panel_power_off(dssdev); mutex_unlock(&ddata->mutex); @@ -750,7 +747,8 @@ static int acx565akm_remove(struct spi_device *spi) omapdss_device_unregister(dssdev); - acx565akm_disable(dssdev); + if (omapdss_device_is_enabled(dssdev)) + acx565akm_disable(dssdev); return 0; } diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c index b09fea97a441..8551a1df3ad6 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c @@ -270,9 +270,6 @@ static void td028ttec1_panel_disable(struct omap_dss_device *dssdev) struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *src = dssdev->src; - if (!omapdss_device_is_enabled(dssdev)) - return; - dev_dbg(dssdev->dev, "td028ttec1_panel_disable()\n"); jbt_ret_write_0(ddata, JBT_REG_DISPLAY_OFF); @@ -357,7 +354,8 @@ static int td028ttec1_panel_remove(struct spi_device *spi) omapdss_device_unregister(dssdev); - td028ttec1_panel_disable(dssdev); + if (omapdss_device_is_enabled(dssdev)) + td028ttec1_panel_disable(dssdev); return 0; } diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c index 998f21f7701a..527abed69d34 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c @@ -350,9 +350,6 @@ static void tpo_td043_disable(struct omap_dss_device *dssdev) struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *src = dssdev->src; - if (!omapdss_device_is_enabled(dssdev)) - return; - src->ops->disable(src); if (!ddata->spi_suspended) @@ -457,7 +454,8 @@ static int tpo_td043_remove(struct spi_device *spi) omapdss_device_unregister(dssdev); - tpo_td043_disable(dssdev); + if (omapdss_device_is_enabled(dssdev)) + tpo_td043_disable(dssdev); sysfs_remove_group(&spi->dev.kobj, &tpo_td043_attr_group); diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c index 3c3d88e1df38..d14d465392dd 100644 --- a/drivers/gpu/drm/omapdrm/omap_encoder.c +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c @@ -151,9 +151,6 @@ static void omap_encoder_disable(struct drm_encoder *encoder) dev_dbg(dev->dev, "disable(%s)\n", dssdev->name); - if (!omapdss_device_is_enabled(dssdev)) - return; - dssdev->ops->disable(dssdev); dssdev->state = OMAP_DSS_DISPLAY_DISABLED; @@ -168,9 +165,6 @@ static void omap_encoder_enable(struct drm_encoder *encoder) dev_dbg(dev->dev, "enable(%s)\n", dssdev->name); - if (omapdss_device_is_enabled(dssdev)) - return; - r = dssdev->ops->enable(dssdev); if (r) { dev_err(dev->dev, "Failed to enable display '%s': %d\n",

[v3,12/50] drm/omap: Remove enable checks from display .enable() and .remove()

Commit Message

Patch