[PATCH i-g-t] HAX:lib/igt_fb: Fix CCS tests

[Bhanuprakash Modem]

On Xe device legacy blitter size rules don't need to be applied

Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
---
 lib/igt_fb.c                             | 18 +++++++++++----
 tests/intel-ci/fast-feedback.testlist    | 28 ++++++++++++++++++++++++
 tests/intel-ci/xe-fast-feedback.testlist | 28 ++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 65e0638c2..7316a601d 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -2513,6 +2513,9 @@ static bool blitter_ok(const struct igt_fb *fb)
 	     is_gen12_mc_ccs_modifier(fb->modifier))
 		return false;
 
+	if (is_xe_device(fb->fd))
+		return true;
+
 	for (int i = 0; i < fb->num_planes; i++) {
 		int width = fb->plane_width[i];
 
@@ -2560,8 +2563,7 @@ static bool use_blitter(const struct igt_fb *fb)
 	return fb->modifier == I915_FORMAT_MOD_4_TILED ||
 	       fb->modifier == I915_FORMAT_MOD_Y_TILED ||
 	       fb->modifier == I915_FORMAT_MOD_Yf_TILED ||
-	       (is_i915_device(fb->fd) && !gem_has_mappable_ggtt(fb->fd)) ||
-	       is_xe_device(fb->fd);
+	       (is_i915_device(fb->fd) && !gem_has_mappable_ggtt(fb->fd));
 }
 
 static void init_buf_ccs(struct intel_buf *buf, int ccs_idx,
@@ -3058,7 +3060,12 @@ static void free_linear_mapping(struct fb_blit_upload *blit)
 		igt_nouveau_delete_bo(&linear->fb);
 	} else if (is_xe_device(fd)) {
 		gem_munmap(linear->map, linear->fb.size);
-		blitcopy(fb, &linear->fb);
+
+		if (blit->ibb)
+			copy_with_engine(blit, fb, &linear->fb);
+		else
+			blitcopy(fb, &linear->fb);
+
 		gem_close(fd, linear->fb.gem_handle);
 	} else {
 		gem_munmap(linear->map, linear->fb.size);
@@ -3138,7 +3145,10 @@ static void setup_linear_mapping(struct fb_blit_upload *blit)
 
 		linear->map = igt_nouveau_mmap_bo(&linear->fb, PROT_READ | PROT_WRITE);
 	} else if (is_xe_device(fd)) {
-		blitcopy(&linear->fb, fb);
+		if (blit->ibb)
+			copy_with_engine(blit, &linear->fb, fb);
+		else
+			blitcopy(&linear->fb, fb);
 
 		linear->map = xe_bo_mmap_ext(fd, linear->fb.gem_handle,
 					     linear->fb.size, PROT_READ | PROT_WRITE);
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index be0965110..0f6a3b882 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -55,6 +55,34 @@ igt at i915_getparams_basic@basic-eu-total
 igt at i915_getparams_basic@basic-subslice-total
 igt at i915_hangman@error-state-basic
 igt at i915_pciid
+igt at kms_async_flips@async-flip-with-page-flip-events
+igt at kms_ccs@bad-pixel-format-y-tiled-gen12-mc-ccs
+igt at kms_ccs@bad-pixel-format-4-tiled-dg2-mc-ccs
+igt at kms_ccs@bad-pixel-format-4-tiled-mtl-mc-ccs
+igt at kms_ccs@bad-rotation-90-y-tiled-gen12-mc-ccs
+igt at kms_ccs@bad-rotation-90-4-tiled-dg2-mc-ccs
+igt at kms_ccs@bad-rotation-90-4-tiled-mtl-mc-ccs
+igt at kms_ccs@crc-primary-basic-y-tiled-gen12-mc-ccs
+igt at kms_ccs@crc-primary-basic-4-tiled-dg2-mc-ccs
+igt at kms_ccs@crc-primary-basic-4-tiled-mtl-mc-ccs
+igt at kms_ccs@crc-primary-rotation-180-y-tiled-gen12-mc-ccs
+igt at kms_ccs@crc-primary-rotation-180-4-tiled-dg2-mc-ccs
+igt at kms_ccs@crc-primary-rotation-180-4-tiled-mtl-mc-ccs
+igt at kms_ccs@random-ccs-data-y-tiled-gen12-mc-ccs
+igt at kms_ccs@random-ccs-data-4-tiled-dg2-mc-ccs
+igt at kms_ccs@random-ccs-data-4-tiled-mtl-mc-ccs
+igt at kms_ccs@missing-ccs-buffer-y-tiled-gen12-mc-ccs
+igt at kms_ccs@missing-ccs-buffer-4-tiled-mtl-mc-ccs
+igt at kms_ccs@ccs-on-another-bo-y-tiled-gen12-mc-ccs
+igt at kms_ccs@ccs-on-another-bo-4-tiled-mtl-mc-ccs
+igt at kms_ccs@bad-aux-stride-y-tiled-gen12-mc-ccs
+igt at kms_ccs@bad-aux-stride-4-tiled-mtl-mc-ccs
+igt at kms_ccs@crc-sprite-planes-basic-y-tiled-gen12-mc-ccs
+igt at kms_ccs@crc-sprite-planes-basic-4-tiled-dg2-mc-ccs
+igt at kms_ccs@crc-sprite-planes-basic-4-tiled-mtl-mc-ccs
+igt at kms_flip_tiling@flip-change-tiling
+igt at kms_plane@pixel-format
+igt at kms_plane@pixel-format-source-clamping
 igt at kms_addfb_basic@addfb25-4-tiled
 igt at kms_addfb_basic@addfb25-bad-modifier
 igt at kms_addfb_basic@addfb25-framebuffer-vs-set-tiling
diff --git a/tests/intel-ci/xe-fast-feedback.testlist b/tests/intel-ci/xe-fast-feedback.testlist
index 17863b6b1..9f65d0995 100644
--- a/tests/intel-ci/xe-fast-feedback.testlist
+++ b/tests/intel-ci/xe-fast-feedback.testlist
@@ -164,6 +164,34 @@ igt at xe_pat@pat-index-xe2
 igt at xe_waitfence@abstime
 igt at xe_waitfence@engine
 igt at xe_waitfence@reltime
+igt at kms_async_flips@async-flip-with-page-flip-events
+igt at kms_ccs@bad-pixel-format-y-tiled-gen12-mc-ccs
+igt at kms_ccs@bad-pixel-format-4-tiled-dg2-mc-ccs
+igt at kms_ccs@bad-pixel-format-4-tiled-mtl-mc-ccs
+igt at kms_ccs@bad-rotation-90-y-tiled-gen12-mc-ccs
+igt at kms_ccs@bad-rotation-90-4-tiled-dg2-mc-ccs
+igt at kms_ccs@bad-rotation-90-4-tiled-mtl-mc-ccs
+igt at kms_ccs@crc-primary-basic-y-tiled-gen12-mc-ccs
+igt at kms_ccs@crc-primary-basic-4-tiled-dg2-mc-ccs
+igt at kms_ccs@crc-primary-basic-4-tiled-mtl-mc-ccs
+igt at kms_ccs@crc-primary-rotation-180-y-tiled-gen12-mc-ccs
+igt at kms_ccs@crc-primary-rotation-180-4-tiled-dg2-mc-ccs
+igt at kms_ccs@crc-primary-rotation-180-4-tiled-mtl-mc-ccs
+igt at kms_ccs@random-ccs-data-y-tiled-gen12-mc-ccs
+igt at kms_ccs@random-ccs-data-4-tiled-dg2-mc-ccs
+igt at kms_ccs@random-ccs-data-4-tiled-mtl-mc-ccs
+igt at kms_ccs@missing-ccs-buffer-y-tiled-gen12-mc-ccs
+igt at kms_ccs@missing-ccs-buffer-4-tiled-mtl-mc-ccs
+igt at kms_ccs@ccs-on-another-bo-y-tiled-gen12-mc-ccs
+igt at kms_ccs@ccs-on-another-bo-4-tiled-mtl-mc-ccs
+igt at kms_ccs@bad-aux-stride-y-tiled-gen12-mc-ccs
+igt at kms_ccs@bad-aux-stride-4-tiled-mtl-mc-ccs
+igt at kms_ccs@crc-sprite-planes-basic-y-tiled-gen12-mc-ccs
+igt at kms_ccs@crc-sprite-planes-basic-4-tiled-dg2-mc-ccs
+igt at kms_ccs@crc-sprite-planes-basic-4-tiled-mtl-mc-ccs
+igt at kms_flip_tiling@flip-change-tiling
+igt at kms_plane@pixel-format
+igt at kms_plane@pixel-format-source-clamping
 igt at kms_addfb_basic@addfb25-4-tiled
 igt at kms_addfb_basic@addfb25-bad-modifier
 igt at kms_addfb_basic@addfb25-modifier-no-flag
-- 
2.43.0