diff options
| author | Matt Roper <matthew.d.roper@intel.com> | 2011-08-26 17:36:49 -0700 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-08-27 12:10:19 -0400 |
| commit | 045037e00590c2a9f3c85f23b5093241121c2f54 (patch) | |
| tree | 3ef77aeb689619aef617f4ba516334531a9104c6 | |
| parent | c0827fd9d690afac1d9202f04445e946c8ff25ee (diff) | |
| download | weston-045037e00590c2a9f3c85f23b5093241121c2f54.tar.gz | |
Turn off hardware cursors on VT switch before dropping DRM master.
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>
| -rw-r--r-- | compositor/compositor-drm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compositor/compositor-drm.c b/compositor/compositor-drm.c index 536760b3..c28c7d2d 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; }; } |