diff --git a/src/intel/dev/intel_debug.c b/src/intel/dev/intel_debug.c
index e7c643131c9..acf5d2cde51 100644
--- a/src/intel/dev/intel_debug.c
+++ b/src/intel/dev/intel_debug.c
@@ -115,6 +115,7 @@ static const struct debug_control simd_control[] = {
    { "fs8",    DEBUG_FS_SIMD8 },
    { "fs16",   DEBUG_FS_SIMD16 },
    { "fs32",   DEBUG_FS_SIMD32 },
+   { "fs2x8",  DEBUG_FS_SIMD2X8 },
    { "cs8",    DEBUG_CS_SIMD8 },
    { "cs16",   DEBUG_CS_SIMD16 },
    { "cs32",   DEBUG_CS_SIMD32 },
@@ -155,7 +156,8 @@ intel_debug_flag_for_shader_stage(gl_shader_stage stage)
    return flags[stage];
 }
 
-#define DEBUG_FS_SIMD  (DEBUG_FS_SIMD8  | DEBUG_FS_SIMD16  | DEBUG_FS_SIMD32)
+#define DEBUG_FS_SIMD  (DEBUG_FS_SIMD8  | DEBUG_FS_SIMD16  | \
+                        DEBUG_FS_SIMD32)
 #define DEBUG_CS_SIMD  (DEBUG_CS_SIMD8  | DEBUG_CS_SIMD16  | DEBUG_CS_SIMD32)
 #define DEBUG_TS_SIMD  (DEBUG_TS_SIMD8  | DEBUG_TS_SIMD16  | DEBUG_TS_SIMD32)
 #define DEBUG_MS_SIMD  (DEBUG_MS_SIMD8  | DEBUG_MS_SIMD16  | DEBUG_MS_SIMD32)
diff --git a/src/intel/dev/intel_debug.h b/src/intel/dev/intel_debug.h
index 727d77d04a6..9a48b5a99c7 100644
--- a/src/intel/dev/intel_debug.h
+++ b/src/intel/dev/intel_debug.h
@@ -117,24 +117,25 @@ extern uint32_t intel_debug_bkp_after_draw_count;
 #define DEBUG_FS_SIMD8    (1ull << 0)
 #define DEBUG_FS_SIMD16   (1ull << 1)
 #define DEBUG_FS_SIMD32   (1ull << 2)
+#define DEBUG_FS_SIMD2X8  (1ull << 3)
 
-#define DEBUG_CS_SIMD8    (1ull << 3)
-#define DEBUG_CS_SIMD16   (1ull << 4)
-#define DEBUG_CS_SIMD32   (1ull << 5)
+#define DEBUG_CS_SIMD8    (1ull << 4)
+#define DEBUG_CS_SIMD16   (1ull << 5)
+#define DEBUG_CS_SIMD32   (1ull << 6)
 
-#define DEBUG_TS_SIMD8    (1ull << 6)
-#define DEBUG_TS_SIMD16   (1ull << 7)
-#define DEBUG_TS_SIMD32   (1ull << 8)
+#define DEBUG_TS_SIMD8    (1ull << 7)
+#define DEBUG_TS_SIMD16   (1ull << 8)
+#define DEBUG_TS_SIMD32   (1ull << 9)
 
-#define DEBUG_MS_SIMD8    (1ull << 9)
-#define DEBUG_MS_SIMD16   (1ull << 10)
-#define DEBUG_MS_SIMD32   (1ull << 11)
+#define DEBUG_MS_SIMD8    (1ull << 10)
+#define DEBUG_MS_SIMD16   (1ull << 11)
+#define DEBUG_MS_SIMD32   (1ull << 12)
 
-#define DEBUG_RT_SIMD8    (1ull << 12)
-#define DEBUG_RT_SIMD16   (1ull << 13)
-#define DEBUG_RT_SIMD32   (1ull << 14)
+#define DEBUG_RT_SIMD8    (1ull << 13)
+#define DEBUG_RT_SIMD16   (1ull << 14)
+#define DEBUG_RT_SIMD32   (1ull << 15)
 
-#define SIMD_DISK_CACHE_MASK ((1ull << 15) - 1)
+#define SIMD_DISK_CACHE_MASK ((1ull << 16) - 1)
 
 #ifdef HAVE_ANDROID_PLATFORM
 #define LOG_TAG "INTEL-MESA"