diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index d549457c644..cf3b9b08b18 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -605,8 +605,6 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws,
 		rscreen->b.b.is_format_supported = r600_is_format_supported;
 	}
 
-	r600_init_screen_caps(rscreen);
-
 	rscreen->b.debug_flags |= debug_get_flags_option("R600_DEBUG", r600_debug_options, 0);
 	if (debug_get_bool_option("R600_DEBUG_COMPUTE", false))
 		rscreen->b.debug_flags |= DBG_COMPUTE;
@@ -627,6 +625,8 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws,
 
 	rscreen->has_msaa = true;
 
+	r600_init_screen_caps(rscreen);
+
 	/* MSAA support. */
 	switch (rscreen->b.gfx_level) {
 	case R600: