Merge remote-tracking branch 'origin/master' into pipe-video

Conflicts:
	src/gallium/tests/unit/u_format_test.c
	src/gallium/winsys/r600/drm/r600_hw_context.c

diff --cc src/gallium/auxiliary/Makefile
Simple merge

diff --cc src/gallium/auxiliary/SConscript
Simple merge

diff --cc src/gallium/drivers/r300/Makefile
Simple merge

diff --cc src/gallium/drivers/r300/r300_screen.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_state.c
Simple merge

diff --cc src/gallium/drivers/softpipe/sp_screen.c
Simple merge

diff --cc src/gallium/winsys/r600/drm/r600_bo.c
Simple merge

diff --cc src/gallium/winsys/r600/drm/r600_hw_context.c
index af80aa6,44957db..711ce18
--- 1/src/gallium/winsys/r600/drm/r600_hw_context.c
--- 2/src/gallium/winsys/r600/drm/r600_hw_context.c
+++ b/src/gallium/winsys/r600/drm/r600_hw_context.c
@@@ -1186,26 -1281,29 +1281,31 @@@ void r600_context_block_emit_dirty(stru
                goto out;
        }
  
-       optional &= (block->nreg_dirty != block->nreg);
- 
-       ctx->flags |= R600_CONTEXT_CHECK_EVENT_FLUSH;
-       for (int j = 0; j < block->nreg; j++) {
-               if (block->pm4_bo_index[j]) {
-                       /* find relocation */
-                       id = block->pm4_bo_index[j];
-                       if (block->reloc[id].bo) {
-                               r600_context_bo_reloc(ctx,
-                                               &block->pm4[block->reloc[id].bo_pm4_index],
-                                               block->reloc[id].bo);
-                               r600_context_bo_flush(ctx,
-                                               block->reloc[id].flush_flags,
-                                               block->reloc[id].flush_mask,
-                                               block->reloc[id].bo);
+       if (nbo) {
+               ctx->flags |= R600_CONTEXT_CHECK_EVENT_FLUSH;
+ 
+               for (int j = 0; j < block->nreg; j++) {
+                       if (block->pm4_bo_index[j]) {
+                               /* find relocation */
+                               id = block->pm4_bo_index[j];
 -                              r600_context_bo_reloc(ctx,
 -                                                    &block->pm4[block->reloc[id].bo_pm4_index],
 -                                                    block->reloc[id].bo);
 -                              r600_context_bo_flush(ctx,
 -                                                    block->reloc[id].flush_flags,
 -                                                    block->reloc[id].flush_mask,
 -                                                    block->reloc[id].bo);
++                              if (block->reloc[id].bo) {
++                                      r600_context_bo_reloc(ctx,
++                                                            &block->pm4[block->reloc[id].bo_pm4_index],
++                                                            block->reloc[id].bo);
++                                      r600_context_bo_flush(ctx,
++                                                            block->reloc[id].flush_flags,
++                                                            block->reloc[id].flush_mask,
++                                                            block->reloc[id].bo);
++                              }
+                               nbo--;
+                               if (nbo == 0)
+                                       break;
                        }
                }
+               ctx->flags &= ~R600_CONTEXT_CHECK_EVENT_FLUSH;
        }
-       ctx->flags &= ~R600_CONTEXT_CHECK_EVENT_FLUSH;
  
+       optional &= (block->nreg_dirty != block->nreg);
        if (optional) {
                new_dwords = block->nreg_dirty;
                start_dword = ctx->pm4_cdwords;