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

diff --cc configure.ac
Simple merge

diff --cc src/gallium/drivers/nvfx/nvfx_screen.c
Simple merge

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

diff --cc src/gallium/winsys/r600/drm/r600_hw_context.c
index 34ea2a6bacb7708c5a88ef3d660b89fd30cf072a,7c3fd1aa2069f2fe3e6e4959b8be007def4a9ef9..0618d2329e6dfca52b0faa2e5460ef89000d427a
--- 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
@@@ -922,11 -942,11 +942,11 @@@ void r600_context_pipe_state_set(struc
                }
                if (block->flags & REG_FLAG_DIRTY_ALWAYS)
                        dirty |= R600_BLOCK_STATUS_DIRTY;
 -              if (block->pm4_bo_index[id]) {
 +              if (block->pm4_bo_index[id] && state->regs[i].bo) {
                        /* find relocation */
                        reloc_id = block->pm4_bo_index[id];
-                       r600_bo_reference(ctx->radeon, &block->reloc[reloc_id].bo, state->regs[i].bo);
-                       state->regs[i].bo->fence = ctx->radeon->fence;
+                       r600_bo_reference(ctx->radeon, &block->reloc[reloc_id].bo, reg->bo);
+                       reg->bo->fence = ctx->radeon->fence;
                        /* always force dirty for relocs for now */
                        dirty |= R600_BLOCK_STATUS_DIRTY;
                }