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>

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 557cf3bdcc4e4e5ba3068217d3cc5d6c97155a93..c4ebc7524a09bcc8d7c6461f779c431c7eda1ce3 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -395,7 +395,7 @@ static int dpi_display_enable(struct omap_dss_device *dssdev)
                goto err_no_reg;
        }
 
-       if (out->manager == NULL) {
+       if (!out->dispc_channel_connected) {
                DSSERR("failed to enable display: no output/manager\n");
                r = -ENODEV;
                goto err_no_out_mgr;

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 43be4b2a7b05150c5cac36a6d463cd2caa5ecb07..5afbaac8f25af95ffc873cb66d6e6988409a98c8 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -3833,7 +3833,7 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)
        u16 word_count;
        int r;
 
-       if (out->manager == NULL) {
+       if (!out->dispc_channel_connected) {
                DSSERR("failed to enable display: no output/manager\n");
                return -ENODEV;
        }

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index ddd6a331df39e2d269f5d94081c4892352e0c766..5d8a5ed2d3bb0f17c1a7d2d2debe578a220af5ec 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -348,7 +348,7 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev)
 
        mutex_lock(&hdmi.lock);
 
-       if (out->manager == NULL) {
+       if (!out->dispc_channel_connected) {
                DSSERR("failed to enable display: no output/manager\n");
                r = -ENODEV;
                goto err0;

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index b2dd4c9f20d54660020f5587a459c61e85a7a189..24a14029112ddbe18b015ebac9504263092a0a4c 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -374,7 +374,7 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev)
 
        mutex_lock(&hdmi.lock);
 
-       if (out->manager == NULL) {
+       if (!out->dispc_channel_connected) {
                DSSERR("failed to enable display: no output/manager\n");
                r = -ENODEV;
                goto err0;

diff --git a/drivers/gpu/drm/omapdrm/dss/rfbi.c b/drivers/gpu/drm/omapdrm/dss/rfbi.c
index aea6a1d0fb201e29ab7d18551a6dc595e3991dbd..3796576dfadf8840a404427e4bd3946d914d3367 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/rfbi.c
+++ b/drivers/gpu/drm/omapdrm/dss/rfbi.c
@@ -880,7 +880,7 @@ static int rfbi_display_enable(struct omap_dss_device *dssdev)
        struct omap_dss_device *out = &rfbi.output;
        int r;
 
-       if (out->manager == NULL) {
+       if (!out->dispc_channel_connected) {
                DSSERR("failed to enable display: no output/manager\n");
                return -ENODEV;
        }

diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index d747cc6b59e14d87c167adeb9a526a9500ed460c..33d36ab4bcf754f8ebbff79183b44c1a4b5832d7 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -136,7 +136,7 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
        unsigned long pck;
        int r;
 
-       if (out->manager == NULL) {
+       if (!out->dispc_channel_connected) {
                DSSERR("failed to enable display: no output/manager\n");
                return -ENODEV;
        }

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 08f9def76e2780a0700fa4fe60b0b0e806adec65..037c5b4e2ed6bc89d66e56c6f843806cf075bbbf 100644 (file)
--- 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;