From: Frank Binns Date: Tue, 28 Jul 2020 14:50:30 +0000 (+0100) Subject: egl/dri2: only take a dri2_dpy reference when binding a new context/surfaces X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=d0e32e5f8105eccd075ebbf42594100ed663fd6e egl/dri2: only take a dri2_dpy reference when binding a new context/surfaces This effectively reverts part of 2907faee, which changed dri2_make_current() to always take a dri2_dpy reference regardless of whether or not a new context or surface(s) were being bound. This led to a reference count imbalance as there was no corresponding code added to drop a reference on the dri2_dpy. As a consequence, any application that called eglInitialize() on a default/native display after having called eglTerminate() would always get back the old dri2_dpy, inheriting its previous state. As the reference count is there to prevent the dri2_dpy from being destroyed between eglTerminate() and eglInitialize() calls when a context is still bound, a reference should only be taken when a successful call to dri2_dpy->core->bindContext() has been made. Fix the issue by restoring the old reference counting behaviour. Fixes: 4e8f95f64d004 ("egl_dri2: Always unbind old contexts") Fixes: 2907faee7a397 ("egl/dri2: try to bind old context if bindContext failed") Signed-off-by: Frank Binns Reviewed-by: Luigi Santivetti Reviewed-by: Emil Velikov Tested-by: Nicolas Cortes Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3328 Part-of: --- diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 299508b679c..ba0d78cf64d 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1852,6 +1852,13 @@ dri2_make_current(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *dsurf, tmp_rsurf == old_rsurf); _eglLog(_EGL_WARNING, "DRI2: failed to rebind the previous context"); + } else { + /* dri2_dpy->core->bindContext succeeded, so take a reference on the + * dri2_dpy. This prevents dri2_dpy from being reinitialized when a + * EGLDisplay is terminated and then initialized again while a + * context is still bound. See dri2_intitialize() for a more in depth + * explanation. */ + dri2_dpy->ref_count++; } } @@ -1866,8 +1873,6 @@ dri2_make_current(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *dsurf, if (egl_error != EGL_SUCCESS) return _eglError(egl_error, "eglMakeCurrent"); - dri2_dpy->ref_count++; - if (dsurf && _eglSurfaceHasMutableRenderBuffer(dsurf) && dri2_dpy->vtbl->set_shared_buffer_mode) { /* Always update the shared buffer mode. This is obviously needed when