From 899dae41f3df6ef646cb7746bf9c9134410b19da Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 25 Jul 2021 19:05:36 +0100 Subject: context_drm_egl: re-enable drmSet/DropMaster calls The ioctls were disabled a while back since they error out and allegedly cause problem with X running in another VT. Omitting the ioctls is not cool, even as a workaround. If they fail, the user is supposed to fallback appropriately - use a suid wrapper, logind-like daemon or otherwise. As of kernel 5.10, they should just work in nearly all cases, so let's just reinstate the calls. Signed-off-by: Emil Velikov --- video/out/opengl/context_drm_egl.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/video/out/opengl/context_drm_egl.c b/video/out/opengl/context_drm_egl.c index 6a74a841da..fe87f5ccc4 100644 --- a/video/out/opengl/context_drm_egl.c +++ b/video/out/opengl/context_drm_egl.c @@ -44,8 +44,6 @@ #define EGL_PLATFORM_GBM_KHR 0x31D7 #endif -#define USE_MASTER 0 - #ifndef EGL_EXT_platform_base typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list); @@ -423,15 +421,11 @@ static void release_vt(void *data) struct ra_ctx *ctx = data; MP_VERBOSE(ctx->vo, "Releasing VT\n"); crtc_release(ctx); - 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 = ctx->priv; - if (drmDropMaster(p->kms->fd)) { - MP_WARN(ctx->vo, "Failed to drop DRM master: %s\n", - mp_strerror(errno)); - } + + const struct priv *p = ctx->priv; + if (drmDropMaster(p->kms->fd)) { + MP_WARN(ctx->vo, "Failed to drop DRM master: %s\n", + mp_strerror(errno)); } } @@ -439,12 +433,11 @@ static void acquire_vt(void *data) { struct ra_ctx *ctx = data; MP_VERBOSE(ctx->vo, "Acquiring VT\n"); - if (USE_MASTER) { - struct priv *p = ctx->priv; - if (drmSetMaster(p->kms->fd)) { - MP_WARN(ctx->vo, "Failed to acquire DRM master: %s\n", - mp_strerror(errno)); - } + + const struct priv *p = ctx->priv; + if (drmSetMaster(p->kms->fd)) { + MP_WARN(ctx->vo, "Failed to acquire DRM master: %s\n", + mp_strerror(errno)); } crtc_setup(ctx); -- cgit v1.2.3