diff options
Diffstat (limited to 'src/mesa/drivers/dri/r300/radeon_lock.h')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_lock.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_lock.h b/src/mesa/drivers/dri/r300/radeon_lock.h index 3359d7822c..c9acbce0c3 100644 --- a/src/mesa/drivers/dri/r300/radeon_lock.h +++ b/src/mesa/drivers/dri/r300/radeon_lock.h @@ -96,6 +96,7 @@ extern int prevLockLine; DEBUG_LOCK(); \ } while (0) +#if R200_MERGED #define UNLOCK_HARDWARE( radeon ) \ do { \ DRM_UNLOCK( (radeon)->dri.fd, \ @@ -109,5 +110,13 @@ extern int prevLockLine; __r200->save_on_next_unlock = GL_FALSE; \ } \ } while (0) - +#else +#define UNLOCK_HARDWARE( radeon ) \ + do { \ + DRM_UNLOCK( (radeon)->dri.fd, \ + (radeon)->dri.hwLock, \ + (radeon)->dri.hwContext ); \ + DEBUG_RESET(); \ + } while (0) +#endif #endif /* __RADEON_LOCK_H__ */ |