From: Christian König <deathsimple@vodafone.de>
Date: Sun, 15 May 2011 17:26:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into pipe-video
X-Git-Tag: 062012170305~4979^2~59
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=828540e491d88b9b6217e6568873a78462919ae8;p=profile%2Fivi%2Fmesa.git

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

828540e491d88b9b6217e6568873a78462919ae8
diff --cc src/gallium/winsys/r600/drm/r600_hw_context.c
index 34ea2a6,7c3fd1a..0618d23
--- a/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;
  		}