diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index a36451109e6..221f9f0754a 100644
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -1106,19 +1106,14 @@ typedef uint64_t isl_surf_usage_flags_t;
 #define ISL_SURF_USAGE_CUBE_BIT                (1u << 4)
 #define ISL_SURF_USAGE_DISABLE_AUX_BIT         (1u << 5)
 #define ISL_SURF_USAGE_DISPLAY_BIT             (1u << 6)
-#define ISL_SURF_USAGE_DISPLAY_ROTATE_90_BIT   (1u << 7)
-#define ISL_SURF_USAGE_DISPLAY_ROTATE_180_BIT  (1u << 8)
-#define ISL_SURF_USAGE_DISPLAY_ROTATE_270_BIT  (1u << 9)
-#define ISL_SURF_USAGE_DISPLAY_FLIP_X_BIT      (1u << 10)
-#define ISL_SURF_USAGE_DISPLAY_FLIP_Y_BIT      (1u << 11)
-#define ISL_SURF_USAGE_STORAGE_BIT             (1u << 12)
-#define ISL_SURF_USAGE_HIZ_BIT                 (1u << 13)
-#define ISL_SURF_USAGE_MCS_BIT                 (1u << 14)
-#define ISL_SURF_USAGE_CCS_BIT                 (1u << 15)
-#define ISL_SURF_USAGE_VERTEX_BUFFER_BIT       (1u << 16)
-#define ISL_SURF_USAGE_INDEX_BUFFER_BIT        (1u << 17)
-#define ISL_SURF_USAGE_CONSTANT_BUFFER_BIT     (1u << 18)
-#define ISL_SURF_USAGE_STAGING_BIT             (1u << 19)
+#define ISL_SURF_USAGE_STORAGE_BIT             (1u << 7)
+#define ISL_SURF_USAGE_HIZ_BIT                 (1u << 8)
+#define ISL_SURF_USAGE_MCS_BIT                 (1u << 9)
+#define ISL_SURF_USAGE_CCS_BIT                 (1u << 10)
+#define ISL_SURF_USAGE_VERTEX_BUFFER_BIT       (1u << 11)
+#define ISL_SURF_USAGE_INDEX_BUFFER_BIT        (1u << 12)
+#define ISL_SURF_USAGE_CONSTANT_BUFFER_BIT     (1u << 13)
+#define ISL_SURF_USAGE_STAGING_BIT             (1u << 14)
 /** @} */
 
 /**
diff --git a/src/intel/isl/isl_gfx4.c b/src/intel/isl/isl_gfx4.c
index 6b8fac9fe44..8ad3f6152e7 100644
--- a/src/intel/isl/isl_gfx4.c
+++ b/src/intel/isl/isl_gfx4.c
@@ -62,21 +62,6 @@ isl_gfx4_filter_tiling(const struct isl_device *dev,
                 ISL_TILING_Y0_BIT : (ISL_TILING_Y0_BIT | ISL_TILING_LINEAR_BIT);
    }
 
-   if (info->usage & (ISL_SURF_USAGE_DISPLAY_ROTATE_90_BIT |
-                      ISL_SURF_USAGE_DISPLAY_ROTATE_180_BIT |
-                      ISL_SURF_USAGE_DISPLAY_ROTATE_270_BIT)) {
-      assert(*flags & ISL_SURF_USAGE_DISPLAY_BIT);
-      isl_finishme("%s:%s: handle rotated display surfaces",
-                   __FILE__, __func__);
-   }
-
-   if (info->usage & (ISL_SURF_USAGE_DISPLAY_FLIP_X_BIT |
-                      ISL_SURF_USAGE_DISPLAY_FLIP_Y_BIT)) {
-      assert(*flags & ISL_SURF_USAGE_DISPLAY_BIT);
-      isl_finishme("%s:%s: handle flipped display surfaces",
-                   __FILE__, __func__);
-   }
-
    if (info->usage & ISL_SURF_USAGE_DISPLAY_BIT) {
       /* Before Skylake, the display engine does not accept Y */
       *flags &= (ISL_TILING_LINEAR_BIT | ISL_TILING_X_BIT);
diff --git a/src/intel/isl/isl_gfx7.c b/src/intel/isl/isl_gfx7.c
index eb147910e56..de5524e3fdc 100644
--- a/src/intel/isl/isl_gfx7.c
+++ b/src/intel/isl/isl_gfx7.c
@@ -235,21 +235,6 @@ isl_gfx6_filter_tiling(const struct isl_device *dev,
    if (isl_format_get_layout(info->format)->txc == ISL_TXC_MCS)
       *flags &= ISL_TILING_Y0_BIT;
 
-   if (info->usage & (ISL_SURF_USAGE_DISPLAY_ROTATE_90_BIT |
-                      ISL_SURF_USAGE_DISPLAY_ROTATE_180_BIT |
-                      ISL_SURF_USAGE_DISPLAY_ROTATE_270_BIT)) {
-      assert(*flags & ISL_SURF_USAGE_DISPLAY_BIT);
-      isl_finishme("%s:%s: handle rotated display surfaces",
-                   __FILE__, __func__);
-   }
-
-   if (info->usage & (ISL_SURF_USAGE_DISPLAY_FLIP_X_BIT |
-                      ISL_SURF_USAGE_DISPLAY_FLIP_Y_BIT)) {
-      assert(*flags & ISL_SURF_USAGE_DISPLAY_BIT);
-      isl_finishme("%s:%s: handle flipped display surfaces",
-                   __FILE__, __func__);
-   }
-
    if (info->usage & ISL_SURF_USAGE_DISPLAY_BIT) {
       if (ISL_GFX_VER(dev) >= 12) {
          *flags &= (ISL_TILING_LINEAR_BIT | ISL_TILING_X_BIT |