fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 16:20:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

XQuartz: Avoid a possible deadlock with DRI on OS X 10.7.5 and OS X 10.8.2

Browse source 
<rdar://problem/12338921>
http://bugs.winehq.org/show_bug.cgi?id=31751

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 25d26875bc)
This commit is contained in:
Jeremy Huddleston Sequoia 2012-09-20 21:49:40 -07:00
parent 9422321b37
commit 01aac1f533
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hw/xquartz/xpr/dri.c
View file

@ -68,6 +68,7 @@
#include "mi.h" #include "mi.h"
#include "mipointer.h" #include "mipointer.h"
#include "rootless.h" #include "rootless.h"
#include "rootlessCommon.h"
#include "x-hash.h" #include "x-hash.h"
#include "x-hook.h" #include "x-hook.h"
#include "driWrap.h" #include "driWrap.h"
@ -384,6 +385,11 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
DRIDrawablePrivPtr pDRIDrawablePriv; DRIDrawablePrivPtr pDRIDrawablePriv;
if (pDrawable->type == DRAWABLE_WINDOW) { if (pDrawable->type == DRAWABLE_WINDOW) {
/* <rdar://problem/12338921>
* http://bugs.winehq.org/show_bug.cgi?id=31751
*/
RootlessStopDrawing((WindowPtr)pDrawable, FALSE);
pDRIDrawablePriv = CreateSurfaceForWindow(pScreen, pDRIDrawablePriv = CreateSurfaceForWindow(pScreen,
(WindowPtr)pDrawable, &wid); (WindowPtr)pDrawable, &wid);