diff --git a/src/intel/isl/isl_gfx7.c b/src/intel/isl/isl_gfx7.c
index ee3bf268a91..4cfcf0ba843 100644
--- a/src/intel/isl/isl_gfx7.c
+++ b/src/intel/isl/isl_gfx7.c
@@ -62,6 +62,10 @@ isl_gfx7_choose_msaa_layout(const struct isl_device *dev,
       return true;
    }
 
+   /* Should have been filtered by isl_gfx6_filter_tiling() */
+   assert(!isl_surf_usage_is_display(info->usage));
+   assert(tiling != ISL_TILING_LINEAR);
+
    if (!isl_format_supports_multisampling(dev->info, info->format))
       return false;
 
@@ -106,12 +110,6 @@ isl_gfx7_choose_msaa_layout(const struct isl_device *dev,
    if (info->samples > 1 && gfx7_format_needs_valign2(dev, info->format))
       return false;
 
-   /* More obvious restrictions */
-   if (isl_surf_usage_is_display(info->usage))
-      return false;
-   if (tiling == ISL_TILING_LINEAR)
-      return false;
-
    /* From the Ivybridge PRM, Volume 4 Part 1 p72, SURFACE_STATE, Multisampled
     * Surface Storage Format:
     *