diff --git a/video/out/vo_drm.c b/video/out/vo_drm.c index a2fada99d1..c0ce1707ff 100644 --- a/video/out/vo_drm.c +++ b/video/out/vo_drm.c @@ -45,7 +45,6 @@ #define BYTES_PER_PIXEL 4 #define BITS_PER_PIXEL 32 -#define USE_MASTER 0 struct framebuffer { uint32_t width; @@ -255,25 +254,19 @@ static void release_vt(void *data) { struct vo *vo = data; crtc_release(vo); - if (USE_MASTER) { - //this function enables support for switching to x, weston etc. - //however, for whatever reason, it can be called only by root users. - //until things change, this is commented. - struct priv *p = vo->priv; - if (drmDropMaster(p->kms->fd)) { - MP_WARN(vo, "Failed to drop DRM master: %s\n", mp_strerror(errno)); - } + + const struct priv *p = vo->priv; + if (drmDropMaster(p->kms->fd)) { + MP_WARN(vo, "Failed to drop DRM master: %s\n", mp_strerror(errno)); } } static void acquire_vt(void *data) { struct vo *vo = data; - if (USE_MASTER) { - struct priv *p = vo->priv; - if (drmSetMaster(p->kms->fd)) { - MP_WARN(vo, "Failed to acquire DRM master: %s\n", mp_strerror(errno)); - } + const struct priv *p = vo->priv; + if (drmSetMaster(p->kms->fd)) { + MP_WARN(vo, "Failed to acquire DRM master: %s\n", mp_strerror(errno)); } crtc_setup(vo);