Mesa (master): intel/isl: Describe I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e15543b71ad07d208f0ec3524c8486329ee882f4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e15543b71ad07d208f0ec3524c8486329ee882f4

Author: Nanley Chery <nanley.g.chery at intel.com>
Date:   Tue Mar 19 14:11:34 2019 -0700

intel/isl: Describe I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6486>

---

 src/intel/isl/isl.h     | 3 ++-
 src/intel/isl/isl_drm.c | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index 98b55164fac..fc36085ae2c 100644
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -1873,7 +1873,8 @@ isl_drm_modifier_get_default_aux_state(uint64_t modifier)
       return ISL_AUX_STATE_AUX_INVALID;
 
    assert(mod_info->aux_usage == ISL_AUX_USAGE_CCS_E ||
-          mod_info->aux_usage == ISL_AUX_USAGE_GEN12_CCS_E);
+          mod_info->aux_usage == ISL_AUX_USAGE_GEN12_CCS_E ||
+          mod_info->aux_usage == ISL_AUX_USAGE_MC);
    return mod_info->supports_clear_color ? ISL_AUX_STATE_COMPRESSED_CLEAR :
                                            ISL_AUX_STATE_COMPRESSED_NO_CLEAR;
 }
diff --git a/src/intel/isl/isl_drm.c b/src/intel/isl/isl_drm.c
index c13a26c31ce..e1cae671ec6 100644
--- a/src/intel/isl/isl_drm.c
+++ b/src/intel/isl/isl_drm.c
@@ -102,6 +102,13 @@ static const struct isl_drm_modifier_info modifier_info[] = {
       .aux_usage = ISL_AUX_USAGE_GEN12_CCS_E,
       .supports_clear_color = false,
    },
+   {
+      .modifier = I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS,
+      .name = "I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS",
+      .tiling = ISL_TILING_Y0,
+      .aux_usage = ISL_AUX_USAGE_MC,
+      .supports_clear_color = false,
+   },
 };
 
 const struct isl_drm_modifier_info *