Commit f1504ad0 authored by Tomi Valkeinen's avatar Tomi Valkeinen

drm/omap: use dispc_channel_connected in output drivers

Use 'out->dispc_channel_connected' to check if the device is connected
to an overlay manager or not, instead of using 'out->manager'.
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 49239503
...@@ -395,7 +395,7 @@ static int dpi_display_enable(struct omap_dss_device *dssdev) ...@@ -395,7 +395,7 @@ static int dpi_display_enable(struct omap_dss_device *dssdev)
goto err_no_reg; goto err_no_reg;
} }
if (out->manager == NULL) { 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;
......
...@@ -3833,7 +3833,7 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel) ...@@ -3833,7 +3833,7 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)
u16 word_count; u16 word_count;
int r; int r;
if (out->manager == NULL) { if (!out->dispc_channel_connected) {
DSSERR("failed to enable display: no output/manager\n"); DSSERR("failed to enable display: no output/manager\n");
return -ENODEV; return -ENODEV;
} }
......
...@@ -348,7 +348,7 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev) ...@@ -348,7 +348,7 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev)
mutex_lock(&hdmi.lock); mutex_lock(&hdmi.lock);
if (out->manager == NULL) { 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 err0; goto err0;
......
...@@ -374,7 +374,7 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev) ...@@ -374,7 +374,7 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev)
mutex_lock(&hdmi.lock); mutex_lock(&hdmi.lock);
if (out->manager == NULL) { 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 err0; goto err0;
......
...@@ -880,7 +880,7 @@ static int rfbi_display_enable(struct omap_dss_device *dssdev) ...@@ -880,7 +880,7 @@ static int rfbi_display_enable(struct omap_dss_device *dssdev)
struct omap_dss_device *out = &rfbi.output; struct omap_dss_device *out = &rfbi.output;
int r; int r;
if (out->manager == NULL) { if (!out->dispc_channel_connected) {
DSSERR("failed to enable display: no output/manager\n"); DSSERR("failed to enable display: no output/manager\n");
return -ENODEV; return -ENODEV;
} }
......
...@@ -136,7 +136,7 @@ static int sdi_display_enable(struct omap_dss_device *dssdev) ...@@ -136,7 +136,7 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
unsigned long pck; unsigned long pck;
int r; int r;
if (out->manager == NULL) { if (!out->dispc_channel_connected) {
DSSERR("failed to enable display: no output/manager\n"); DSSERR("failed to enable display: no output/manager\n");
return -ENODEV; return -ENODEV;
} }
......
...@@ -515,7 +515,7 @@ static int venc_display_enable(struct omap_dss_device *dssdev) ...@@ -515,7 +515,7 @@ static int venc_display_enable(struct omap_dss_device *dssdev)
mutex_lock(&venc.venc_lock); mutex_lock(&venc.venc_lock);
if (out->manager == NULL) { 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 err0; goto err0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment