From: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue, 22 Oct 2013 19:27:46 +0000 (-0700)
Subject: compositor-drm: Don't call drop/set master anymore
X-Git-Tag: upstream/0.1.8~824
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e611264a31294bacdfb6ec0fd9a695599226d2c;p=profile%2Fivi%2Fweston-ivi-shell.git

compositor-drm: Don't call drop/set master anymore

This is done by either laucnher-util.c directly, weston-launch or
logind, depending on how we're launched.
---

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 9922708..2f33946 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -2365,10 +2365,6 @@ session_notify(struct wl_listener *listener, void *data)
 	if (ec->base.session_active) {
 		weston_log("activating session\n");
 		compositor->focus = 1;
-		if (ec->base.launcher == NULL && drmSetMaster(ec->drm.fd)) {
-			weston_log("failed to set master: %m\n");
-			wl_display_terminate(compositor->wl_display);
-		}
 		compositor->state = ec->prev_state;
 		drm_compositor_set_modes(ec);
 		weston_compositor_damage_all(compositor);
@@ -2402,9 +2398,6 @@ session_notify(struct wl_listener *listener, void *data)
 					sprite->plane_id,
 					output->crtc_id, 0, 0,
 					0, 0, 0, 0, 0, 0, 0, 0);
-
-		if (ec->base.launcher == NULL && drmDropMaster(ec->drm.fd) < 0)
-			weston_log("failed to drop master: %m\n");
 	};
 }