3 files changed, 3 insertions, 9 deletions
diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c
index 0c5dcba0718..836b182f546 100644
--- a/src/gallium/drivers/r600/evergreen_hw_context.c
+++ b/src/gallium/drivers/r600/evergreen_hw_context.c
@@ -245,7 +245,7 @@ static int evergreen_loop_const_init(struct r600_context *ctx, uint32_t offset)
 	for (i = 0; i < nreg; i++) {
 		r600_loop_consts[i].offset = EVERGREEN_LOOP_CONST_OFFSET + ((offset + i) * 4);
 		r600_loop_consts[i].flags = REG_FLAG_DIRTY_ALWAYS;
-		r600_loop_consts[i].sbu_flags = 0;
+		r600_loop_consts[i].reserved = 0;
 	}
 	return r600_context_add_block(ctx, r600_loop_consts, nreg, PKT3_SET_LOOP_CONST, EVERGREEN_LOOP_CONST_OFFSET);
 }
diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index f7f8e0ecd2e..3d7e9d75e76 100644
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -158,11 +158,6 @@ static void r600_init_block(struct r600_context *ctx,
 			block->pm4[block->pm4_ndwords++] = 0x00000000;
 			block->reloc[block->nbo].bo_pm4_index = block->pm4_ndwords - 1;
 		}
-		if ((ctx->family > CHIP_R600) &&
-		    (ctx->family < CHIP_RV770) && reg[i+j].flags & REG_FLAG_RV6XX_SBU) {
-			block->pm4[block->pm4_ndwords++] = PKT3(PKT3_SURFACE_BASE_UPDATE, 0, 0);
-			block->pm4[block->pm4_ndwords++] = reg[i+j].sbu_flags;
-		}
 	}
 	/* check that we stay in limit */
 	assert(block->pm4_ndwords < R600_BLOCK_MAX_REG);
@@ -364,7 +359,7 @@ static int r600_loop_const_init(struct r600_context *ctx, uint32_t offset)
 	for (i = 0; i < nreg; i++) {
 		r600_loop_consts[i].offset = R600_LOOP_CONST_OFFSET + ((offset + i) * 4);
 		r600_loop_consts[i].flags = REG_FLAG_DIRTY_ALWAYS;
-		r600_loop_consts[i].sbu_flags = 0;
+		r600_loop_consts[i].reserved = 0;
 	}
 	return r600_context_add_block(ctx, r600_loop_consts, nreg, PKT3_SET_LOOP_CONST, R600_LOOP_CONST_OFFSET);
 }
diff --git a/src/gallium/drivers/r600/r600_hw_context_priv.h b/src/gallium/drivers/r600/r600_hw_context_priv.h
index 996bfaa0e6c..83474b016f4 100644
--- a/src/gallium/drivers/r600/r600_hw_context_priv.h
+++ b/src/gallium/drivers/r600/r600_hw_context_priv.h
@@ -35,7 +35,6 @@
 /* these flags are used in register flags and added into block flags */
 #define REG_FLAG_NEED_BO 1
 #define REG_FLAG_DIRTY_ALWAYS 2
-#define REG_FLAG_RV6XX_SBU 4
 #define REG_FLAG_NOT_R600 8
 #define REG_FLAG_ENABLE_ALWAYS 16
 #define REG_FLAG_FLUSH_CHANGE 64
@@ -45,7 +44,7 @@
 struct r600_reg {
 	unsigned			offset;
 	unsigned			flags;
-	unsigned			sbu_flags;
+	unsigned			reserved;
 };
 
 /*