[PATCH i-g-t 3/3] tests/intel/kms_ccs: Add testing for I915_FORMAT_MOD_4_TILED_XE2_CCS
Juha-Pekka Heikkila
juhapekka.heikkila at gmail.com
Thu Jul 25 18:16:22 UTC 2024
Earlier with Xe2 I915_FORMAT_MOD_4 was used as ccs modifier.
Now regular tile4 is not using compression and in test will be
used I915_FORMAT_MOD_4_TILED_XE2_CCS instead.
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
---
tests/intel/kms_ccs.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/intel/kms_ccs.c b/tests/intel/kms_ccs.c
index c91370a9a..d64e9ef46 100644
--- a/tests/intel/kms_ccs.c
+++ b/tests/intel/kms_ccs.c
@@ -219,7 +219,7 @@ static const struct {
{I915_FORMAT_MOD_4_TILED_MTL_RC_CCS, "4-tiled-mtl-rc-ccs"},
{I915_FORMAT_MOD_4_TILED_MTL_MC_CCS, "4-tiled-mtl-mc-ccs"},
{I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC, "4-tiled-mtl-rc-ccs-cc"},
- {I915_FORMAT_MOD_4_TILED, "4-tiled-xe2-ccs"},
+ {I915_FORMAT_MOD_4_TILED_XE2_CCS, "4-tiled-xe2-ccs"},
};
static bool check_ccs_planes;
@@ -759,7 +759,7 @@ static void generate_fb(data_t *data, struct igt_fb *fb,
if (do_fast_clear && (fb_flags & FB_COMPRESSED)) {
fast_clear_fb(data->drm_fd, fb, cc_color);
} else {
- if (modifier == I915_FORMAT_MOD_4_TILED) {
+ if (modifier == I915_FORMAT_MOD_4_TILED_XE2_CCS) {
struct igt_fb temp_fb;
/* tile4 is used as ccs modifier
* on Xe2 where compression is handled
@@ -971,14 +971,14 @@ static void test_output(data_t *data, const int testnum)
ccs_modifiers[i].modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC) &&
tests[testnum].flags & TEST_BAD_CCS_PLANE) ||
(tests[testnum].flags & TEST_FAIL_ON_ADDFB2 &&
- ccs_modifiers[i].modifier == I915_FORMAT_MOD_4_TILED))
+ ccs_modifiers[i].modifier == I915_FORMAT_MOD_4_TILED_XE2_CCS))
continue;
data->ccs_modifier = ccs_modifiers[i].modifier;
igt_describe(tests[testnum].description);
igt_subtest_with_dynamic_f("%s-%s", tests[testnum].testname, ccs_modifiers[i].str) {
- if (ccs_modifiers[i].modifier == I915_FORMAT_MOD_4_TILED) {
+ if (ccs_modifiers[i].modifier == I915_FORMAT_MOD_4_TILED_XE2_CCS) {
igt_require_f(AT_LEAST_GEN(dev_id, 20),
"Xe2 platform needed.\n");
} else {
--
2.43.2
More information about the igt-dev
mailing list