[i-g-t V2 42/44] tests/kms_universal_plane: Add XE support
Bhanuprakash Modem
bhanuprakash.modem at intel.com
Mon Mar 27 16:09:24 UTC 2023
Add XE driver support for kms tests.
TODO: Add support for xe specific debugfs
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
---
tests/kms_universal_plane.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
index 114918d97..aca0a63cf 100644
--- a/tests/kms_universal_plane.c
+++ b/tests/kms_universal_plane.c
@@ -576,7 +576,7 @@ cursor_leak_test_fini(data_t *data,
}
static int
-i915_gem_fb_count(data_t *data)
+intel_gem_fb_count(data_t *data)
{
char buf[1024];
FILE *fp;
@@ -617,7 +617,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
mode = igt_output_get_mode(output);
/* Count GEM framebuffers before creating our cursor FB's */
- count1 = i915_gem_fb_count(data);
+ count1 = intel_gem_fb_count(data);
/* Black background FB */
igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
@@ -675,7 +675,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
cursor_leak_test_fini(data, output, &background_fb, cursor_fb);
/* We should be back to the same framebuffer count as when we started */
- count2 = i915_gem_fb_count(data);
+ count2 = intel_gem_fb_count(data);
igt_assert_eq(count1, count2);
}
@@ -737,7 +737,7 @@ pageflip_win_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
int ret = 0;
- igt_skip_on(is_i915_device(data->drm_fd) && data->display_ver < 9);
+ igt_skip_on(is_intel_device(data->drm_fd) && data->display_ver < 9);
igt_require_pipe(&data->display, pipe);
igt_info("Using (pipe %s + %s) to run the subtest.\n",
@@ -895,14 +895,15 @@ igt_main
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_ANY);
- if (is_i915_device(data.drm_fd))
- data.display_ver = intel_display_ver(intel_get_drm_devid(data.drm_fd));
-
kmstest_set_vt_graphics_mode();
igt_require_pipe_crc(data.drm_fd);
igt_display_require(&data.display, data.drm_fd);
igt_display_require_output(&data.display);
+
+ if (is_intel_device(data.drm_fd))
+ data.display_ver = intel_display_ver(intel_get_drm_devid(data.drm_fd));
+
}
for_each_pipe_static(pipe) {
--
2.40.0
More information about the Intel-gfx-trybot
mailing list