Merge branch 'master' into asm-shader-rework-1

Conflicts:
	src/mesa/shader/arbprogparse.c

1 files changed, 1 insertions, 1 deletions

diff --git a/src/mesa/drivers/dri/radeon/radeon_cs_space_drm.c b/src/mesa/drivers/dri/radeon/radeon_cs_space_drm.c
index 5a8df7bb8c..89cbbb5a6b 100644
--- a/src/mesa/drivers/dri/radeon/radeon_cs_space_drm.c
+++ b/src/mesa/drivers/dri/radeon/radeon_cs_space_drm.c
@@ -82,7 +82,7 @@ static inline int radeon_cs_setup_bo(struct radeon_cs_space_check *sc, struct ra
 	    if (write_domain == RADEON_GEM_DOMAIN_VRAM) {
 		sizes->op_read -= bo->size;
 		sizes->op_vram_write += bo->size;
-	    } else if (write_domain == RADEON_GEM_DOMAIN_VRAM) {
+	    } else if (write_domain == RADEON_GEM_DOMAIN_GTT) {
 		sizes->op_read -= bo->size;
 		sizes->op_gart_write += bo->size;
 	    }