forked from Minki/linux
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>
This commit is contained in:
parent
49239503a3
commit
f1504ad00d
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user