aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/dss/venc.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-11-05 09:34:51 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2016-03-03 17:38:22 +0200
commitf1504ad00daeeb301936f8695be28edb61613b76 (patch)
tree34605c9e519745f9d392b20d01b4829363c66dc7 /drivers/gpu/drm/omapdrm/dss/venc.c
parentdrm/omap: add dispc_channel_connected field to omap_dss_device (diff)
downloadlinux-dev-f1504ad00daeeb301936f8695be28edb61613b76.tar.xz
linux-dev-f1504ad00daeeb301936f8695be28edb61613b76.zip
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: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/venc.c')
-rw-r--r--drivers/gpu/drm/omapdrm/dss/venc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 08f9def76e27..037c5b4e2ed6 100644
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -515,7 +515,7 @@ static int venc_display_enable(struct omap_dss_device *dssdev)
mutex_lock(&venc.venc_lock);
- if (out->manager == NULL) {
+ if (!out->dispc_channel_connected) {
DSSERR("Failed to enable display: no output/manager\n");
r = -ENODEV;
goto err0;