diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 5796835ab08..523b8b35c63 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -245,8 +245,8 @@ fail:
 }
 
 static bool is_nir_enabled(struct r600_common_screen *screen) {
-   return ((screen->debug_flags & DBG_NIR_PREFERRED) &&
-       screen->family >= CHIP_CEDAR);
+   return (screen->debug_flags & DBG_NIR_PREFERRED); /* &&
+       screen->family >= CHIP_CEDAR);*/
 }
 
 /*
@@ -629,7 +629,7 @@ static int r600_get_shader_param(struct pipe_screen* pscreen,
 		int ir = 0;
 		if (shader == PIPE_SHADER_COMPUTE)
 			ir = 1 << PIPE_SHADER_IR_NATIVE;
-		if (rscreen->b.family >= CHIP_CEDAR) {
+		if (is_nir_enabled(&rscreen->b)) {
 			ir |= 1 << PIPE_SHADER_IR_TGSI;
 			ir |= 1 << PIPE_SHADER_IR_NIR;
 		}