diff options
| author | Brian Paul <brianp@vmware.com> | 2010-03-22 09:07:46 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-03-22 09:07:46 -0600 |
| commit | 182c42c8da6edfa66819eef02f4dea310c1f68d7 (patch) | |
| tree | f49df694eae81c9db3c8fe2123bb30ef5a556891 /src/mesa/drivers/dri/r200/r200_cmdbuf.c | |
| parent | 5cb4a3524b54480418b4c4717c4a0f0a8669939c (diff) | |
| parent | ca97f8b9bab80844be613a9253643b7da8e738c7 (diff) | |
Merge branch '7.8'
Conflicts:
src/gallium/drivers/cell/ppu/cell_screen.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_cmdbuf.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_cmdbuf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_cmdbuf.c b/src/mesa/drivers/dri/r200/r200_cmdbuf.c index 2f2b8d94dc..ad43a8ca92 100644 --- a/src/mesa/drivers/dri/r200/r200_cmdbuf.c +++ b/src/mesa/drivers/dri/r200/r200_cmdbuf.c @@ -189,7 +189,8 @@ void r200FlushElts(GLcontext *ctx) if (R200_ELT_BUF_SZ > elt_used) radeonReturnDmaRegion(&rmesa->radeon, R200_ELT_BUF_SZ - elt_used); - if (radeon_is_debug_enabled(RADEON_SYNC, RADEON_CRITICAL)) { + if (radeon_is_debug_enabled(RADEON_SYNC, RADEON_CRITICAL) + && !rmesa->radeon.radeonScreen->kernel_mm) { radeon_print(RADEON_SYNC, RADEON_NORMAL, "%s: Syncing\n", __FUNCTION__); radeonFinish( rmesa->radeon.glCtx ); } |