leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/omap: use dispc_channel_connected in output drivers

Browse Source 
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>
This commit is contained in:
Tomi Valkeinen 2015-11-05 09:34:51 +02:00
parent 49239503a3
commit f1504ad00d
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/omapdrm/dss/dpi.c
View File

@ -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;

2
drivers/gpu/drm/omapdrm/dss/dsi.c
View File

@ -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;
} }

2
drivers/gpu/drm/omapdrm/dss/hdmi4.c
View File

@ -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;

2
drivers/gpu/drm/omapdrm/dss/hdmi5.c
View File

@ -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;

2
drivers/gpu/drm/omapdrm/dss/rfbi.c
View File

@ -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;
} }

2
drivers/gpu/drm/omapdrm/dss/sdi.c
View File

@ -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;
} }

2
drivers/gpu/drm/omapdrm/dss/venc.c
View File

@ -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;