Commit 0f770b47 authored Aug 03, 2011 by Daniel Morsing Committed by Tomi Valkeinen Sep 14, 2011

OMAP: DSS2: Don't allow moving managers away from enabled displays



If a manager is moved while attached to an enabled display, the DSS
system will be left in an inconsistent state. This will eventually cause
a kernel oops when the enabled display is disabled.

Fix this by not allowing the user to move a manager away from an enabled
display.

Signed-off-by: Daniel Morsing <daniel.morsing@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

parent 05e1d606

drivers/video/omap2/dss/manager.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -586,6 +586,13 @@ static int omap_dss_unset_device(struct omap_overlay_manager *mgr)
		return -EINVAL;
		}

		/*
		* Don't allow currently enabled displays to have the overlay manager
		* pulled out from underneath them
		*/
		if (mgr->device->state != OMAP_DSS_DISPLAY_DISABLED)
		return -EINVAL;

		mgr->device->manager = NULL;
		mgr->device = NULL;
		mgr->device_changed = true;

Admin message