Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1504ad0 authored Nov 05, 2015 by 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: Tomi Valkeinen <tomi.valkeinen@ti.com>

parent 49239503

drivers/gpu/drm/omapdrm/dss/dpi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/gpu/drm/omapdrm/dss/dsi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/gpu/drm/omapdrm/dss/hdmi4.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/gpu/drm/omapdrm/dss/hdmi5.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/gpu/drm/omapdrm/dss/rfbi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}