From: Matt Roper <matthew.d.roper@intel.com>
Date: Sat, 27 Aug 2011 00:36:49 +0000 (-0700)
Subject: Turn off hardware cursors on VT switch before dropping DRM master.
X-Git-Tag: 0.85.0~374
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=045037e00590c2a9f3c85f23b5093241121c2f54;p=platform%2Fupstream%2Fweston.git

Turn off hardware cursors on VT switch before dropping DRM 

The DRM cursor ioctl requires DRM master.  We shouldn't drop
master until after we're done turning off the hardware cursors
for a VT switch.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---

diff --git a/compositor/compositor-drm.c b/compositor/compositor-drm.c
index 536760b..c28c7d2 100644
--- a/compositor/compositor-drm.c
+++ b/compositor/compositor-drm.c
@@ -745,11 +745,11 @@ vt_func(struct wlsc_compositor *compositor, int event)
 	case TTY_LEAVE_VT:
 		compositor->focus = 0;
 		compositor->state = WLSC_COMPOSITOR_SLEEPING;
-		drmDropMaster(ec->drm.fd);
 
 		wl_list_for_each(output, &ec->base.output_list, link)
 			drm_output_set_cursor(output, NULL);
 
+		drmDropMaster(ec->drm.fd);
 		break;
 	};
 }