瀏覽代碼

drm: omapdrm: dpi: Remove unneeded regulator check

The dpi_display_enable() function ensures that a VDDS_DSI regulator is
available if the DSI uses the VDDS_DSI supply. This is not needed, as a
failure to get the VDDS_DSI supply will result in a probe failure,
dpi_display_enable() will thus never be called in that case.

Remove the check, and replace tests for the FEAT_DPI_USES_VDDS_DSI
feature with a test for the regulator object.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Laurent Pinchart 8 年之前
父節點
當前提交
e65837b5b2
共有 1 個文件被更改,包括 3 次插入10 次删除
  1. 3 10
      drivers/gpu/drm/omapdrm/dss/dpi.c

+ 3 - 10
drivers/gpu/drm/omapdrm/dss/dpi.c

@@ -403,19 +403,13 @@ static int dpi_display_enable(struct omap_dss_device *dssdev)
 
 
 	mutex_lock(&dpi->lock);
 	mutex_lock(&dpi->lock);
 
 
-	if (dss_has_feature(FEAT_DPI_USES_VDDS_DSI) && !dpi->vdds_dsi_reg) {
-		DSSERR("no VDSS_DSI regulator\n");
-		r = -ENODEV;
-		goto err_no_reg;
-	}
-
 	if (!out->dispc_channel_connected) {
 	if (!out->dispc_channel_connected) {
 		DSSERR("failed to enable display: no output/manager\n");
 		DSSERR("failed to enable display: no output/manager\n");
 		r = -ENODEV;
 		r = -ENODEV;
 		goto err_no_out_mgr;
 		goto err_no_out_mgr;
 	}
 	}
 
 
-	if (dss_has_feature(FEAT_DPI_USES_VDDS_DSI)) {
+	if (dpi->vdds_dsi_reg) {
 		r = regulator_enable(dpi->vdds_dsi_reg);
 		r = regulator_enable(dpi->vdds_dsi_reg);
 		if (r)
 		if (r)
 			goto err_reg_enable;
 			goto err_reg_enable;
@@ -459,11 +453,10 @@ err_pll_init:
 err_src_sel:
 err_src_sel:
 	dispc_runtime_put();
 	dispc_runtime_put();
 err_get_dispc:
 err_get_dispc:
-	if (dss_has_feature(FEAT_DPI_USES_VDDS_DSI))
+	if (dpi->vdds_dsi_reg)
 		regulator_disable(dpi->vdds_dsi_reg);
 		regulator_disable(dpi->vdds_dsi_reg);
 err_reg_enable:
 err_reg_enable:
 err_no_out_mgr:
 err_no_out_mgr:
-err_no_reg:
 	mutex_unlock(&dpi->lock);
 	mutex_unlock(&dpi->lock);
 	return r;
 	return r;
 }
 }
@@ -484,7 +477,7 @@ static void dpi_display_disable(struct omap_dss_device *dssdev)
 
 
 	dispc_runtime_put();
 	dispc_runtime_put();
 
 
-	if (dss_has_feature(FEAT_DPI_USES_VDDS_DSI))
+	if (dpi->vdds_dsi_reg)
 		regulator_disable(dpi->vdds_dsi_reg);
 		regulator_disable(dpi->vdds_dsi_reg);
 
 
 	mutex_unlock(&dpi->lock);
 	mutex_unlock(&dpi->lock);