From: Michel Dänzer <daenzer@vmware.com>
Date: Mon, 16 Mar 2009 10:33:14 +0000 (+0100)
Subject: radeon: Take the hardware lock for swaps and flips.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9c591c52c7a9a75fc1f5822ed2f5e7e82ab396a5;p=mesa.git

radeon: Take the hardware lock for swaps and flips.

Otherwise they fail with AIGLX at least.
---

diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
index 99270c947f3..5ee8627bba7 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
@@ -420,6 +420,7 @@ void radeonCopyBuffer( __DRIdrawablePrivate *dPriv,
 		fprintf( stderr, "\n%s( %p )\n\n", __FUNCTION__, (void *) rmesa->glCtx );
 	}
 
+	LOCK_HARDWARE( rmesa );
 	nbox = dPriv->numClipRects; /* must be in locked region */
 
 	for ( i = 0 ; i < nbox ; ) {
@@ -509,6 +510,8 @@ static GLboolean radeonPageFlip( __DRIdrawablePrivate *dPriv )
 
 	psp = dPriv->driScreenPriv;
 
+	LOCK_HARDWARE( radeon );
+
 	if ( RADEON_DEBUG & DEBUG_IOCTL ) {
 		fprintf(stderr, "%s: pfCurrentPage: %d %d\n", __FUNCTION__,
 			radeon->sarea->pfCurrentPage, radeon->sarea->pfState);