diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c
index fba2d2109d0..667a36439cd 100644
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -235,7 +235,6 @@ static const struct intel_device_info intel_device_info_snb_gt2 = {
 #define GFX7_FEATURES                               \
    .ver = 7,                                        \
    .has_hiz_and_separate_stencil = true,            \
-   .must_use_separate_stencil = true,               \
    .has_llc = true,                                 \
    .has_pln = true,                                 \
    .has_64bit_float = true,                         \
@@ -427,7 +426,6 @@ static const struct intel_device_info intel_device_info_hsw_gt3 = {
 #define GFX8_FEATURES                               \
    .ver = 8,                                        \
    .has_hiz_and_separate_stencil = true,            \
-   .must_use_separate_stencil = true,               \
    .has_llc = true,                                 \
    .has_sample_with_hiz = false,                    \
    .has_pln = true,                                 \
diff --git a/src/intel/dev/intel_device_info.py b/src/intel/dev/intel_device_info.py
index ff51e4d4220..d210a824c56 100644
--- a/src/intel/dev/intel_device_info.py
+++ b/src/intel/dev/intel_device_info.py
@@ -270,7 +270,6 @@ Struct("intel_device_info",
         Member("uint8_t", "pci_revision_id"),
         Member("intel_platform", "platform", compiler_field=True),
         Member("bool", "has_hiz_and_separate_stencil"),
-        Member("bool", "must_use_separate_stencil"),
         Member("bool", "has_sample_with_hiz"),
         Member("bool", "has_bit6_swizzle"),
         Member("bool", "has_llc"),
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 81bad0f7bd5..e1745976f7e 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -320,6 +320,7 @@ isl_device_init(struct isl_device *dev,
    assert(!(info->has_bit6_swizzle && info->ver >= 8));
 
    dev->info = info;
+   /* A must on Gfx7+, preferred on Gfx6, first possible on Gfx5 */
    dev->use_separate_stencil = ISL_GFX_VER(dev) >= 6;
    dev->has_bit6_swizzling = info->has_bit6_swizzle;
    dev->buffer_length_in_aux_addr = false;
@@ -334,8 +335,6 @@ isl_device_init(struct isl_device *dev,
    /* Did we break hiz or stencil? */
    if (dev->use_separate_stencil)
       assert(info->has_hiz_and_separate_stencil);
-   if (info->must_use_separate_stencil)
-      assert(dev->use_separate_stencil);
 
    dev->ss.size = RENDER_SURFACE_STATE_length(info) * 4;
    dev->ss.align = isl_align(dev->ss.size, 32);