* [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory
@ 2021-08-11 7:02 Bhanuprakash Modem
2021-08-11 7:40 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms: Move Intel specific kms tests to i915 directory (rev2) Patchwork
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Bhanuprakash Modem @ 2021-08-11 7:02 UTC (permalink / raw)
To: igt-dev
Cc: Bhanuprakash Modem, Mark Yacoub, Petri Latvala, Vidya Srinivas,
Karthik B S
As KMS tests on IGT are officially supported on multiple SoCs
and there is an active development on it. So, KMS tests are
meant to be generic and if we need to test few things specific
to Intel, so we can use igt_require_intel(). But if the whole
test is Intel specific, then the best place for the test would
be tests/i915.
This patch will move all Intel specific kms tests to tests/i915
directory. And update the tests those are generic but still open
the driver as 'drm_open_driver_master(DRIVER_INTEL);'. This patch
will also do some minor cleanups.
V2:
* Few more tests
Cc: Mark Yacoub <markyacoub@chromium.org>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Vidya Srinivas <vidya.srinivas@intel.com>
Cc: Karthik B S <karthik.b.s@intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
tests/{ => i915}/kms_big_fb.c | 0
tests/{ => i915}/kms_busy.c | 0
tests/{ => i915}/kms_ccs.c | 0
tests/{ => i915}/kms_cdclk.c | 0
tests/{ => i915}/kms_draw_crc.c | 0
tests/{ => i915}/kms_dsc.c | 15 ++++-----
tests/{ => i915}/kms_fbcon_fbt.c | 0
tests/{ => i915}/kms_fence_pin_leak.c | 0
tests/{ => i915}/kms_flip_scaled_crc.c | 0
tests/{ => i915}/kms_flip_tiling.c | 0
tests/{ => i915}/kms_frontbuffer_tracking.c | 0
tests/{ => i915}/kms_invalid_dotclock.c | 0
tests/{ => i915}/kms_legacy_colorkey.c | 0
tests/{ => i915}/kms_pipe_b_c_ivb.c | 0
tests/{ => i915}/kms_psr.c | 0
tests/{ => i915}/kms_psr2_sf.c | 0
tests/{ => i915}/kms_psr2_su.c | 0
tests/kms_3d.c | 5 +--
tests/kms_big_joiner.c | 2 +-
tests/kms_cursor_edge_walk.c | 9 +++---
tests/kms_flip.c | 1 +
tests/kms_flip_event_leak.c | 2 +-
tests/kms_force_connector_basic.c | 4 +--
tests/kms_hdmi_inject.c | 14 +++++----
tests/kms_mmap_write_crc.c | 8 ++---
tests/kms_pwrite_crc.c | 8 ++---
tests/kms_tv_load_detect.c | 2 +-
tests/kms_universal_plane.c | 10 ++++--
tests/meson.build | 34 ++++++++++-----------
29 files changed, 58 insertions(+), 56 deletions(-)
rename tests/{ => i915}/kms_big_fb.c (100%)
rename tests/{ => i915}/kms_busy.c (100%)
rename tests/{ => i915}/kms_ccs.c (100%)
rename tests/{ => i915}/kms_cdclk.c (100%)
rename tests/{ => i915}/kms_draw_crc.c (100%)
rename tests/{ => i915}/kms_dsc.c (95%)
rename tests/{ => i915}/kms_fbcon_fbt.c (100%)
rename tests/{ => i915}/kms_fence_pin_leak.c (100%)
rename tests/{ => i915}/kms_flip_scaled_crc.c (100%)
rename tests/{ => i915}/kms_flip_tiling.c (100%)
rename tests/{ => i915}/kms_frontbuffer_tracking.c (100%)
rename tests/{ => i915}/kms_invalid_dotclock.c (100%)
rename tests/{ => i915}/kms_legacy_colorkey.c (100%)
rename tests/{ => i915}/kms_pipe_b_c_ivb.c (100%)
rename tests/{ => i915}/kms_psr.c (100%)
rename tests/{ => i915}/kms_psr2_sf.c (100%)
rename tests/{ => i915}/kms_psr2_su.c (100%)
diff --git a/tests/kms_big_fb.c b/tests/i915/kms_big_fb.c
similarity index 100%
rename from tests/kms_big_fb.c
rename to tests/i915/kms_big_fb.c
diff --git a/tests/kms_busy.c b/tests/i915/kms_busy.c
similarity index 100%
rename from tests/kms_busy.c
rename to tests/i915/kms_busy.c
diff --git a/tests/kms_ccs.c b/tests/i915/kms_ccs.c
similarity index 100%
rename from tests/kms_ccs.c
rename to tests/i915/kms_ccs.c
diff --git a/tests/kms_cdclk.c b/tests/i915/kms_cdclk.c
similarity index 100%
rename from tests/kms_cdclk.c
rename to tests/i915/kms_cdclk.c
diff --git a/tests/kms_draw_crc.c b/tests/i915/kms_draw_crc.c
similarity index 100%
rename from tests/kms_draw_crc.c
rename to tests/i915/kms_draw_crc.c
diff --git a/tests/kms_dsc.c b/tests/i915/kms_dsc.c
similarity index 95%
rename from tests/kms_dsc.c
rename to tests/i915/kms_dsc.c
index b56e01837..3e450207f 100644
--- a/tests/kms_dsc.c
+++ b/tests/i915/kms_dsc.c
@@ -244,14 +244,12 @@ static void run_test(data_t *data, enum dsc_test_type test_type)
&data->fb_test_pattern);
for_each_pipe(&data->display, pipe) {
- if (is_i915_device(data->drm_fd)) {
- uint32_t devid = intel_get_drm_devid(data->drm_fd);
+ uint32_t devid = intel_get_drm_devid(data->drm_fd);
- if (data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
- pipe == PIPE_A && IS_GEN11(devid)) {
- igt_debug("DSC not supported on Pipe A on external DP in Gen11 platforms\n");
- continue;
- }
+ if (data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
+ pipe == PIPE_A && IS_GEN11(devid)) {
+ igt_debug("DSC not supported on Pipe A on external DP in Gen11 platforms\n");
+ continue;
}
snprintf(test_name, sizeof(test_name), "-%dbpp", data->compression_bpp);
@@ -279,8 +277,7 @@ igt_main
drmModeConnector *connector = NULL;
int i, j;
igt_fixture {
- data.drm_fd = drm_open_driver_master(DRIVER_ANY);
- igt_require_intel(data.drm_fd);
+ data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
data.devid = intel_get_drm_devid(data.drm_fd);
kmstest_set_vt_graphics_mode();
igt_install_exit_handler(kms_dsc_exit_handler);
diff --git a/tests/kms_fbcon_fbt.c b/tests/i915/kms_fbcon_fbt.c
similarity index 100%
rename from tests/kms_fbcon_fbt.c
rename to tests/i915/kms_fbcon_fbt.c
diff --git a/tests/kms_fence_pin_leak.c b/tests/i915/kms_fence_pin_leak.c
similarity index 100%
rename from tests/kms_fence_pin_leak.c
rename to tests/i915/kms_fence_pin_leak.c
diff --git a/tests/kms_flip_scaled_crc.c b/tests/i915/kms_flip_scaled_crc.c
similarity index 100%
rename from tests/kms_flip_scaled_crc.c
rename to tests/i915/kms_flip_scaled_crc.c
diff --git a/tests/kms_flip_tiling.c b/tests/i915/kms_flip_tiling.c
similarity index 100%
rename from tests/kms_flip_tiling.c
rename to tests/i915/kms_flip_tiling.c
diff --git a/tests/kms_frontbuffer_tracking.c b/tests/i915/kms_frontbuffer_tracking.c
similarity index 100%
rename from tests/kms_frontbuffer_tracking.c
rename to tests/i915/kms_frontbuffer_tracking.c
diff --git a/tests/kms_invalid_dotclock.c b/tests/i915/kms_invalid_dotclock.c
similarity index 100%
rename from tests/kms_invalid_dotclock.c
rename to tests/i915/kms_invalid_dotclock.c
diff --git a/tests/kms_legacy_colorkey.c b/tests/i915/kms_legacy_colorkey.c
similarity index 100%
rename from tests/kms_legacy_colorkey.c
rename to tests/i915/kms_legacy_colorkey.c
diff --git a/tests/kms_pipe_b_c_ivb.c b/tests/i915/kms_pipe_b_c_ivb.c
similarity index 100%
rename from tests/kms_pipe_b_c_ivb.c
rename to tests/i915/kms_pipe_b_c_ivb.c
diff --git a/tests/kms_psr.c b/tests/i915/kms_psr.c
similarity index 100%
rename from tests/kms_psr.c
rename to tests/i915/kms_psr.c
diff --git a/tests/kms_psr2_sf.c b/tests/i915/kms_psr2_sf.c
similarity index 100%
rename from tests/kms_psr2_sf.c
rename to tests/i915/kms_psr2_sf.c
diff --git a/tests/kms_psr2_su.c b/tests/i915/kms_psr2_su.c
similarity index 100%
rename from tests/kms_psr2_su.c
rename to tests/i915/kms_psr2_su.c
diff --git a/tests/kms_3d.c b/tests/kms_3d.c
index 2e438b430..c29d1d57c 100644
--- a/tests/kms_3d.c
+++ b/tests/kms_3d.c
@@ -34,7 +34,7 @@ igt_simple_main
const struct edid *edid;
int mode_count, connector_id;
- drm_fd = drm_open_driver_master(DRIVER_INTEL);
+ drm_fd = drm_open_driver_master(DRIVER_ANY);
res = drmModeGetResources(drm_fd);
igt_require(res);
@@ -44,7 +44,8 @@ igt_simple_main
/* find an hdmi connector */
for (int i = 0; i < res->count_connectors; i++) {
connector = drmModeGetConnectorCurrent(drm_fd, res->connectors[i]);
- if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)
+ if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
+ connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
break;
drmModeFreeConnector(connector);
connector = NULL;
diff --git a/tests/kms_big_joiner.c b/tests/kms_big_joiner.c
index 4f1f3152e..45c5b2a2a 100644
--- a/tests/kms_big_joiner.c
+++ b/tests/kms_big_joiner.c
@@ -258,7 +258,7 @@ igt_main
uint16_t width = 0, height = 0;
igt_fixture {
- data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
+ data.drm_fd = drm_open_driver_master(DRIVER_ANY);
kmstest_set_vt_graphics_mode();
igt_display_require(&data.display, data.drm_fd);
diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
index e9902f5e7..66781eec6 100644
--- a/tests/kms_cursor_edge_walk.c
+++ b/tests/kms_cursor_edge_walk.c
@@ -94,8 +94,8 @@ static void cursor_move(data_t *data, int x, int y, int i)
* fails). So let's accept a failure from the ioctl in that case.
*/
igt_assert(drmModeMoveCursor(data->drm_fd, crtc_id, x, y) == 0 ||
- (IS_CHERRYVIEW(data->devid) && data->pipe == PIPE_C &&
- x < 0 && x > -data->curw));
+ (data->devid && IS_CHERRYVIEW(data->devid) &&
+ data->pipe == PIPE_C && x < 0 && x > -data->curw));
igt_wait_for_vblank(data->drm_fd,
display->pipes[data->pipe].crtc_offset);
}
@@ -312,9 +312,10 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
igt_fixture {
int ret;
- data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
+ data.drm_fd = drm_open_driver_master(DRIVER_ANY);
- data.devid = intel_get_drm_devid(data.drm_fd);
+ if (is_i915_device(data.drm_fd))
+ data.devid = intel_get_drm_devid(data.drm_fd);
ret = drmGetCap(data.drm_fd, DRM_CAP_CURSOR_WIDTH, &max_curw);
igt_assert(ret == 0 || errno == EINVAL);
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index b4836a44d..541378712 100755
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -778,6 +778,7 @@ static bool run_test_step(struct test_output *o, unsigned int *events)
memset(&hang, 0, sizeof(hang));
if (do_flip && (o->flags & TEST_HANG)) {
+ igt_require_intel(drm_fd);
ahnd = get_reloc_ahnd(drm_fd, 0);
hang = hang_gpu(drm_fd, ahnd);
}
diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
index 09c871911..97be91907 100644
--- a/tests/kms_flip_event_leak.c
+++ b/tests/kms_flip_event_leak.c
@@ -83,7 +83,7 @@ static void test(data_t *data, enum pipe pipe, igt_output_t *output)
igt_device_set_master(data->drm_fd);
igt_plane_set_fb(primary, NULL);
- igt_output_set_pipe(output, PIPE_ANY);
+ igt_output_set_pipe(output, PIPE_NONE);
igt_display_commit(&data->display);
igt_remove_fb(data->drm_fd, &fb[0]);
diff --git a/tests/kms_force_connector_basic.c b/tests/kms_force_connector_basic.c
index 3b0146fe9..683d36720 100644
--- a/tests/kms_force_connector_basic.c
+++ b/tests/kms_force_connector_basic.c
@@ -37,7 +37,7 @@ static void reset_connectors(void)
drmModeRes *res;
drmModeConnector *connector = NULL;
- drm_fd = drm_open_driver_master(DRIVER_INTEL);
+ drm_fd = drm_open_driver_master(DRIVER_ANY);
res = drmModeGetResources(drm_fd);
for (int i = 0; i < res->count_connectors; i++) {
@@ -86,7 +86,7 @@ igt_main_args("", long_opts, help_str, opt_handler, NULL)
igt_fixture {
unsigned connector_id = 0;
- drm_fd = drm_open_driver_master(DRIVER_INTEL);
+ drm_fd = drm_open_driver_master(DRIVER_ANY);
res = drmModeGetResources(drm_fd);
igt_require(res);
diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c
index ad2dde569..13a05eb1e 100644
--- a/tests/kms_hdmi_inject.c
+++ b/tests/kms_hdmi_inject.c
@@ -63,7 +63,8 @@ get_connector(int drm_fd, drmModeRes *res)
connector =
drmModeGetConnectorCurrent(drm_fd, res->connectors[i]);
- if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)
+ if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
+ connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
break;
drmModeFreeConnector(connector);
@@ -82,12 +83,13 @@ hdmi_inject_4k(int drm_fd, drmModeConnector *connector)
int fb_id;
struct igt_fb fb;
uint8_t found_4k_mode = 0;
- uint32_t devid;
- devid = intel_get_drm_devid(drm_fd);
+ if (is_i915_device(drm_fd)) {
+ uint32_t devid = intel_get_drm_devid(drm_fd);
- /* 4K requires at least HSW */
- igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
+ /* 4K requires at least HSW */
+ igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
+ }
edid = igt_kms_get_4k_edid();
kmstest_force_edid(drm_fd, connector, edid);
@@ -195,7 +197,7 @@ igt_main
drmModeConnector *connector;
igt_fixture {
- drm_fd = drm_open_driver_master(DRIVER_INTEL);
+ drm_fd = drm_open_driver_master(DRIVER_ANY);
res = drmModeGetResources(drm_fd);
igt_require(res);
diff --git a/tests/kms_mmap_write_crc.c b/tests/kms_mmap_write_crc.c
index 2e323a209..0c697c246 100644
--- a/tests/kms_mmap_write_crc.c
+++ b/tests/kms_mmap_write_crc.c
@@ -51,7 +51,6 @@ typedef struct {
enum pipe pipe;
igt_crc_t ref_crc;
igt_pipe_crc_t *pipe_crc;
- uint32_t devid;
} data_t;
static int ioctl_sync = true;
@@ -103,6 +102,7 @@ static void test(data_t *data)
igt_display_commit(display);
/* make sure caching mode has become UC/WT */
+ igt_require_intel(data->drm_fd);
caching = gem_get_caching(data->drm_fd, fb->gem_handle);
igt_assert(caching == I915_CACHING_NONE || caching == I915_CACHING_DISPLAY);
@@ -204,7 +204,7 @@ static void cleanup_crtc(data_t *data)
igt_plane_set_fb(data->primary, NULL);
- igt_output_set_pipe(output, PIPE_ANY);
+ igt_output_set_pipe(output, PIPE_NONE);
igt_display_commit(display);
igt_remove_fb(data->drm_fd, &data->fb[0]);
@@ -272,9 +272,7 @@ igt_main_args("n", NULL, NULL, opt_handler, NULL)
int i;
igt_fixture {
- data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
-
- data.devid = intel_get_drm_devid(data.drm_fd);
+ data.drm_fd = drm_open_driver_master(DRIVER_ANY);
kmstest_set_vt_graphics_mode();
diff --git a/tests/kms_pwrite_crc.c b/tests/kms_pwrite_crc.c
index dc32a070c..a1642df6f 100644
--- a/tests/kms_pwrite_crc.c
+++ b/tests/kms_pwrite_crc.c
@@ -42,7 +42,6 @@ typedef struct {
enum pipe pipe;
igt_crc_t ref_crc;
igt_pipe_crc_t *pipe_crc;
- uint32_t devid;
} data_t;
static void test(data_t *data)
@@ -77,6 +76,7 @@ static void test(data_t *data)
0, 0, fb->width << 16, fb->height << 16);
/* make sure caching mode has become UC/WT */
+ igt_require_intel(data->drm_fd);
caching = gem_get_caching(data->drm_fd, fb->gem_handle);
igt_assert(caching == I915_CACHING_NONE || caching == I915_CACHING_DISPLAY);
@@ -141,7 +141,7 @@ static void cleanup_crtc(data_t *data)
igt_plane_set_fb(data->primary, NULL);
- igt_output_set_pipe(output, PIPE_ANY);
+ igt_output_set_pipe(output, PIPE_NONE);
igt_display_commit(display);
igt_remove_fb(data->drm_fd, &data->fb[0]);
@@ -174,9 +174,7 @@ static data_t data;
igt_simple_main
{
- data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
-
- data.devid = intel_get_drm_devid(data.drm_fd);
+ data.drm_fd = drm_open_driver_master(DRIVER_ANY);
kmstest_set_vt_graphics_mode();
diff --git a/tests/kms_tv_load_detect.c b/tests/kms_tv_load_detect.c
index caac3aecb..80ced9918 100644
--- a/tests/kms_tv_load_detect.c
+++ b/tests/kms_tv_load_detect.c
@@ -34,7 +34,7 @@ igt_main
drmModeConnector *tv_connector = NULL, *temp;
igt_fixture {
- drm_fd = drm_open_driver_master(DRIVER_INTEL);
+ drm_fd = drm_open_driver_master(DRIVER_ANY);
res = drmModeGetResources(drm_fd);
igt_require(res);
diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
index c9a9cd47a..ea9bd9a56 100644
--- a/tests/kms_universal_plane.c
+++ b/tests/kms_universal_plane.c
@@ -107,7 +107,7 @@ functional_test_fini(functional_test_t *test, igt_output_t *output)
igt_remove_fb(test->data->drm_fd, &test->red_fb);
igt_remove_fb(test->data->drm_fd, &test->yellow_fb);
- igt_output_set_pipe(output, PIPE_ANY);
+ igt_output_set_pipe(output, PIPE_NONE);
igt_display_commit2(&test->data->display, COMMIT_LEGACY);
}
@@ -382,6 +382,7 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
* doesn't cover CRTC (should fail on pre-gen9 and succeed on
* gen9+).
*/
+ igt_require_intel(data->drm_fd);
igt_plane_set_fb(primary, &test.undersized_fb);
expect = (data->display_ver < 9) ? -EINVAL : 0;
igt_assert(igt_display_try_commit2(&data->display, COMMIT_UNIVERSAL) == expect);
@@ -579,6 +580,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
igt_require_pipe(display, pipe);
igt_require(display->has_cursor_plane);
+ igt_require_intel(data->drm_fd);
igt_output_set_pipe(output, pipe);
mode = igt_output_get_mode(output);
@@ -704,6 +706,7 @@ gen9_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
int ret = 0;
+ igt_require_intel(data->drm_fd);
igt_skip_on(data->display_ver < 9);
igt_require_pipe(&data->display, pipe);
@@ -797,8 +800,9 @@ igt_main
enum pipe pipe;
igt_fixture {
- data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
- data.display_ver = intel_display_ver(intel_get_drm_devid(data.drm_fd));
+ 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();
diff --git a/tests/meson.build b/tests/meson.build
index 1bdfddbb2..8ca78fa0c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -19,11 +19,7 @@ test_progs = [
'kms_atomic',
'kms_atomic_interruptible',
'kms_atomic_transition',
- 'kms_big_fb',
'kms_big_joiner' ,
- 'kms_busy',
- 'kms_ccs',
- 'kms_cdclk',
'kms_concurrent',
'kms_content_protection',
'kms_cursor_crc',
@@ -32,26 +28,16 @@ test_progs = [
'kms_dither',
'kms_dp_aux_dev',
'kms_dp_tiled_display',
- 'kms_draw_crc',
- 'kms_dsc',
- 'kms_fbcon_fbt',
- 'kms_fence_pin_leak',
'kms_flip',
'kms_flip_event_leak',
- 'kms_flip_scaled_crc',
- 'kms_flip_tiling',
'kms_force_connector_basic',
- 'kms_frontbuffer_tracking',
'kms_getfb',
'kms_hdmi_inject',
'kms_hdr',
- 'kms_invalid_dotclock',
'kms_lease',
- 'kms_legacy_colorkey',
'kms_mmap_write_crc',
'kms_multipipe_modeset',
'kms_panel_fitting',
- 'kms_pipe_b_c_ivb',
'kms_pipe_crc_basic',
'kms_plane',
'kms_plane_alpha_blend',
@@ -62,9 +48,6 @@ test_progs = [
'kms_prime',
'kms_prop_blob',
'kms_properties',
- 'kms_psr',
- 'kms_psr2_su',
- 'kms_psr2_sf',
'kms_pwrite_crc',
'kms_rmfb',
'kms_rotation_crc',
@@ -235,6 +218,23 @@ i915_progs = [
'i915_query',
'i915_selftest',
'i915_suspend',
+ 'kms_big_fb',
+ 'kms_busy',
+ 'kms_ccs',
+ 'kms_cdclk',
+ 'kms_draw_crc',
+ 'kms_dsc',
+ 'kms_fbcon_fbt',
+ 'kms_fence_pin_leak',
+ 'kms_flip_scaled_crc',
+ 'kms_flip_tiling',
+ 'kms_frontbuffer_tracking',
+ 'kms_invalid_dotclock',
+ 'kms_legacy_colorkey',
+ 'kms_pipe_b_c_ivb',
+ 'kms_psr',
+ 'kms_psr2_su',
+ 'kms_psr2_sf',
'sysfs_clients',
'sysfs_defaults',
'sysfs_heartbeat_interval',
--
2.32.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for tests/kms: Move Intel specific kms tests to i915 directory (rev2)
2021-08-11 7:02 [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory Bhanuprakash Modem
@ 2021-08-11 7:40 ` Patchwork
2021-08-11 8:55 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2021-08-11 7:40 UTC (permalink / raw)
To: Bhanuprakash Modem; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 1441 bytes --]
== Series Details ==
Series: tests/kms: Move Intel specific kms tests to i915 directory (rev2)
URL : https://patchwork.freedesktop.org/series/93224/
State : success
== Summary ==
CI Bug Log - changes from IGT_6167 -> IGTPW_6114
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/index.html
Known issues
------------
Here are the changes found in IGTPW_6114 that come from known issues:
### IGT changes ###
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#3911]: https://gitlab.freedesktop.org/drm/intel/issues/3911
Participating hosts (36 -> 34)
------------------------------
Missing (2): fi-bsw-cyan fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_6167 -> IGTPW_6114
CI-20190529: 20190529
CI_DRM_10465: b183cdc9ca5e84a70c1d9d57ab317319fb6bed65 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_6114: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/index.html
IGT_6167: 9e8cedeaf26344c7afd7185d6c2cf4b174560a33 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/index.html
[-- Attachment #2: Type: text/html, Size: 1873 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for tests/kms: Move Intel specific kms tests to i915 directory (rev2)
2021-08-11 7:02 [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory Bhanuprakash Modem
2021-08-11 7:40 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms: Move Intel specific kms tests to i915 directory (rev2) Patchwork
@ 2021-08-11 8:55 ` Patchwork
2021-09-01 18:38 ` [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory Mark Yacoub
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2021-08-11 8:55 UTC (permalink / raw)
To: Bhanuprakash Modem; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 30283 bytes --]
== Series Details ==
Series: tests/kms: Move Intel specific kms tests to i915 directory (rev2)
URL : https://patchwork.freedesktop.org/series/93224/
State : success
== Summary ==
CI Bug Log - changes from IGT_6167_full -> IGTPW_6114_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/index.html
Known issues
------------
Here are the changes found in IGTPW_6114_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_create@create-clear:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#1888] / [i915#3160])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-glk5/igt@gem_create@create-clear.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-glk5/igt@gem_create@create-clear.html
* igt@gem_ctx_persistence@engines-mixed:
- shard-snb: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#1099]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-snb5/igt@gem_ctx_persistence@engines-mixed.html
* igt@gem_eio@unwedge-stress:
- shard-tglb: [PASS][4] -> [TIMEOUT][5] ([i915#2369] / [i915#3063] / [i915#3648])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-tglb6/igt@gem_eio@unwedge-stress.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb7/igt@gem_eio@unwedge-stress.html
* igt@gem_exec_fair@basic-deadline:
- shard-kbl: [PASS][6] -> [FAIL][7] ([i915#2846])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-kbl7/igt@gem_exec_fair@basic-deadline.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl6/igt@gem_exec_fair@basic-deadline.html
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-kbl: NOTRUN -> [FAIL][8] ([i915#2842])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl7/igt@gem_exec_fair@basic-none-solo@rcs0.html
* igt@gem_exec_fair@basic-none@vecs0:
- shard-apl: [PASS][9] -> [FAIL][10] ([i915#2842] / [i915#3468])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-apl8/igt@gem_exec_fair@basic-none@vecs0.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl2/igt@gem_exec_fair@basic-none@vecs0.html
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-glk: NOTRUN -> [FAIL][11] ([i915#2842])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-glk7/igt@gem_exec_fair@basic-pace-solo@rcs0.html
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-iclb: [PASS][12] -> [FAIL][13] ([i915#2842])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-iclb3/igt@gem_exec_fair@basic-pace@vecs0.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb5/igt@gem_exec_fair@basic-pace@vecs0.html
* igt@gem_userptr_blits@dmabuf-sync:
- shard-apl: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#3323])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl8/igt@gem_userptr_blits@dmabuf-sync.html
* igt@gem_userptr_blits@invalid-mmap-offset-unsync:
- shard-iclb: NOTRUN -> [SKIP][15] ([i915#3297])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb6/igt@gem_userptr_blits@invalid-mmap-offset-unsync.html
- shard-tglb: NOTRUN -> [SKIP][16] ([i915#3297])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb1/igt@gem_userptr_blits@invalid-mmap-offset-unsync.html
* igt@gem_workarounds@suspend-resume-fd:
- shard-kbl: [PASS][17] -> [DMESG-WARN][18] ([i915#180]) +3 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-kbl2/igt@gem_workarounds@suspend-resume-fd.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl1/igt@gem_workarounds@suspend-resume-fd.html
* igt@gen9_exec_parse@batch-invalid-length:
- shard-snb: NOTRUN -> [SKIP][19] ([fdo#109271]) +417 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-snb6/igt@gen9_exec_parse@batch-invalid-length.html
* igt@gen9_exec_parse@bb-start-far:
- shard-iclb: NOTRUN -> [SKIP][20] ([i915#2856])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb5/igt@gen9_exec_parse@bb-start-far.html
- shard-tglb: NOTRUN -> [SKIP][21] ([i915#2856])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb5/igt@gen9_exec_parse@bb-start-far.html
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-tglb: NOTRUN -> [WARN][22] ([i915#2681])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb6/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@i915_pm_rpm@cursor-dpms:
- shard-tglb: NOTRUN -> [SKIP][23] ([i915#579])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb3/igt@i915_pm_rpm@cursor-dpms.html
- shard-iclb: NOTRUN -> [SKIP][24] ([i915#579])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb8/igt@i915_pm_rpm@cursor-dpms.html
* igt@i915_pm_rpm@gem-execbuf-stress:
- shard-glk: NOTRUN -> [SKIP][25] ([fdo#109271]) +61 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-glk9/igt@i915_pm_rpm@gem-execbuf-stress.html
* igt@i915_pm_sseu@full-enable:
- shard-tglb: NOTRUN -> [SKIP][26] ([fdo#109288])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb5/igt@i915_pm_sseu@full-enable.html
- shard-iclb: NOTRUN -> [SKIP][27] ([fdo#109288])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb4/igt@i915_pm_sseu@full-enable.html
* igt@i915_suspend@sysfs-reader:
- shard-apl: NOTRUN -> [DMESG-WARN][28] ([i915#180]) +1 similar issue
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl1/igt@i915_suspend@sysfs-reader.html
* igt@kms_big_fb@x-tiled-32bpp-rotate-0:
- shard-glk: [PASS][29] -> [DMESG-WARN][30] ([i915#118] / [i915#95]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-glk6/igt@kms_big_fb@x-tiled-32bpp-rotate-0.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-glk3/igt@kms_big_fb@x-tiled-32bpp-rotate-0.html
* igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-kbl: NOTRUN -> [SKIP][31] ([fdo#109271] / [i915#3777])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl2/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-hflip.html
* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-apl: NOTRUN -> [SKIP][32] ([fdo#109271] / [i915#3777]) +2 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl8/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip.html
* igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0-hflip-async-flip:
- shard-iclb: NOTRUN -> [SKIP][33] ([fdo#110723])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb3/igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0-hflip-async-flip.html
- shard-tglb: NOTRUN -> [SKIP][34] ([fdo#111615])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb8/igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0-hflip-async-flip.html
* igt@kms_ccs@pipe-a-crc-primary-basic-y_tiled_gen12_rc_ccs_cc:
- shard-glk: NOTRUN -> [SKIP][35] ([fdo#109271] / [i915#3886]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-glk6/igt@kms_ccs@pipe-a-crc-primary-basic-y_tiled_gen12_rc_ccs_cc.html
- shard-iclb: NOTRUN -> [SKIP][36] ([fdo#109278] / [i915#3886]) +1 similar issue
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb3/igt@kms_ccs@pipe-a-crc-primary-basic-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][37] ([i915#3689] / [i915#3886])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb5/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-crc-primary-basic-y_tiled_gen12_mc_ccs:
- shard-kbl: NOTRUN -> [SKIP][38] ([fdo#109271] / [i915#3886]) +6 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl6/igt@kms_ccs@pipe-b-crc-primary-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-crc-primary-basic-yf_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][39] ([i915#3689]) +7 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb6/igt@kms_ccs@pipe-b-crc-primary-basic-yf_tiled_ccs.html
* igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][40] ([fdo#109271] / [i915#3886]) +10 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl6/igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-d-ccs-on-another-bo-yf_tiled_ccs:
- shard-iclb: NOTRUN -> [SKIP][41] ([fdo#109278]) +10 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb3/igt@kms_ccs@pipe-d-ccs-on-another-bo-yf_tiled_ccs.html
* igt@kms_chamelium@dp-mode-timings:
- shard-apl: NOTRUN -> [SKIP][42] ([fdo#109271] / [fdo#111827]) +21 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl2/igt@kms_chamelium@dp-mode-timings.html
- shard-glk: NOTRUN -> [SKIP][43] ([fdo#109271] / [fdo#111827]) +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-glk9/igt@kms_chamelium@dp-mode-timings.html
- shard-tglb: NOTRUN -> [SKIP][44] ([fdo#109284] / [fdo#111827]) +1 similar issue
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb8/igt@kms_chamelium@dp-mode-timings.html
* igt@kms_color_chamelium@pipe-a-ctm-max:
- shard-iclb: NOTRUN -> [SKIP][45] ([fdo#109284] / [fdo#111827]) +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb4/igt@kms_color_chamelium@pipe-a-ctm-max.html
* igt@kms_color_chamelium@pipe-b-degamma:
- shard-kbl: NOTRUN -> [SKIP][46] ([fdo#109271] / [fdo#111827]) +9 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl1/igt@kms_color_chamelium@pipe-b-degamma.html
* igt@kms_color_chamelium@pipe-invalid-ctm-matrix-sizes:
- shard-snb: NOTRUN -> [SKIP][47] ([fdo#109271] / [fdo#111827]) +18 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-snb2/igt@kms_color_chamelium@pipe-invalid-ctm-matrix-sizes.html
* igt@kms_content_protection@lic:
- shard-apl: NOTRUN -> [TIMEOUT][48] ([i915#1319]) +2 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl2/igt@kms_content_protection@lic.html
* igt@kms_content_protection@srm:
- shard-tglb: NOTRUN -> [SKIP][49] ([fdo#111828])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb8/igt@kms_content_protection@srm.html
- shard-kbl: NOTRUN -> [TIMEOUT][50] ([i915#1319])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl6/igt@kms_content_protection@srm.html
- shard-iclb: NOTRUN -> [SKIP][51] ([fdo#109300] / [fdo#111066])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb3/igt@kms_content_protection@srm.html
* igt@kms_cursor_crc@pipe-a-cursor-512x512-offscreen:
- shard-iclb: NOTRUN -> [SKIP][52] ([fdo#109278] / [fdo#109279])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb2/igt@kms_cursor_crc@pipe-a-cursor-512x512-offscreen.html
* igt@kms_cursor_crc@pipe-a-cursor-max-size-offscreen:
- shard-tglb: NOTRUN -> [SKIP][53] ([i915#3359]) +3 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb5/igt@kms_cursor_crc@pipe-a-cursor-max-size-offscreen.html
* igt@kms_cursor_crc@pipe-b-cursor-64x21-random:
- shard-apl: [PASS][54] -> [FAIL][55] ([i915#3444])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-apl7/igt@kms_cursor_crc@pipe-b-cursor-64x21-random.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl1/igt@kms_cursor_crc@pipe-b-cursor-64x21-random.html
- shard-kbl: [PASS][56] -> [FAIL][57] ([i915#3444])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-kbl1/igt@kms_cursor_crc@pipe-b-cursor-64x21-random.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl1/igt@kms_cursor_crc@pipe-b-cursor-64x21-random.html
* igt@kms_cursor_crc@pipe-d-cursor-512x512-sliding:
- shard-tglb: NOTRUN -> [SKIP][58] ([fdo#109279] / [i915#3359]) +1 similar issue
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb7/igt@kms_cursor_crc@pipe-d-cursor-512x512-sliding.html
* igt@kms_cursor_crc@pipe-d-cursor-suspend:
- shard-kbl: NOTRUN -> [SKIP][59] ([fdo#109271]) +103 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl7/igt@kms_cursor_crc@pipe-d-cursor-suspend.html
* igt@kms_cursor_legacy@2x-flip-vs-cursor-atomic:
- shard-iclb: NOTRUN -> [SKIP][60] ([fdo#109274] / [fdo#109278]) +2 similar issues
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb4/igt@kms_cursor_legacy@2x-flip-vs-cursor-atomic.html
* igt@kms_flip@2x-flip-vs-fences:
- shard-iclb: NOTRUN -> [SKIP][61] ([fdo#109274])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb3/igt@kms_flip@2x-flip-vs-fences.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-mmap-gtt:
- shard-iclb: NOTRUN -> [SKIP][62] ([fdo#109280]) +11 similar issues
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-mmap-gtt.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-cur-indfb-draw-mmap-cpu:
- shard-tglb: NOTRUN -> [SKIP][63] ([fdo#111825]) +18 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb1/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-cur-indfb-draw-mmap-cpu.html
* igt@kms_pipe_crc_basic@hang-read-crc-pipe-d:
- shard-kbl: NOTRUN -> [SKIP][64] ([fdo#109271] / [i915#533])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl1/igt@kms_pipe_crc_basic@hang-read-crc-pipe-d.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-kbl: NOTRUN -> [DMESG-WARN][65] ([i915#180])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl1/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
- shard-apl: [PASS][66] -> [DMESG-WARN][67] ([i915#180])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-apl7/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl1/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-apl: NOTRUN -> [FAIL][68] ([fdo#108145] / [i915#265]) +3 similar issues
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl8/igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb.html
* igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb:
- shard-apl: NOTRUN -> [FAIL][69] ([i915#265])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl7/igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb.html
* igt@kms_plane_alpha_blend@pipe-c-alpha-opaque-fb:
- shard-kbl: NOTRUN -> [FAIL][70] ([fdo#108145] / [i915#265])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl4/igt@kms_plane_alpha_blend@pipe-c-alpha-opaque-fb.html
- shard-glk: NOTRUN -> [FAIL][71] ([fdo#108145] / [i915#265])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-glk9/igt@kms_plane_alpha_blend@pipe-c-alpha-opaque-fb.html
* igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping:
- shard-apl: NOTRUN -> [SKIP][72] ([fdo#109271] / [i915#2733])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl2/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4:
- shard-apl: NOTRUN -> [SKIP][73] ([fdo#109271] / [i915#658]) +5 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl2/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4.html
* igt@kms_psr2_sf@plane-move-sf-dmg-area-0:
- shard-tglb: NOTRUN -> [SKIP][74] ([i915#2920]) +1 similar issue
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb6/igt@kms_psr2_sf@plane-move-sf-dmg-area-0.html
- shard-iclb: NOTRUN -> [SKIP][75] ([i915#658])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb7/igt@kms_psr2_sf@plane-move-sf-dmg-area-0.html
- shard-glk: NOTRUN -> [SKIP][76] ([fdo#109271] / [i915#658])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-glk3/igt@kms_psr2_sf@plane-move-sf-dmg-area-0.html
- shard-kbl: NOTRUN -> [SKIP][77] ([fdo#109271] / [i915#658]) +1 similar issue
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl4/igt@kms_psr2_sf@plane-move-sf-dmg-area-0.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][78] -> [SKIP][79] ([fdo#109642] / [fdo#111068] / [i915#658])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb7/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_cursor_plane_move:
- shard-iclb: [PASS][80] -> [SKIP][81] ([fdo#109441])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb8/igt@kms_psr@psr2_cursor_plane_move.html
* igt@kms_psr@psr2_primary_mmap_gtt:
- shard-tglb: NOTRUN -> [FAIL][82] ([i915#132] / [i915#3467])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb8/igt@kms_psr@psr2_primary_mmap_gtt.html
- shard-iclb: NOTRUN -> [SKIP][83] ([fdo#109441])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb5/igt@kms_psr@psr2_primary_mmap_gtt.html
* igt@kms_setmode@basic:
- shard-snb: NOTRUN -> [FAIL][84] ([i915#31])
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-snb6/igt@kms_setmode@basic.html
* igt@kms_vblank@pipe-d-ts-continuation-idle:
- shard-apl: NOTRUN -> [SKIP][85] ([fdo#109271]) +264 similar issues
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl1/igt@kms_vblank@pipe-d-ts-continuation-idle.html
* igt@kms_vblank@pipe-d-wait-idle:
- shard-glk: NOTRUN -> [SKIP][86] ([fdo#109271] / [i915#533])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-glk6/igt@kms_vblank@pipe-d-wait-idle.html
* igt@kms_vrr@flipline:
- shard-tglb: NOTRUN -> [SKIP][87] ([fdo#109502])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb2/igt@kms_vrr@flipline.html
- shard-iclb: NOTRUN -> [SKIP][88] ([fdo#109502])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb6/igt@kms_vrr@flipline.html
* igt@kms_writeback@writeback-fb-id:
- shard-apl: NOTRUN -> [SKIP][89] ([fdo#109271] / [i915#2437]) +1 similar issue
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl6/igt@kms_writeback@writeback-fb-id.html
* igt@nouveau_crc@pipe-c-source-rg:
- shard-iclb: NOTRUN -> [SKIP][90] ([i915#2530])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb2/igt@nouveau_crc@pipe-c-source-rg.html
- shard-tglb: NOTRUN -> [SKIP][91] ([i915#2530])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb2/igt@nouveau_crc@pipe-c-source-rg.html
* igt@perf@polling-parameterized:
- shard-glk: [PASS][92] -> [FAIL][93] ([i915#1542])
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-glk6/igt@perf@polling-parameterized.html
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-glk5/igt@perf@polling-parameterized.html
* igt@prime_nv_api@i915_nv_reimport_twice_check_flink_name:
- shard-tglb: NOTRUN -> [SKIP][94] ([fdo#109291]) +2 similar issues
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb7/igt@prime_nv_api@i915_nv_reimport_twice_check_flink_name.html
- shard-iclb: NOTRUN -> [SKIP][95] ([fdo#109291]) +1 similar issue
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb2/igt@prime_nv_api@i915_nv_reimport_twice_check_flink_name.html
* igt@sysfs_clients@fair-3:
- shard-kbl: NOTRUN -> [SKIP][96] ([fdo#109271] / [i915#2994]) +2 similar issues
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl2/igt@sysfs_clients@fair-3.html
* igt@sysfs_clients@fair-7:
- shard-apl: NOTRUN -> [SKIP][97] ([fdo#109271] / [i915#2994]) +5 similar issues
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl8/igt@sysfs_clients@fair-7.html
* igt@sysfs_clients@sema-25:
- shard-iclb: NOTRUN -> [SKIP][98] ([i915#2994])
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb8/igt@sysfs_clients@sema-25.html
- shard-tglb: NOTRUN -> [SKIP][99] ([i915#2994])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb3/igt@sysfs_clients@sema-25.html
- shard-glk: NOTRUN -> [SKIP][100] ([fdo#109271] / [i915#2994])
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-glk9/igt@sysfs_clients@sema-25.html
#### Possible fixes ####
* igt@gem_ctx_isolation@preservation-s3@vecs0:
- shard-kbl: [DMESG-WARN][101] ([i915#180]) -> [PASS][102] +1 similar issue
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-kbl1/igt@gem_ctx_isolation@preservation-s3@vecs0.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl1/igt@gem_ctx_isolation@preservation-s3@vecs0.html
* igt@gem_exec_fair@basic-none-rrul@rcs0:
- shard-glk: [FAIL][103] ([i915#2842]) -> [PASS][104]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-glk5/igt@gem_exec_fair@basic-none-rrul@rcs0.html
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-glk5/igt@gem_exec_fair@basic-none-rrul@rcs0.html
* igt@gem_exec_fair@basic-none@vecs0:
- shard-kbl: [FAIL][105] ([i915#2842]) -> [PASS][106]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-kbl2/igt@gem_exec_fair@basic-none@vecs0.html
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-kbl6/igt@gem_exec_fair@basic-none@vecs0.html
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [SKIP][107] ([i915#2190]) -> [PASS][108]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-tglb6/igt@gem_huc_copy@huc-copy.html
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb3/igt@gem_huc_copy@huc-copy.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][109] ([i915#454]) -> [PASS][110]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-iclb2/igt@i915_pm_dc@dc6-psr.html
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb4/igt@i915_pm_dc@dc6-psr.html
* igt@kms_flip@2x-plain-flip-ts-check@ac-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][111] ([i915#2122]) -> [PASS][112]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-glk1/igt@kms_flip@2x-plain-flip-ts-check@ac-hdmi-a1-hdmi-a2.html
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-glk5/igt@kms_flip@2x-plain-flip-ts-check@ac-hdmi-a1-hdmi-a2.html
* igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes:
- shard-apl: [DMESG-WARN][113] ([i915#180]) -> [PASS][114]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-apl8/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl7/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html
* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [SKIP][115] ([fdo#109441]) -> [PASS][116]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-iclb3/igt@kms_psr@psr2_sprite_mmap_gtt.html
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-apl: [DMESG-WARN][117] ([i915#180] / [i915#295]) -> [PASS][118]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-apl6/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl8/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
#### Warnings ####
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][119] ([i915#1804] / [i915#2684]) -> [WARN][120] ([i915#2684])
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-iclb6/igt@i915_pm_rc6_residency@rc6-fence.html
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb5/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4:
- shard-iclb: [SKIP][121] ([i915#2920]) -> [SKIP][122] ([i915#658])
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-iclb2/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4.html
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb5/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4:
- shard-iclb: [SKIP][123] ([i915#658]) -> [SKIP][124] ([i915#2920]) +2 similar issues
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-iclb6/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4.html
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4.html
* igt@runner@aborted:
- shard-apl: ([FAIL][125], [FAIL][126], [FAIL][127], [FAIL][128], [FAIL][129], [FAIL][130]) ([i915#180] / [i915#1814] / [i915#3002] / [i915#3363]) -> ([FAIL][131], [FAIL][132], [FAIL][133]) ([fdo#109271] / [i915#1610] / [i915#180] / [i915#1814] / [i915#3363])
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-apl3/igt@runner@aborted.html
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-apl8/igt@runner@aborted.html
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-apl6/igt@runner@aborted.html
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-apl1/igt@runner@aborted.html
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-apl2/igt@runner@aborted.html
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-apl8/igt@runner@aborted.html
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl1/igt@runner@aborted.html
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl1/igt@runner@aborted.html
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-apl2/igt@runner@aborted.html
- shard-tglb: ([FAIL][134], [FAIL][135]) ([i915#3002] / [i915#3728]) -> ([FAIL][136], [FAIL][137]) ([i915#3002])
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-tglb1/igt@runner@aborted.html
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6167/shard-tglb3/igt@runner@aborted.html
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb2/igt@runner@aborted.html
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/shard-tglb1/igt@runner@aborted.html
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109288]: https://bugs.freedesktop.org/show_bug.cgi?id=109288
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109300]: https://bugs.freedesktop.org/show_bug.cgi?id=109300
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109502]: https://bugs.freedesktop.org/show_bug.cgi?id=109502
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111066]: https://bugs.freedesktop.org/show_bug.cgi?id=111066
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#111828]: https://bugs.freedesktop.org/show_bug.cgi?id=111828
[i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
[i915#1814]: https://gitla
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6114/index.html
[-- Attachment #2: Type: text/html, Size: 37355 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory
2021-08-11 7:02 [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory Bhanuprakash Modem
2021-08-11 7:40 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms: Move Intel specific kms tests to i915 directory (rev2) Patchwork
2021-08-11 8:55 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
@ 2021-09-01 18:38 ` Mark Yacoub
2021-09-03 5:31 ` Karthik B S
2021-09-13 13:06 ` Rodrigo Siqueira
4 siblings, 0 replies; 8+ messages in thread
From: Mark Yacoub @ 2021-09-01 18:38 UTC (permalink / raw)
To: Bhanuprakash Modem
Cc: Development mailing list for IGT GPU Tools, Petri Latvala,
Vidya Srinivas, Karthik B S
I'm following up on this patch if it's been reviewed/applied yet.
On Wed, Aug 11, 2021 at 3:02 AM Bhanuprakash Modem
<bhanuprakash.modem@intel.com> wrote:
>
> As KMS tests on IGT are officially supported on multiple SoCs
> and there is an active development on it. So, KMS tests are
> meant to be generic and if we need to test few things specific
> to Intel, so we can use igt_require_intel(). But if the whole
> test is Intel specific, then the best place for the test would
> be tests/i915.
>
> This patch will move all Intel specific kms tests to tests/i915
> directory. And update the tests those are generic but still open
> the driver as 'drm_open_driver_master(DRIVER_INTEL);'. This patch
> will also do some minor cleanups.
>
> V2:
> * Few more tests
>
> Cc: Mark Yacoub <markyacoub@chromium.org>
> Cc: Petri Latvala <petri.latvala@intel.com>
> Cc: Vidya Srinivas <vidya.srinivas@intel.com>
> Cc: Karthik B S <karthik.b.s@intel.com>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> ---
> tests/{ => i915}/kms_big_fb.c | 0
> tests/{ => i915}/kms_busy.c | 0
> tests/{ => i915}/kms_ccs.c | 0
> tests/{ => i915}/kms_cdclk.c | 0
> tests/{ => i915}/kms_draw_crc.c | 0
> tests/{ => i915}/kms_dsc.c | 15 ++++-----
> tests/{ => i915}/kms_fbcon_fbt.c | 0
> tests/{ => i915}/kms_fence_pin_leak.c | 0
> tests/{ => i915}/kms_flip_scaled_crc.c | 0
> tests/{ => i915}/kms_flip_tiling.c | 0
> tests/{ => i915}/kms_frontbuffer_tracking.c | 0
> tests/{ => i915}/kms_invalid_dotclock.c | 0
> tests/{ => i915}/kms_legacy_colorkey.c | 0
> tests/{ => i915}/kms_pipe_b_c_ivb.c | 0
> tests/{ => i915}/kms_psr.c | 0
> tests/{ => i915}/kms_psr2_sf.c | 0
> tests/{ => i915}/kms_psr2_su.c | 0
> tests/kms_3d.c | 5 +--
> tests/kms_big_joiner.c | 2 +-
> tests/kms_cursor_edge_walk.c | 9 +++---
> tests/kms_flip.c | 1 +
> tests/kms_flip_event_leak.c | 2 +-
> tests/kms_force_connector_basic.c | 4 +--
> tests/kms_hdmi_inject.c | 14 +++++----
> tests/kms_mmap_write_crc.c | 8 ++---
> tests/kms_pwrite_crc.c | 8 ++---
> tests/kms_tv_load_detect.c | 2 +-
> tests/kms_universal_plane.c | 10 ++++--
> tests/meson.build | 34 ++++++++++-----------
> 29 files changed, 58 insertions(+), 56 deletions(-)
> rename tests/{ => i915}/kms_big_fb.c (100%)
> rename tests/{ => i915}/kms_busy.c (100%)
> rename tests/{ => i915}/kms_ccs.c (100%)
> rename tests/{ => i915}/kms_cdclk.c (100%)
> rename tests/{ => i915}/kms_draw_crc.c (100%)
> rename tests/{ => i915}/kms_dsc.c (95%)
> rename tests/{ => i915}/kms_fbcon_fbt.c (100%)
> rename tests/{ => i915}/kms_fence_pin_leak.c (100%)
> rename tests/{ => i915}/kms_flip_scaled_crc.c (100%)
> rename tests/{ => i915}/kms_flip_tiling.c (100%)
> rename tests/{ => i915}/kms_frontbuffer_tracking.c (100%)
> rename tests/{ => i915}/kms_invalid_dotclock.c (100%)
> rename tests/{ => i915}/kms_legacy_colorkey.c (100%)
> rename tests/{ => i915}/kms_pipe_b_c_ivb.c (100%)
> rename tests/{ => i915}/kms_psr.c (100%)
> rename tests/{ => i915}/kms_psr2_sf.c (100%)
> rename tests/{ => i915}/kms_psr2_su.c (100%)
>
> diff --git a/tests/kms_big_fb.c b/tests/i915/kms_big_fb.c
> similarity index 100%
> rename from tests/kms_big_fb.c
> rename to tests/i915/kms_big_fb.c
> diff --git a/tests/kms_busy.c b/tests/i915/kms_busy.c
> similarity index 100%
> rename from tests/kms_busy.c
> rename to tests/i915/kms_busy.c
> diff --git a/tests/kms_ccs.c b/tests/i915/kms_ccs.c
> similarity index 100%
> rename from tests/kms_ccs.c
> rename to tests/i915/kms_ccs.c
> diff --git a/tests/kms_cdclk.c b/tests/i915/kms_cdclk.c
> similarity index 100%
> rename from tests/kms_cdclk.c
> rename to tests/i915/kms_cdclk.c
> diff --git a/tests/kms_draw_crc.c b/tests/i915/kms_draw_crc.c
> similarity index 100%
> rename from tests/kms_draw_crc.c
> rename to tests/i915/kms_draw_crc.c
> diff --git a/tests/kms_dsc.c b/tests/i915/kms_dsc.c
> similarity index 95%
> rename from tests/kms_dsc.c
> rename to tests/i915/kms_dsc.c
> index b56e01837..3e450207f 100644
> --- a/tests/kms_dsc.c
> +++ b/tests/i915/kms_dsc.c
> @@ -244,14 +244,12 @@ static void run_test(data_t *data, enum dsc_test_type test_type)
> &data->fb_test_pattern);
>
> for_each_pipe(&data->display, pipe) {
> - if (is_i915_device(data->drm_fd)) {
> - uint32_t devid = intel_get_drm_devid(data->drm_fd);
> + uint32_t devid = intel_get_drm_devid(data->drm_fd);
>
> - if (data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
> - pipe == PIPE_A && IS_GEN11(devid)) {
> - igt_debug("DSC not supported on Pipe A on external DP in Gen11 platforms\n");
> - continue;
> - }
> + if (data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
> + pipe == PIPE_A && IS_GEN11(devid)) {
> + igt_debug("DSC not supported on Pipe A on external DP in Gen11 platforms\n");
> + continue;
> }
>
> snprintf(test_name, sizeof(test_name), "-%dbpp", data->compression_bpp);
> @@ -279,8 +277,7 @@ igt_main
> drmModeConnector *connector = NULL;
> int i, j;
> igt_fixture {
> - data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> - igt_require_intel(data.drm_fd);
> + data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> data.devid = intel_get_drm_devid(data.drm_fd);
> kmstest_set_vt_graphics_mode();
> igt_install_exit_handler(kms_dsc_exit_handler);
> diff --git a/tests/kms_fbcon_fbt.c b/tests/i915/kms_fbcon_fbt.c
> similarity index 100%
> rename from tests/kms_fbcon_fbt.c
> rename to tests/i915/kms_fbcon_fbt.c
> diff --git a/tests/kms_fence_pin_leak.c b/tests/i915/kms_fence_pin_leak.c
> similarity index 100%
> rename from tests/kms_fence_pin_leak.c
> rename to tests/i915/kms_fence_pin_leak.c
> diff --git a/tests/kms_flip_scaled_crc.c b/tests/i915/kms_flip_scaled_crc.c
> similarity index 100%
> rename from tests/kms_flip_scaled_crc.c
> rename to tests/i915/kms_flip_scaled_crc.c
> diff --git a/tests/kms_flip_tiling.c b/tests/i915/kms_flip_tiling.c
> similarity index 100%
> rename from tests/kms_flip_tiling.c
> rename to tests/i915/kms_flip_tiling.c
> diff --git a/tests/kms_frontbuffer_tracking.c b/tests/i915/kms_frontbuffer_tracking.c
> similarity index 100%
> rename from tests/kms_frontbuffer_tracking.c
> rename to tests/i915/kms_frontbuffer_tracking.c
> diff --git a/tests/kms_invalid_dotclock.c b/tests/i915/kms_invalid_dotclock.c
> similarity index 100%
> rename from tests/kms_invalid_dotclock.c
> rename to tests/i915/kms_invalid_dotclock.c
> diff --git a/tests/kms_legacy_colorkey.c b/tests/i915/kms_legacy_colorkey.c
> similarity index 100%
> rename from tests/kms_legacy_colorkey.c
> rename to tests/i915/kms_legacy_colorkey.c
> diff --git a/tests/kms_pipe_b_c_ivb.c b/tests/i915/kms_pipe_b_c_ivb.c
> similarity index 100%
> rename from tests/kms_pipe_b_c_ivb.c
> rename to tests/i915/kms_pipe_b_c_ivb.c
> diff --git a/tests/kms_psr.c b/tests/i915/kms_psr.c
> similarity index 100%
> rename from tests/kms_psr.c
> rename to tests/i915/kms_psr.c
> diff --git a/tests/kms_psr2_sf.c b/tests/i915/kms_psr2_sf.c
> similarity index 100%
> rename from tests/kms_psr2_sf.c
> rename to tests/i915/kms_psr2_sf.c
> diff --git a/tests/kms_psr2_su.c b/tests/i915/kms_psr2_su.c
> similarity index 100%
> rename from tests/kms_psr2_su.c
> rename to tests/i915/kms_psr2_su.c
> diff --git a/tests/kms_3d.c b/tests/kms_3d.c
> index 2e438b430..c29d1d57c 100644
> --- a/tests/kms_3d.c
> +++ b/tests/kms_3d.c
> @@ -34,7 +34,7 @@ igt_simple_main
> const struct edid *edid;
> int mode_count, connector_id;
>
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> res = drmModeGetResources(drm_fd);
> igt_require(res);
> @@ -44,7 +44,8 @@ igt_simple_main
> /* find an hdmi connector */
> for (int i = 0; i < res->count_connectors; i++) {
> connector = drmModeGetConnectorCurrent(drm_fd, res->connectors[i]);
> - if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)
> + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
> + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
> break;
> drmModeFreeConnector(connector);
> connector = NULL;
> diff --git a/tests/kms_big_joiner.c b/tests/kms_big_joiner.c
> index 4f1f3152e..45c5b2a2a 100644
> --- a/tests/kms_big_joiner.c
> +++ b/tests/kms_big_joiner.c
> @@ -258,7 +258,7 @@ igt_main
> uint16_t width = 0, height = 0;
>
> igt_fixture {
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> kmstest_set_vt_graphics_mode();
>
> igt_display_require(&data.display, data.drm_fd);
> diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
> index e9902f5e7..66781eec6 100644
> --- a/tests/kms_cursor_edge_walk.c
> +++ b/tests/kms_cursor_edge_walk.c
> @@ -94,8 +94,8 @@ static void cursor_move(data_t *data, int x, int y, int i)
> * fails). So let's accept a failure from the ioctl in that case.
> */
> igt_assert(drmModeMoveCursor(data->drm_fd, crtc_id, x, y) == 0 ||
> - (IS_CHERRYVIEW(data->devid) && data->pipe == PIPE_C &&
> - x < 0 && x > -data->curw));
> + (data->devid && IS_CHERRYVIEW(data->devid) &&
> + data->pipe == PIPE_C && x < 0 && x > -data->curw));
> igt_wait_for_vblank(data->drm_fd,
> display->pipes[data->pipe].crtc_offset);
> }
> @@ -312,9 +312,10 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
> igt_fixture {
> int ret;
>
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> - data.devid = intel_get_drm_devid(data.drm_fd);
> + if (is_i915_device(data.drm_fd))
> + data.devid = intel_get_drm_devid(data.drm_fd);
>
> ret = drmGetCap(data.drm_fd, DRM_CAP_CURSOR_WIDTH, &max_curw);
> igt_assert(ret == 0 || errno == EINVAL);
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> index b4836a44d..541378712 100755
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -778,6 +778,7 @@ static bool run_test_step(struct test_output *o, unsigned int *events)
>
> memset(&hang, 0, sizeof(hang));
> if (do_flip && (o->flags & TEST_HANG)) {
> + igt_require_intel(drm_fd);
> ahnd = get_reloc_ahnd(drm_fd, 0);
> hang = hang_gpu(drm_fd, ahnd);
> }
> diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
> index 09c871911..97be91907 100644
> --- a/tests/kms_flip_event_leak.c
> +++ b/tests/kms_flip_event_leak.c
> @@ -83,7 +83,7 @@ static void test(data_t *data, enum pipe pipe, igt_output_t *output)
> igt_device_set_master(data->drm_fd);
>
> igt_plane_set_fb(primary, NULL);
> - igt_output_set_pipe(output, PIPE_ANY);
> + igt_output_set_pipe(output, PIPE_NONE);
> igt_display_commit(&data->display);
>
> igt_remove_fb(data->drm_fd, &fb[0]);
> diff --git a/tests/kms_force_connector_basic.c b/tests/kms_force_connector_basic.c
> index 3b0146fe9..683d36720 100644
> --- a/tests/kms_force_connector_basic.c
> +++ b/tests/kms_force_connector_basic.c
> @@ -37,7 +37,7 @@ static void reset_connectors(void)
> drmModeRes *res;
> drmModeConnector *connector = NULL;
>
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
> res = drmModeGetResources(drm_fd);
>
> for (int i = 0; i < res->count_connectors; i++) {
> @@ -86,7 +86,7 @@ igt_main_args("", long_opts, help_str, opt_handler, NULL)
> igt_fixture {
> unsigned connector_id = 0;
>
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> res = drmModeGetResources(drm_fd);
> igt_require(res);
> diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c
> index ad2dde569..13a05eb1e 100644
> --- a/tests/kms_hdmi_inject.c
> +++ b/tests/kms_hdmi_inject.c
> @@ -63,7 +63,8 @@ get_connector(int drm_fd, drmModeRes *res)
> connector =
> drmModeGetConnectorCurrent(drm_fd, res->connectors[i]);
>
> - if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)
> + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
> + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
> break;
>
> drmModeFreeConnector(connector);
> @@ -82,12 +83,13 @@ hdmi_inject_4k(int drm_fd, drmModeConnector *connector)
> int fb_id;
> struct igt_fb fb;
> uint8_t found_4k_mode = 0;
> - uint32_t devid;
>
> - devid = intel_get_drm_devid(drm_fd);
> + if (is_i915_device(drm_fd)) {
> + uint32_t devid = intel_get_drm_devid(drm_fd);
>
> - /* 4K requires at least HSW */
> - igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
> + /* 4K requires at least HSW */
> + igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
> + }
>
> edid = igt_kms_get_4k_edid();
> kmstest_force_edid(drm_fd, connector, edid);
> @@ -195,7 +197,7 @@ igt_main
> drmModeConnector *connector;
>
> igt_fixture {
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> res = drmModeGetResources(drm_fd);
> igt_require(res);
> diff --git a/tests/kms_mmap_write_crc.c b/tests/kms_mmap_write_crc.c
> index 2e323a209..0c697c246 100644
> --- a/tests/kms_mmap_write_crc.c
> +++ b/tests/kms_mmap_write_crc.c
> @@ -51,7 +51,6 @@ typedef struct {
> enum pipe pipe;
> igt_crc_t ref_crc;
> igt_pipe_crc_t *pipe_crc;
> - uint32_t devid;
> } data_t;
>
> static int ioctl_sync = true;
> @@ -103,6 +102,7 @@ static void test(data_t *data)
> igt_display_commit(display);
>
> /* make sure caching mode has become UC/WT */
> + igt_require_intel(data->drm_fd);
> caching = gem_get_caching(data->drm_fd, fb->gem_handle);
> igt_assert(caching == I915_CACHING_NONE || caching == I915_CACHING_DISPLAY);
>
> @@ -204,7 +204,7 @@ static void cleanup_crtc(data_t *data)
>
> igt_plane_set_fb(data->primary, NULL);
>
> - igt_output_set_pipe(output, PIPE_ANY);
> + igt_output_set_pipe(output, PIPE_NONE);
> igt_display_commit(display);
>
> igt_remove_fb(data->drm_fd, &data->fb[0]);
> @@ -272,9 +272,7 @@ igt_main_args("n", NULL, NULL, opt_handler, NULL)
> int i;
>
> igt_fixture {
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> -
> - data.devid = intel_get_drm_devid(data.drm_fd);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> kmstest_set_vt_graphics_mode();
>
> diff --git a/tests/kms_pwrite_crc.c b/tests/kms_pwrite_crc.c
> index dc32a070c..a1642df6f 100644
> --- a/tests/kms_pwrite_crc.c
> +++ b/tests/kms_pwrite_crc.c
> @@ -42,7 +42,6 @@ typedef struct {
> enum pipe pipe;
> igt_crc_t ref_crc;
> igt_pipe_crc_t *pipe_crc;
> - uint32_t devid;
> } data_t;
>
> static void test(data_t *data)
> @@ -77,6 +76,7 @@ static void test(data_t *data)
> 0, 0, fb->width << 16, fb->height << 16);
>
> /* make sure caching mode has become UC/WT */
> + igt_require_intel(data->drm_fd);
> caching = gem_get_caching(data->drm_fd, fb->gem_handle);
> igt_assert(caching == I915_CACHING_NONE || caching == I915_CACHING_DISPLAY);
>
> @@ -141,7 +141,7 @@ static void cleanup_crtc(data_t *data)
>
> igt_plane_set_fb(data->primary, NULL);
>
> - igt_output_set_pipe(output, PIPE_ANY);
> + igt_output_set_pipe(output, PIPE_NONE);
> igt_display_commit(display);
>
> igt_remove_fb(data->drm_fd, &data->fb[0]);
> @@ -174,9 +174,7 @@ static data_t data;
>
> igt_simple_main
> {
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> -
> - data.devid = intel_get_drm_devid(data.drm_fd);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> kmstest_set_vt_graphics_mode();
>
> diff --git a/tests/kms_tv_load_detect.c b/tests/kms_tv_load_detect.c
> index caac3aecb..80ced9918 100644
> --- a/tests/kms_tv_load_detect.c
> +++ b/tests/kms_tv_load_detect.c
> @@ -34,7 +34,7 @@ igt_main
> drmModeConnector *tv_connector = NULL, *temp;
>
> igt_fixture {
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> res = drmModeGetResources(drm_fd);
> igt_require(res);
> diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
> index c9a9cd47a..ea9bd9a56 100644
> --- a/tests/kms_universal_plane.c
> +++ b/tests/kms_universal_plane.c
> @@ -107,7 +107,7 @@ functional_test_fini(functional_test_t *test, igt_output_t *output)
> igt_remove_fb(test->data->drm_fd, &test->red_fb);
> igt_remove_fb(test->data->drm_fd, &test->yellow_fb);
>
> - igt_output_set_pipe(output, PIPE_ANY);
> + igt_output_set_pipe(output, PIPE_NONE);
> igt_display_commit2(&test->data->display, COMMIT_LEGACY);
> }
>
> @@ -382,6 +382,7 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
> * doesn't cover CRTC (should fail on pre-gen9 and succeed on
> * gen9+).
> */
> + igt_require_intel(data->drm_fd);
> igt_plane_set_fb(primary, &test.undersized_fb);
> expect = (data->display_ver < 9) ? -EINVAL : 0;
> igt_assert(igt_display_try_commit2(&data->display, COMMIT_UNIVERSAL) == expect);
> @@ -579,6 +580,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>
> igt_require_pipe(display, pipe);
> igt_require(display->has_cursor_plane);
> + igt_require_intel(data->drm_fd);
>
> igt_output_set_pipe(output, pipe);
> mode = igt_output_get_mode(output);
> @@ -704,6 +706,7 @@ gen9_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>
> int ret = 0;
>
> + igt_require_intel(data->drm_fd);
> igt_skip_on(data->display_ver < 9);
> igt_require_pipe(&data->display, pipe);
>
> @@ -797,8 +800,9 @@ igt_main
> enum pipe pipe;
>
> igt_fixture {
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> - data.display_ver = intel_display_ver(intel_get_drm_devid(data.drm_fd));
> + 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();
>
> diff --git a/tests/meson.build b/tests/meson.build
> index 1bdfddbb2..8ca78fa0c 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -19,11 +19,7 @@ test_progs = [
> 'kms_atomic',
> 'kms_atomic_interruptible',
> 'kms_atomic_transition',
> - 'kms_big_fb',
> 'kms_big_joiner' ,
> - 'kms_busy',
> - 'kms_ccs',
> - 'kms_cdclk',
> 'kms_concurrent',
> 'kms_content_protection',
> 'kms_cursor_crc',
> @@ -32,26 +28,16 @@ test_progs = [
> 'kms_dither',
> 'kms_dp_aux_dev',
> 'kms_dp_tiled_display',
> - 'kms_draw_crc',
> - 'kms_dsc',
> - 'kms_fbcon_fbt',
> - 'kms_fence_pin_leak',
> 'kms_flip',
> 'kms_flip_event_leak',
> - 'kms_flip_scaled_crc',
> - 'kms_flip_tiling',
> 'kms_force_connector_basic',
> - 'kms_frontbuffer_tracking',
> 'kms_getfb',
> 'kms_hdmi_inject',
> 'kms_hdr',
> - 'kms_invalid_dotclock',
> 'kms_lease',
> - 'kms_legacy_colorkey',
> 'kms_mmap_write_crc',
> 'kms_multipipe_modeset',
> 'kms_panel_fitting',
> - 'kms_pipe_b_c_ivb',
> 'kms_pipe_crc_basic',
> 'kms_plane',
> 'kms_plane_alpha_blend',
> @@ -62,9 +48,6 @@ test_progs = [
> 'kms_prime',
> 'kms_prop_blob',
> 'kms_properties',
> - 'kms_psr',
> - 'kms_psr2_su',
> - 'kms_psr2_sf',
> 'kms_pwrite_crc',
> 'kms_rmfb',
> 'kms_rotation_crc',
> @@ -235,6 +218,23 @@ i915_progs = [
> 'i915_query',
> 'i915_selftest',
> 'i915_suspend',
> + 'kms_big_fb',
> + 'kms_busy',
> + 'kms_ccs',
> + 'kms_cdclk',
> + 'kms_draw_crc',
> + 'kms_dsc',
> + 'kms_fbcon_fbt',
> + 'kms_fence_pin_leak',
> + 'kms_flip_scaled_crc',
> + 'kms_flip_tiling',
> + 'kms_frontbuffer_tracking',
> + 'kms_invalid_dotclock',
> + 'kms_legacy_colorkey',
> + 'kms_pipe_b_c_ivb',
> + 'kms_psr',
> + 'kms_psr2_su',
> + 'kms_psr2_sf',
> 'sysfs_clients',
> 'sysfs_defaults',
> 'sysfs_heartbeat_interval',
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory
2021-08-11 7:02 [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory Bhanuprakash Modem
` (2 preceding siblings ...)
2021-09-01 18:38 ` [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory Mark Yacoub
@ 2021-09-03 5:31 ` Karthik B S
2021-09-10 18:40 ` Mark Yacoub
2021-09-12 15:54 ` Modem, Bhanuprakash
2021-09-13 13:06 ` Rodrigo Siqueira
4 siblings, 2 replies; 8+ messages in thread
From: Karthik B S @ 2021-09-03 5:31 UTC (permalink / raw)
To: Bhanuprakash Modem, igt-dev, Navare, Manasi
Cc: Mark Yacoub, Petri Latvala, Vidya Srinivas
On 8/11/2021 12:32 PM, Bhanuprakash Modem wrote:
> As KMS tests on IGT are officially supported on multiple SoCs
> and there is an active development on it. So, KMS tests are
> meant to be generic and if we need to test few things specific
> to Intel, so we can use igt_require_intel(). But if the whole
> test is Intel specific, then the best place for the test would
> be tests/i915.
>
> This patch will move all Intel specific kms tests to tests/i915
> directory. And update the tests those are generic but still open
> the driver as 'drm_open_driver_master(DRIVER_INTEL);'. This patch
> will also do some minor cleanups.
>
> V2:
> * Few more tests
>
> Cc: Mark Yacoub <markyacoub@chromium.org>
> Cc: Petri Latvala <petri.latvala@intel.com>
> Cc: Vidya Srinivas <vidya.srinivas@intel.com>
> Cc: Karthik B S <karthik.b.s@intel.com>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> ---
> tests/{ => i915}/kms_big_fb.c | 0
> tests/{ => i915}/kms_busy.c | 0
> tests/{ => i915}/kms_ccs.c | 0
> tests/{ => i915}/kms_cdclk.c | 0
> tests/{ => i915}/kms_draw_crc.c | 0
> tests/{ => i915}/kms_dsc.c | 15 ++++-----
> tests/{ => i915}/kms_fbcon_fbt.c | 0
> tests/{ => i915}/kms_fence_pin_leak.c | 0
> tests/{ => i915}/kms_flip_scaled_crc.c | 0
> tests/{ => i915}/kms_flip_tiling.c | 0
> tests/{ => i915}/kms_frontbuffer_tracking.c | 0
> tests/{ => i915}/kms_invalid_dotclock.c | 0
> tests/{ => i915}/kms_legacy_colorkey.c | 0
> tests/{ => i915}/kms_pipe_b_c_ivb.c | 0
> tests/{ => i915}/kms_psr.c | 0
> tests/{ => i915}/kms_psr2_sf.c | 0
> tests/{ => i915}/kms_psr2_su.c | 0
> tests/kms_3d.c | 5 +--
> tests/kms_big_joiner.c | 2 +-
> tests/kms_cursor_edge_walk.c | 9 +++---
> tests/kms_flip.c | 1 +
> tests/kms_flip_event_leak.c | 2 +-
> tests/kms_force_connector_basic.c | 4 +--
> tests/kms_hdmi_inject.c | 14 +++++----
> tests/kms_mmap_write_crc.c | 8 ++---
> tests/kms_pwrite_crc.c | 8 ++---
> tests/kms_tv_load_detect.c | 2 +-
> tests/kms_universal_plane.c | 10 ++++--
> tests/meson.build | 34 ++++++++++-----------
> 29 files changed, 58 insertions(+), 56 deletions(-)
> rename tests/{ => i915}/kms_big_fb.c (100%)
> rename tests/{ => i915}/kms_busy.c (100%)
> rename tests/{ => i915}/kms_ccs.c (100%)
> rename tests/{ => i915}/kms_cdclk.c (100%)
> rename tests/{ => i915}/kms_draw_crc.c (100%)
> rename tests/{ => i915}/kms_dsc.c (95%)
> rename tests/{ => i915}/kms_fbcon_fbt.c (100%)
> rename tests/{ => i915}/kms_fence_pin_leak.c (100%)
> rename tests/{ => i915}/kms_flip_scaled_crc.c (100%)
> rename tests/{ => i915}/kms_flip_tiling.c (100%)
> rename tests/{ => i915}/kms_frontbuffer_tracking.c (100%)
> rename tests/{ => i915}/kms_invalid_dotclock.c (100%)
> rename tests/{ => i915}/kms_legacy_colorkey.c (100%)
> rename tests/{ => i915}/kms_pipe_b_c_ivb.c (100%)
> rename tests/{ => i915}/kms_psr.c (100%)
> rename tests/{ => i915}/kms_psr2_sf.c (100%)
> rename tests/{ => i915}/kms_psr2_su.c (100%)
>
> diff --git a/tests/kms_big_fb.c b/tests/i915/kms_big_fb.c
> similarity index 100%
> rename from tests/kms_big_fb.c
> rename to tests/i915/kms_big_fb.c
> diff --git a/tests/kms_busy.c b/tests/i915/kms_busy.c
> similarity index 100%
> rename from tests/kms_busy.c
> rename to tests/i915/kms_busy.c
> diff --git a/tests/kms_ccs.c b/tests/i915/kms_ccs.c
> similarity index 100%
> rename from tests/kms_ccs.c
> rename to tests/i915/kms_ccs.c
> diff --git a/tests/kms_cdclk.c b/tests/i915/kms_cdclk.c
> similarity index 100%
> rename from tests/kms_cdclk.c
> rename to tests/i915/kms_cdclk.c
> diff --git a/tests/kms_draw_crc.c b/tests/i915/kms_draw_crc.c
> similarity index 100%
> rename from tests/kms_draw_crc.c
> rename to tests/i915/kms_draw_crc.c
> diff --git a/tests/kms_dsc.c b/tests/i915/kms_dsc.c
> similarity index 95%
> rename from tests/kms_dsc.c
> rename to tests/i915/kms_dsc.c
> index b56e01837..3e450207f 100644
> --- a/tests/kms_dsc.c
> +++ b/tests/i915/kms_dsc.c
> @@ -244,14 +244,12 @@ static void run_test(data_t *data, enum dsc_test_type test_type)
> &data->fb_test_pattern);
>
> for_each_pipe(&data->display, pipe) {
> - if (is_i915_device(data->drm_fd)) {
> - uint32_t devid = intel_get_drm_devid(data->drm_fd);
> + uint32_t devid = intel_get_drm_devid(data->drm_fd);
>
> - if (data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
> - pipe == PIPE_A && IS_GEN11(devid)) {
> - igt_debug("DSC not supported on Pipe A on external DP in Gen11 platforms\n");
> - continue;
> - }
> + if (data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
> + pipe == PIPE_A && IS_GEN11(devid)) {
> + igt_debug("DSC not supported on Pipe A on external DP in Gen11 platforms\n");
> + continue;
> }
>
> snprintf(test_name, sizeof(test_name), "-%dbpp", data->compression_bpp);
> @@ -279,8 +277,7 @@ igt_main
> drmModeConnector *connector = NULL;
> int i, j;
> igt_fixture {
> - data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> - igt_require_intel(data.drm_fd);
> + data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> data.devid = intel_get_drm_devid(data.drm_fd);
> kmstest_set_vt_graphics_mode();
> igt_install_exit_handler(kms_dsc_exit_handler);
> diff --git a/tests/kms_fbcon_fbt.c b/tests/i915/kms_fbcon_fbt.c
> similarity index 100%
> rename from tests/kms_fbcon_fbt.c
> rename to tests/i915/kms_fbcon_fbt.c
> diff --git a/tests/kms_fence_pin_leak.c b/tests/i915/kms_fence_pin_leak.c
> similarity index 100%
> rename from tests/kms_fence_pin_leak.c
> rename to tests/i915/kms_fence_pin_leak.c
> diff --git a/tests/kms_flip_scaled_crc.c b/tests/i915/kms_flip_scaled_crc.c
> similarity index 100%
> rename from tests/kms_flip_scaled_crc.c
> rename to tests/i915/kms_flip_scaled_crc.c
> diff --git a/tests/kms_flip_tiling.c b/tests/i915/kms_flip_tiling.c
> similarity index 100%
> rename from tests/kms_flip_tiling.c
> rename to tests/i915/kms_flip_tiling.c
> diff --git a/tests/kms_frontbuffer_tracking.c b/tests/i915/kms_frontbuffer_tracking.c
> similarity index 100%
> rename from tests/kms_frontbuffer_tracking.c
> rename to tests/i915/kms_frontbuffer_tracking.c
> diff --git a/tests/kms_invalid_dotclock.c b/tests/i915/kms_invalid_dotclock.c
> similarity index 100%
> rename from tests/kms_invalid_dotclock.c
> rename to tests/i915/kms_invalid_dotclock.c
> diff --git a/tests/kms_legacy_colorkey.c b/tests/i915/kms_legacy_colorkey.c
> similarity index 100%
> rename from tests/kms_legacy_colorkey.c
> rename to tests/i915/kms_legacy_colorkey.c
> diff --git a/tests/kms_pipe_b_c_ivb.c b/tests/i915/kms_pipe_b_c_ivb.c
> similarity index 100%
> rename from tests/kms_pipe_b_c_ivb.c
> rename to tests/i915/kms_pipe_b_c_ivb.c
> diff --git a/tests/kms_psr.c b/tests/i915/kms_psr.c
> similarity index 100%
> rename from tests/kms_psr.c
> rename to tests/i915/kms_psr.c
> diff --git a/tests/kms_psr2_sf.c b/tests/i915/kms_psr2_sf.c
> similarity index 100%
> rename from tests/kms_psr2_sf.c
> rename to tests/i915/kms_psr2_sf.c
> diff --git a/tests/kms_psr2_su.c b/tests/i915/kms_psr2_su.c
> similarity index 100%
> rename from tests/kms_psr2_su.c
> rename to tests/i915/kms_psr2_su.c
> diff --git a/tests/kms_3d.c b/tests/kms_3d.c
> index 2e438b430..c29d1d57c 100644
> --- a/tests/kms_3d.c
> +++ b/tests/kms_3d.c
> @@ -34,7 +34,7 @@ igt_simple_main
> const struct edid *edid;
> int mode_count, connector_id;
>
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> res = drmModeGetResources(drm_fd);
> igt_require(res);
> @@ -44,7 +44,8 @@ igt_simple_main
> /* find an hdmi connector */
> for (int i = 0; i < res->count_connectors; i++) {
> connector = drmModeGetConnectorCurrent(drm_fd, res->connectors[i]);
> - if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)
> + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
> + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
Hi,
Please move the clean up parts to an individual patch.
> break;
> drmModeFreeConnector(connector);
> connector = NULL;
> diff --git a/tests/kms_big_joiner.c b/tests/kms_big_joiner.c
> index 4f1f3152e..45c5b2a2a 100644
> --- a/tests/kms_big_joiner.c
> +++ b/tests/kms_big_joiner.c
> @@ -258,7 +258,7 @@ igt_main
> uint16_t width = 0, height = 0;
>
> igt_fixture {
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
I'm not sure if this test is valid for other drivers. Could you please
check this.
Manasi: Could you please provide your inputs here.
> kmstest_set_vt_graphics_mode();
>
> igt_display_require(&data.display, data.drm_fd);
> diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
> index e9902f5e7..66781eec6 100644
> --- a/tests/kms_cursor_edge_walk.c
> +++ b/tests/kms_cursor_edge_walk.c
> @@ -94,8 +94,8 @@ static void cursor_move(data_t *data, int x, int y, int i)
> * fails). So let's accept a failure from the ioctl in that case.
> */
> igt_assert(drmModeMoveCursor(data->drm_fd, crtc_id, x, y) == 0 ||
> - (IS_CHERRYVIEW(data->devid) && data->pipe == PIPE_C &&
> - x < 0 && x > -data->curw));
> + (data->devid && IS_CHERRYVIEW(data->devid) &&
Could we combine this check into one? may be populate a flag in fixture
and use it throughout the test?
> + data->pipe == PIPE_C && x < 0 && x > -data->curw));
> igt_wait_for_vblank(data->drm_fd,
> display->pipes[data->pipe].crtc_offset);
> }
> @@ -312,9 +312,10 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
> igt_fixture {
> int ret;
>
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> - data.devid = intel_get_drm_devid(data.drm_fd);
> + if (is_i915_device(data.drm_fd))
> + data.devid = intel_get_drm_devid(data.drm_fd);
>
> ret = drmGetCap(data.drm_fd, DRM_CAP_CURSOR_WIDTH, &max_curw);
> igt_assert(ret == 0 || errno == EINVAL);
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> index b4836a44d..541378712 100755
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -778,6 +778,7 @@ static bool run_test_step(struct test_output *o, unsigned int *events)
>
> memset(&hang, 0, sizeof(hang));
> if (do_flip && (o->flags & TEST_HANG)) {
> + igt_require_intel(drm_fd);
Doesn't this make the test i915 specific? Or is it that only a few of
the subtests use this?
> ahnd = get_reloc_ahnd(drm_fd, 0);
> hang = hang_gpu(drm_fd, ahnd);
> }
> diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
> index 09c871911..97be91907 100644
> --- a/tests/kms_flip_event_leak.c
> +++ b/tests/kms_flip_event_leak.c
> @@ -83,7 +83,7 @@ static void test(data_t *data, enum pipe pipe, igt_output_t *output)
> igt_device_set_master(data->drm_fd);
>
> igt_plane_set_fb(primary, NULL);
> - igt_output_set_pipe(output, PIPE_ANY);
> + igt_output_set_pipe(output, PIPE_NONE);
Please move the clean up parts to an individual patch.
> igt_display_commit(&data->display);
>
> igt_remove_fb(data->drm_fd, &fb[0]);
> diff --git a/tests/kms_force_connector_basic.c b/tests/kms_force_connector_basic.c
> index 3b0146fe9..683d36720 100644
> --- a/tests/kms_force_connector_basic.c
> +++ b/tests/kms_force_connector_basic.c
> @@ -37,7 +37,7 @@ static void reset_connectors(void)
> drmModeRes *res;
> drmModeConnector *connector = NULL;
>
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
> res = drmModeGetResources(drm_fd);
>
> for (int i = 0; i < res->count_connectors; i++) {
> @@ -86,7 +86,7 @@ igt_main_args("", long_opts, help_str, opt_handler, NULL)
> igt_fixture {
> unsigned connector_id = 0;
>
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> res = drmModeGetResources(drm_fd);
> igt_require(res);
> diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c
> index ad2dde569..13a05eb1e 100644
> --- a/tests/kms_hdmi_inject.c
> +++ b/tests/kms_hdmi_inject.c
> @@ -63,7 +63,8 @@ get_connector(int drm_fd, drmModeRes *res)
> connector =
> drmModeGetConnectorCurrent(drm_fd, res->connectors[i]);
>
> - if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)
> + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
> + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
Same as above.
> break;
>
> drmModeFreeConnector(connector);
> @@ -82,12 +83,13 @@ hdmi_inject_4k(int drm_fd, drmModeConnector *connector)
> int fb_id;
> struct igt_fb fb;
> uint8_t found_4k_mode = 0;
> - uint32_t devid;
>
> - devid = intel_get_drm_devid(drm_fd);
> + if (is_i915_device(drm_fd)) {
> + uint32_t devid = intel_get_drm_devid(drm_fd);
>
> - /* 4K requires at least HSW */
> - igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
> + /* 4K requires at least HSW */
> + igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
> + }
>
> edid = igt_kms_get_4k_edid();
> kmstest_force_edid(drm_fd, connector, edid);
> @@ -195,7 +197,7 @@ igt_main
> drmModeConnector *connector;
>
> igt_fixture {
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> res = drmModeGetResources(drm_fd);
> igt_require(res);
> diff --git a/tests/kms_mmap_write_crc.c b/tests/kms_mmap_write_crc.c
> index 2e323a209..0c697c246 100644
> --- a/tests/kms_mmap_write_crc.c
> +++ b/tests/kms_mmap_write_crc.c
> @@ -51,7 +51,6 @@ typedef struct {
> enum pipe pipe;
> igt_crc_t ref_crc;
> igt_pipe_crc_t *pipe_crc;
> - uint32_t devid;
> } data_t;
>
> static int ioctl_sync = true;
> @@ -103,6 +102,7 @@ static void test(data_t *data)
> igt_display_commit(display);
>
> /* make sure caching mode has become UC/WT */
> + igt_require_intel(data->drm_fd);
Doesn't this make it i915 specific?
> caching = gem_get_caching(data->drm_fd, fb->gem_handle);
> igt_assert(caching == I915_CACHING_NONE || caching == I915_CACHING_DISPLAY);
>
> @@ -204,7 +204,7 @@ static void cleanup_crtc(data_t *data)
>
> igt_plane_set_fb(data->primary, NULL);
>
> - igt_output_set_pipe(output, PIPE_ANY);
> + igt_output_set_pipe(output, PIPE_NONE);
Please move this to an individual patch.
> igt_display_commit(display);
>
> igt_remove_fb(data->drm_fd, &data->fb[0]);
> @@ -272,9 +272,7 @@ igt_main_args("n", NULL, NULL, opt_handler, NULL)
> int i;
>
> igt_fixture {
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> -
> - data.devid = intel_get_drm_devid(data.drm_fd);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> kmstest_set_vt_graphics_mode();
>
> diff --git a/tests/kms_pwrite_crc.c b/tests/kms_pwrite_crc.c
> index dc32a070c..a1642df6f 100644
> --- a/tests/kms_pwrite_crc.c
> +++ b/tests/kms_pwrite_crc.c
> @@ -42,7 +42,6 @@ typedef struct {
> enum pipe pipe;
> igt_crc_t ref_crc;
> igt_pipe_crc_t *pipe_crc;
> - uint32_t devid;
> } data_t;
>
> static void test(data_t *data)
> @@ -77,6 +76,7 @@ static void test(data_t *data)
> 0, 0, fb->width << 16, fb->height << 16);
>
> /* make sure caching mode has become UC/WT */
> + igt_require_intel(data->drm_fd);
Doesn't this make it i915 specific?
> caching = gem_get_caching(data->drm_fd, fb->gem_handle);
> igt_assert(caching == I915_CACHING_NONE || caching == I915_CACHING_DISPLAY);
>
> @@ -141,7 +141,7 @@ static void cleanup_crtc(data_t *data)
>
> igt_plane_set_fb(data->primary, NULL);
>
> - igt_output_set_pipe(output, PIPE_ANY);
> + igt_output_set_pipe(output, PIPE_NONE);
Please move this to an individual patch.
> igt_display_commit(display);
>
> igt_remove_fb(data->drm_fd, &data->fb[0]);
> @@ -174,9 +174,7 @@ static data_t data;
>
> igt_simple_main
> {
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> -
> - data.devid = intel_get_drm_devid(data.drm_fd);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> kmstest_set_vt_graphics_mode();
>
> diff --git a/tests/kms_tv_load_detect.c b/tests/kms_tv_load_detect.c
> index caac3aecb..80ced9918 100644
> --- a/tests/kms_tv_load_detect.c
> +++ b/tests/kms_tv_load_detect.c
> @@ -34,7 +34,7 @@ igt_main
> drmModeConnector *tv_connector = NULL, *temp;
>
> igt_fixture {
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> res = drmModeGetResources(drm_fd);
> igt_require(res);
> diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
> index c9a9cd47a..ea9bd9a56 100644
> --- a/tests/kms_universal_plane.c
> +++ b/tests/kms_universal_plane.c
> @@ -107,7 +107,7 @@ functional_test_fini(functional_test_t *test, igt_output_t *output)
> igt_remove_fb(test->data->drm_fd, &test->red_fb);
> igt_remove_fb(test->data->drm_fd, &test->yellow_fb);
>
> - igt_output_set_pipe(output, PIPE_ANY);
> + igt_output_set_pipe(output, PIPE_NONE);
> igt_display_commit2(&test->data->display, COMMIT_LEGACY);
> }
>
> @@ -382,6 +382,7 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
> * doesn't cover CRTC (should fail on pre-gen9 and succeed on
> * gen9+).
> */
> + igt_require_intel(data->drm_fd);
Doesn't this make it i915 specific?
> igt_plane_set_fb(primary, &test.undersized_fb);
> expect = (data->display_ver < 9) ? -EINVAL : 0;
> igt_assert(igt_display_try_commit2(&data->display, COMMIT_UNIVERSAL) == expect);
> @@ -579,6 +580,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>
> igt_require_pipe(display, pipe);
> igt_require(display->has_cursor_plane);
> + igt_require_intel(data->drm_fd);
Same as above.
>
> igt_output_set_pipe(output, pipe);
> mode = igt_output_get_mode(output);
> @@ -704,6 +706,7 @@ gen9_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>
> int ret = 0;
>
> + igt_require_intel(data->drm_fd);
Same as above.
Thanks,
Karthik.B.S
> igt_skip_on(data->display_ver < 9);
> igt_require_pipe(&data->display, pipe);
>
> @@ -797,8 +800,9 @@ igt_main
> enum pipe pipe;
>
> igt_fixture {
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> - data.display_ver = intel_display_ver(intel_get_drm_devid(data.drm_fd));
> + 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();
>
> diff --git a/tests/meson.build b/tests/meson.build
> index 1bdfddbb2..8ca78fa0c 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -19,11 +19,7 @@ test_progs = [
> 'kms_atomic',
> 'kms_atomic_interruptible',
> 'kms_atomic_transition',
> - 'kms_big_fb',
> 'kms_big_joiner' ,
> - 'kms_busy',
> - 'kms_ccs',
> - 'kms_cdclk',
> 'kms_concurrent',
> 'kms_content_protection',
> 'kms_cursor_crc',
> @@ -32,26 +28,16 @@ test_progs = [
> 'kms_dither',
> 'kms_dp_aux_dev',
> 'kms_dp_tiled_display',
> - 'kms_draw_crc',
> - 'kms_dsc',
> - 'kms_fbcon_fbt',
> - 'kms_fence_pin_leak',
> 'kms_flip',
> 'kms_flip_event_leak',
> - 'kms_flip_scaled_crc',
> - 'kms_flip_tiling',
> 'kms_force_connector_basic',
> - 'kms_frontbuffer_tracking',
> 'kms_getfb',
> 'kms_hdmi_inject',
> 'kms_hdr',
> - 'kms_invalid_dotclock',
> 'kms_lease',
> - 'kms_legacy_colorkey',
> 'kms_mmap_write_crc',
> 'kms_multipipe_modeset',
> 'kms_panel_fitting',
> - 'kms_pipe_b_c_ivb',
> 'kms_pipe_crc_basic',
> 'kms_plane',
> 'kms_plane_alpha_blend',
> @@ -62,9 +48,6 @@ test_progs = [
> 'kms_prime',
> 'kms_prop_blob',
> 'kms_properties',
> - 'kms_psr',
> - 'kms_psr2_su',
> - 'kms_psr2_sf',
> 'kms_pwrite_crc',
> 'kms_rmfb',
> 'kms_rotation_crc',
> @@ -235,6 +218,23 @@ i915_progs = [
> 'i915_query',
> 'i915_selftest',
> 'i915_suspend',
> + 'kms_big_fb',
> + 'kms_busy',
> + 'kms_ccs',
> + 'kms_cdclk',
> + 'kms_draw_crc',
> + 'kms_dsc',
> + 'kms_fbcon_fbt',
> + 'kms_fence_pin_leak',
> + 'kms_flip_scaled_crc',
> + 'kms_flip_tiling',
> + 'kms_frontbuffer_tracking',
> + 'kms_invalid_dotclock',
> + 'kms_legacy_colorkey',
> + 'kms_pipe_b_c_ivb',
> + 'kms_psr',
> + 'kms_psr2_su',
> + 'kms_psr2_sf',
> 'sysfs_clients',
> 'sysfs_defaults',
> 'sysfs_heartbeat_interval',
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory
2021-09-03 5:31 ` Karthik B S
@ 2021-09-10 18:40 ` Mark Yacoub
2021-09-12 15:54 ` Modem, Bhanuprakash
1 sibling, 0 replies; 8+ messages in thread
From: Mark Yacoub @ 2021-09-10 18:40 UTC (permalink / raw)
To: Karthik B S
Cc: Bhanuprakash Modem, Development mailing list for IGT GPU Tools,
Navare, Manasi, Petri Latvala, Vidya Srinivas
Hey - this is sort of a good big change that will make life easy esp
working on all other SoCs; it will unblock our work on the generic KMS
test suite. Can we get this in soon? I'm okay with it as is.
On Fri, Sep 3, 2021 at 1:31 AM Karthik B S <karthik.b.s@intel.com> wrote:
>
> On 8/11/2021 12:32 PM, Bhanuprakash Modem wrote:
> > As KMS tests on IGT are officially supported on multiple SoCs
> > and there is an active development on it. So, KMS tests are
> > meant to be generic and if we need to test few things specific
> > to Intel, so we can use igt_require_intel(). But if the whole
> > test is Intel specific, then the best place for the test would
> > be tests/i915.
> >
> > This patch will move all Intel specific kms tests to tests/i915
> > directory. And update the tests those are generic but still open
> > the driver as 'drm_open_driver_master(DRIVER_INTEL);'. This patch
> > will also do some minor cleanups.
> >
> > V2:
> > * Few more tests
> >
> > Cc: Mark Yacoub <markyacoub@chromium.org>
> > Cc: Petri Latvala <petri.latvala@intel.com>
> > Cc: Vidya Srinivas <vidya.srinivas@intel.com>
> > Cc: Karthik B S <karthik.b.s@intel.com>
Reviewed-by: Mark Yacoub <markyacoub@chromium.org>
> > Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> > ---
> > tests/{ => i915}/kms_big_fb.c | 0
> > tests/{ => i915}/kms_busy.c | 0
> > tests/{ => i915}/kms_ccs.c | 0
> > tests/{ => i915}/kms_cdclk.c | 0
> > tests/{ => i915}/kms_draw_crc.c | 0
> > tests/{ => i915}/kms_dsc.c | 15 ++++-----
> > tests/{ => i915}/kms_fbcon_fbt.c | 0
> > tests/{ => i915}/kms_fence_pin_leak.c | 0
> > tests/{ => i915}/kms_flip_scaled_crc.c | 0
> > tests/{ => i915}/kms_flip_tiling.c | 0
> > tests/{ => i915}/kms_frontbuffer_tracking.c | 0
> > tests/{ => i915}/kms_invalid_dotclock.c | 0
> > tests/{ => i915}/kms_legacy_colorkey.c | 0
> > tests/{ => i915}/kms_pipe_b_c_ivb.c | 0
> > tests/{ => i915}/kms_psr.c | 0
> > tests/{ => i915}/kms_psr2_sf.c | 0
> > tests/{ => i915}/kms_psr2_su.c | 0
> > tests/kms_3d.c | 5 +--
> > tests/kms_big_joiner.c | 2 +-
> > tests/kms_cursor_edge_walk.c | 9 +++---
> > tests/kms_flip.c | 1 +
> > tests/kms_flip_event_leak.c | 2 +-
> > tests/kms_force_connector_basic.c | 4 +--
> > tests/kms_hdmi_inject.c | 14 +++++----
> > tests/kms_mmap_write_crc.c | 8 ++---
> > tests/kms_pwrite_crc.c | 8 ++---
> > tests/kms_tv_load_detect.c | 2 +-
> > tests/kms_universal_plane.c | 10 ++++--
> > tests/meson.build | 34 ++++++++++-----------
> > 29 files changed, 58 insertions(+), 56 deletions(-)
> > rename tests/{ => i915}/kms_big_fb.c (100%)
> > rename tests/{ => i915}/kms_busy.c (100%)
> > rename tests/{ => i915}/kms_ccs.c (100%)
> > rename tests/{ => i915}/kms_cdclk.c (100%)
> > rename tests/{ => i915}/kms_draw_crc.c (100%)
> > rename tests/{ => i915}/kms_dsc.c (95%)
> > rename tests/{ => i915}/kms_fbcon_fbt.c (100%)
> > rename tests/{ => i915}/kms_fence_pin_leak.c (100%)
> > rename tests/{ => i915}/kms_flip_scaled_crc.c (100%)
> > rename tests/{ => i915}/kms_flip_tiling.c (100%)
> > rename tests/{ => i915}/kms_frontbuffer_tracking.c (100%)
> > rename tests/{ => i915}/kms_invalid_dotclock.c (100%)
> > rename tests/{ => i915}/kms_legacy_colorkey.c (100%)
> > rename tests/{ => i915}/kms_pipe_b_c_ivb.c (100%)
> > rename tests/{ => i915}/kms_psr.c (100%)
> > rename tests/{ => i915}/kms_psr2_sf.c (100%)
> > rename tests/{ => i915}/kms_psr2_su.c (100%)
> >
> > diff --git a/tests/kms_big_fb.c b/tests/i915/kms_big_fb.c
> > similarity index 100%
> > rename from tests/kms_big_fb.c
> > rename to tests/i915/kms_big_fb.c
> > diff --git a/tests/kms_busy.c b/tests/i915/kms_busy.c
> > similarity index 100%
> > rename from tests/kms_busy.c
> > rename to tests/i915/kms_busy.c
> > diff --git a/tests/kms_ccs.c b/tests/i915/kms_ccs.c
> > similarity index 100%
> > rename from tests/kms_ccs.c
> > rename to tests/i915/kms_ccs.c
> > diff --git a/tests/kms_cdclk.c b/tests/i915/kms_cdclk.c
> > similarity index 100%
> > rename from tests/kms_cdclk.c
> > rename to tests/i915/kms_cdclk.c
> > diff --git a/tests/kms_draw_crc.c b/tests/i915/kms_draw_crc.c
> > similarity index 100%
> > rename from tests/kms_draw_crc.c
> > rename to tests/i915/kms_draw_crc.c
> > diff --git a/tests/kms_dsc.c b/tests/i915/kms_dsc.c
> > similarity index 95%
> > rename from tests/kms_dsc.c
> > rename to tests/i915/kms_dsc.c
> > index b56e01837..3e450207f 100644
> > --- a/tests/kms_dsc.c
> > +++ b/tests/i915/kms_dsc.c
> > @@ -244,14 +244,12 @@ static void run_test(data_t *data, enum dsc_test_type test_type)
> > &data->fb_test_pattern);
> >
> > for_each_pipe(&data->display, pipe) {
> > - if (is_i915_device(data->drm_fd)) {
> > - uint32_t devid = intel_get_drm_devid(data->drm_fd);
> > + uint32_t devid = intel_get_drm_devid(data->drm_fd);
> >
> > - if (data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
> > - pipe == PIPE_A && IS_GEN11(devid)) {
> > - igt_debug("DSC not supported on Pipe A on external DP in Gen11 platforms\n");
> > - continue;
> > - }
> > + if (data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
> > + pipe == PIPE_A && IS_GEN11(devid)) {
> > + igt_debug("DSC not supported on Pipe A on external DP in Gen11 platforms\n");
> > + continue;
> > }
> >
> > snprintf(test_name, sizeof(test_name), "-%dbpp", data->compression_bpp);
> > @@ -279,8 +277,7 @@ igt_main
> > drmModeConnector *connector = NULL;
> > int i, j;
> > igt_fixture {
> > - data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> > - igt_require_intel(data.drm_fd);
> > + data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > data.devid = intel_get_drm_devid(data.drm_fd);
> > kmstest_set_vt_graphics_mode();
> > igt_install_exit_handler(kms_dsc_exit_handler);
> > diff --git a/tests/kms_fbcon_fbt.c b/tests/i915/kms_fbcon_fbt.c
> > similarity index 100%
> > rename from tests/kms_fbcon_fbt.c
> > rename to tests/i915/kms_fbcon_fbt.c
> > diff --git a/tests/kms_fence_pin_leak.c b/tests/i915/kms_fence_pin_leak.c
> > similarity index 100%
> > rename from tests/kms_fence_pin_leak.c
> > rename to tests/i915/kms_fence_pin_leak.c
> > diff --git a/tests/kms_flip_scaled_crc.c b/tests/i915/kms_flip_scaled_crc.c
> > similarity index 100%
> > rename from tests/kms_flip_scaled_crc.c
> > rename to tests/i915/kms_flip_scaled_crc.c
> > diff --git a/tests/kms_flip_tiling.c b/tests/i915/kms_flip_tiling.c
> > similarity index 100%
> > rename from tests/kms_flip_tiling.c
> > rename to tests/i915/kms_flip_tiling.c
> > diff --git a/tests/kms_frontbuffer_tracking.c b/tests/i915/kms_frontbuffer_tracking.c
> > similarity index 100%
> > rename from tests/kms_frontbuffer_tracking.c
> > rename to tests/i915/kms_frontbuffer_tracking.c
> > diff --git a/tests/kms_invalid_dotclock.c b/tests/i915/kms_invalid_dotclock.c
> > similarity index 100%
> > rename from tests/kms_invalid_dotclock.c
> > rename to tests/i915/kms_invalid_dotclock.c
> > diff --git a/tests/kms_legacy_colorkey.c b/tests/i915/kms_legacy_colorkey.c
> > similarity index 100%
> > rename from tests/kms_legacy_colorkey.c
> > rename to tests/i915/kms_legacy_colorkey.c
> > diff --git a/tests/kms_pipe_b_c_ivb.c b/tests/i915/kms_pipe_b_c_ivb.c
> > similarity index 100%
> > rename from tests/kms_pipe_b_c_ivb.c
> > rename to tests/i915/kms_pipe_b_c_ivb.c
> > diff --git a/tests/kms_psr.c b/tests/i915/kms_psr.c
> > similarity index 100%
> > rename from tests/kms_psr.c
> > rename to tests/i915/kms_psr.c
> > diff --git a/tests/kms_psr2_sf.c b/tests/i915/kms_psr2_sf.c
> > similarity index 100%
> > rename from tests/kms_psr2_sf.c
> > rename to tests/i915/kms_psr2_sf.c
> > diff --git a/tests/kms_psr2_su.c b/tests/i915/kms_psr2_su.c
> > similarity index 100%
> > rename from tests/kms_psr2_su.c
> > rename to tests/i915/kms_psr2_su.c
> > diff --git a/tests/kms_3d.c b/tests/kms_3d.c
> > index 2e438b430..c29d1d57c 100644
> > --- a/tests/kms_3d.c
> > +++ b/tests/kms_3d.c
> > @@ -34,7 +34,7 @@ igt_simple_main
> > const struct edid *edid;
> > int mode_count, connector_id;
> >
> > - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > res = drmModeGetResources(drm_fd);
> > igt_require(res);
> > @@ -44,7 +44,8 @@ igt_simple_main
> > /* find an hdmi connector */
> > for (int i = 0; i < res->count_connectors; i++) {
> > connector = drmModeGetConnectorCurrent(drm_fd, res->connectors[i]);
> > - if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)
> > + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
> > + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
>
> Hi,
>
> Please move the clean up parts to an individual patch.
>
> > break;
> > drmModeFreeConnector(connector);
> > connector = NULL;
> > diff --git a/tests/kms_big_joiner.c b/tests/kms_big_joiner.c
> > index 4f1f3152e..45c5b2a2a 100644
> > --- a/tests/kms_big_joiner.c
> > +++ b/tests/kms_big_joiner.c
> > @@ -258,7 +258,7 @@ igt_main
> > uint16_t width = 0, height = 0;
> >
> > igt_fixture {
> > - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> I'm not sure if this test is valid for other drivers. Could you please
> check this.
>
> Manasi: Could you please provide your inputs here.
>
> > kmstest_set_vt_graphics_mode();
> >
> > igt_display_require(&data.display, data.drm_fd);
> > diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
> > index e9902f5e7..66781eec6 100644
> > --- a/tests/kms_cursor_edge_walk.c
> > +++ b/tests/kms_cursor_edge_walk.c
> > @@ -94,8 +94,8 @@ static void cursor_move(data_t *data, int x, int y, int i)
> > * fails). So let's accept a failure from the ioctl in that case.
> > */
> > igt_assert(drmModeMoveCursor(data->drm_fd, crtc_id, x, y) == 0 ||
> > - (IS_CHERRYVIEW(data->devid) && data->pipe == PIPE_C &&
> > - x < 0 && x > -data->curw));
> > + (data->devid && IS_CHERRYVIEW(data->devid) &&
> Could we combine this check into one? may be populate a flag in fixture
> and use it throughout the test?
> > + data->pipe == PIPE_C && x < 0 && x > -data->curw));
> > igt_wait_for_vblank(data->drm_fd,
> > display->pipes[data->pipe].crtc_offset);
> > }
> > @@ -312,9 +312,10 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
> > igt_fixture {
> > int ret;
> >
> > - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > - data.devid = intel_get_drm_devid(data.drm_fd);
> > + if (is_i915_device(data.drm_fd))
> > + data.devid = intel_get_drm_devid(data.drm_fd);
> >
> > ret = drmGetCap(data.drm_fd, DRM_CAP_CURSOR_WIDTH, &max_curw);
> > igt_assert(ret == 0 || errno == EINVAL);
> > diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> > index b4836a44d..541378712 100755
> > --- a/tests/kms_flip.c
> > +++ b/tests/kms_flip.c
> > @@ -778,6 +778,7 @@ static bool run_test_step(struct test_output *o, unsigned int *events)
> >
> > memset(&hang, 0, sizeof(hang));
> > if (do_flip && (o->flags & TEST_HANG)) {
> > + igt_require_intel(drm_fd);
> Doesn't this make the test i915 specific? Or is it that only a few of
> the subtests use this?
> > ahnd = get_reloc_ahnd(drm_fd, 0);
> > hang = hang_gpu(drm_fd, ahnd);
> > }
> > diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
> > index 09c871911..97be91907 100644
> > --- a/tests/kms_flip_event_leak.c
> > +++ b/tests/kms_flip_event_leak.c
> > @@ -83,7 +83,7 @@ static void test(data_t *data, enum pipe pipe, igt_output_t *output)
> > igt_device_set_master(data->drm_fd);
> >
> > igt_plane_set_fb(primary, NULL);
> > - igt_output_set_pipe(output, PIPE_ANY);
> > + igt_output_set_pipe(output, PIPE_NONE);
> Please move the clean up parts to an individual patch.
> > igt_display_commit(&data->display);
> >
> > igt_remove_fb(data->drm_fd, &fb[0]);
> > diff --git a/tests/kms_force_connector_basic.c b/tests/kms_force_connector_basic.c
> > index 3b0146fe9..683d36720 100644
> > --- a/tests/kms_force_connector_basic.c
> > +++ b/tests/kms_force_connector_basic.c
> > @@ -37,7 +37,7 @@ static void reset_connectors(void)
> > drmModeRes *res;
> > drmModeConnector *connector = NULL;
> >
> > - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + drm_fd = drm_open_driver_master(DRIVER_ANY);
> > res = drmModeGetResources(drm_fd);
> >
> > for (int i = 0; i < res->count_connectors; i++) {
> > @@ -86,7 +86,7 @@ igt_main_args("", long_opts, help_str, opt_handler, NULL)
> > igt_fixture {
> > unsigned connector_id = 0;
> >
> > - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > res = drmModeGetResources(drm_fd);
> > igt_require(res);
> > diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c
> > index ad2dde569..13a05eb1e 100644
> > --- a/tests/kms_hdmi_inject.c
> > +++ b/tests/kms_hdmi_inject.c
> > @@ -63,7 +63,8 @@ get_connector(int drm_fd, drmModeRes *res)
> > connector =
> > drmModeGetConnectorCurrent(drm_fd, res->connectors[i]);
> >
> > - if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)
> > + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
> > + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
> Same as above.
> > break;
> >
> > drmModeFreeConnector(connector);
> > @@ -82,12 +83,13 @@ hdmi_inject_4k(int drm_fd, drmModeConnector *connector)
> > int fb_id;
> > struct igt_fb fb;
> > uint8_t found_4k_mode = 0;
> > - uint32_t devid;
> >
> > - devid = intel_get_drm_devid(drm_fd);
> > + if (is_i915_device(drm_fd)) {
> > + uint32_t devid = intel_get_drm_devid(drm_fd);
> >
> > - /* 4K requires at least HSW */
> > - igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
> > + /* 4K requires at least HSW */
> > + igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
> > + }
> >
> > edid = igt_kms_get_4k_edid();
> > kmstest_force_edid(drm_fd, connector, edid);
> > @@ -195,7 +197,7 @@ igt_main
> > drmModeConnector *connector;
> >
> > igt_fixture {
> > - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > res = drmModeGetResources(drm_fd);
> > igt_require(res);
> > diff --git a/tests/kms_mmap_write_crc.c b/tests/kms_mmap_write_crc.c
> > index 2e323a209..0c697c246 100644
> > --- a/tests/kms_mmap_write_crc.c
> > +++ b/tests/kms_mmap_write_crc.c
> > @@ -51,7 +51,6 @@ typedef struct {
> > enum pipe pipe;
> > igt_crc_t ref_crc;
> > igt_pipe_crc_t *pipe_crc;
> > - uint32_t devid;
> > } data_t;
> >
> > static int ioctl_sync = true;
> > @@ -103,6 +102,7 @@ static void test(data_t *data)
> > igt_display_commit(display);
> >
> > /* make sure caching mode has become UC/WT */
> > + igt_require_intel(data->drm_fd);
> Doesn't this make it i915 specific?
> > caching = gem_get_caching(data->drm_fd, fb->gem_handle);
> > igt_assert(caching == I915_CACHING_NONE || caching == I915_CACHING_DISPLAY);
> >
> > @@ -204,7 +204,7 @@ static void cleanup_crtc(data_t *data)
> >
> > igt_plane_set_fb(data->primary, NULL);
> >
> > - igt_output_set_pipe(output, PIPE_ANY);
> > + igt_output_set_pipe(output, PIPE_NONE);
> Please move this to an individual patch.
> > igt_display_commit(display);
> >
> > igt_remove_fb(data->drm_fd, &data->fb[0]);
> > @@ -272,9 +272,7 @@ igt_main_args("n", NULL, NULL, opt_handler, NULL)
> > int i;
> >
> > igt_fixture {
> > - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > -
> > - data.devid = intel_get_drm_devid(data.drm_fd);
> > + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > kmstest_set_vt_graphics_mode();
> >
> > diff --git a/tests/kms_pwrite_crc.c b/tests/kms_pwrite_crc.c
> > index dc32a070c..a1642df6f 100644
> > --- a/tests/kms_pwrite_crc.c
> > +++ b/tests/kms_pwrite_crc.c
> > @@ -42,7 +42,6 @@ typedef struct {
> > enum pipe pipe;
> > igt_crc_t ref_crc;
> > igt_pipe_crc_t *pipe_crc;
> > - uint32_t devid;
> > } data_t;
> >
> > static void test(data_t *data)
> > @@ -77,6 +76,7 @@ static void test(data_t *data)
> > 0, 0, fb->width << 16, fb->height << 16);
> >
> > /* make sure caching mode has become UC/WT */
> > + igt_require_intel(data->drm_fd);
> Doesn't this make it i915 specific?
> > caching = gem_get_caching(data->drm_fd, fb->gem_handle);
> > igt_assert(caching == I915_CACHING_NONE || caching == I915_CACHING_DISPLAY);
> >
> > @@ -141,7 +141,7 @@ static void cleanup_crtc(data_t *data)
> >
> > igt_plane_set_fb(data->primary, NULL);
> >
> > - igt_output_set_pipe(output, PIPE_ANY);
> > + igt_output_set_pipe(output, PIPE_NONE);
> Please move this to an individual patch.
> > igt_display_commit(display);
> >
> > igt_remove_fb(data->drm_fd, &data->fb[0]);
> > @@ -174,9 +174,7 @@ static data_t data;
> >
> > igt_simple_main
> > {
> > - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > -
> > - data.devid = intel_get_drm_devid(data.drm_fd);
> > + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > kmstest_set_vt_graphics_mode();
> >
> > diff --git a/tests/kms_tv_load_detect.c b/tests/kms_tv_load_detect.c
> > index caac3aecb..80ced9918 100644
> > --- a/tests/kms_tv_load_detect.c
> > +++ b/tests/kms_tv_load_detect.c
> > @@ -34,7 +34,7 @@ igt_main
> > drmModeConnector *tv_connector = NULL, *temp;
> >
> > igt_fixture {
> > - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > res = drmModeGetResources(drm_fd);
> > igt_require(res);
> > diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
> > index c9a9cd47a..ea9bd9a56 100644
> > --- a/tests/kms_universal_plane.c
> > +++ b/tests/kms_universal_plane.c
> > @@ -107,7 +107,7 @@ functional_test_fini(functional_test_t *test, igt_output_t *output)
> > igt_remove_fb(test->data->drm_fd, &test->red_fb);
> > igt_remove_fb(test->data->drm_fd, &test->yellow_fb);
> >
> > - igt_output_set_pipe(output, PIPE_ANY);
> > + igt_output_set_pipe(output, PIPE_NONE);
> > igt_display_commit2(&test->data->display, COMMIT_LEGACY);
> > }
> >
> > @@ -382,6 +382,7 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
> > * doesn't cover CRTC (should fail on pre-gen9 and succeed on
> > * gen9+).
> > */
> > + igt_require_intel(data->drm_fd);
> Doesn't this make it i915 specific?
> > igt_plane_set_fb(primary, &test.undersized_fb);
> > expect = (data->display_ver < 9) ? -EINVAL : 0;
> > igt_assert(igt_display_try_commit2(&data->display, COMMIT_UNIVERSAL) == expect);
> > @@ -579,6 +580,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
> >
> > igt_require_pipe(display, pipe);
> > igt_require(display->has_cursor_plane);
> > + igt_require_intel(data->drm_fd);
> Same as above.
> >
> > igt_output_set_pipe(output, pipe);
> > mode = igt_output_get_mode(output);
> > @@ -704,6 +706,7 @@ gen9_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
> >
> > int ret = 0;
> >
> > + igt_require_intel(data->drm_fd);
>
> Same as above.
>
> Thanks,
>
> Karthik.B.S
>
> > igt_skip_on(data->display_ver < 9);
> > igt_require_pipe(&data->display, pipe);
> >
> > @@ -797,8 +800,9 @@ igt_main
> > enum pipe pipe;
> >
> > igt_fixture {
> > - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > - data.display_ver = intel_display_ver(intel_get_drm_devid(data.drm_fd));
> > + 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();
> >
> > diff --git a/tests/meson.build b/tests/meson.build
> > index 1bdfddbb2..8ca78fa0c 100644
> > --- a/tests/meson.build
> > +++ b/tests/meson.build
> > @@ -19,11 +19,7 @@ test_progs = [
> > 'kms_atomic',
> > 'kms_atomic_interruptible',
> > 'kms_atomic_transition',
> > - 'kms_big_fb',
> > 'kms_big_joiner' ,
> > - 'kms_busy',
> > - 'kms_ccs',
> > - 'kms_cdclk',
> > 'kms_concurrent',
> > 'kms_content_protection',
> > 'kms_cursor_crc',
> > @@ -32,26 +28,16 @@ test_progs = [
> > 'kms_dither',
> > 'kms_dp_aux_dev',
> > 'kms_dp_tiled_display',
> > - 'kms_draw_crc',
> > - 'kms_dsc',
> > - 'kms_fbcon_fbt',
> > - 'kms_fence_pin_leak',
> > 'kms_flip',
> > 'kms_flip_event_leak',
> > - 'kms_flip_scaled_crc',
> > - 'kms_flip_tiling',
> > 'kms_force_connector_basic',
> > - 'kms_frontbuffer_tracking',
> > 'kms_getfb',
> > 'kms_hdmi_inject',
> > 'kms_hdr',
> > - 'kms_invalid_dotclock',
> > 'kms_lease',
> > - 'kms_legacy_colorkey',
> > 'kms_mmap_write_crc',
> > 'kms_multipipe_modeset',
> > 'kms_panel_fitting',
> > - 'kms_pipe_b_c_ivb',
> > 'kms_pipe_crc_basic',
> > 'kms_plane',
> > 'kms_plane_alpha_blend',
> > @@ -62,9 +48,6 @@ test_progs = [
> > 'kms_prime',
> > 'kms_prop_blob',
> > 'kms_properties',
> > - 'kms_psr',
> > - 'kms_psr2_su',
> > - 'kms_psr2_sf',
> > 'kms_pwrite_crc',
> > 'kms_rmfb',
> > 'kms_rotation_crc',
> > @@ -235,6 +218,23 @@ i915_progs = [
> > 'i915_query',
> > 'i915_selftest',
> > 'i915_suspend',
> > + 'kms_big_fb',
> > + 'kms_busy',
> > + 'kms_ccs',
> > + 'kms_cdclk',
> > + 'kms_draw_crc',
> > + 'kms_dsc',
> > + 'kms_fbcon_fbt',
> > + 'kms_fence_pin_leak',
> > + 'kms_flip_scaled_crc',
> > + 'kms_flip_tiling',
> > + 'kms_frontbuffer_tracking',
> > + 'kms_invalid_dotclock',
> > + 'kms_legacy_colorkey',
> > + 'kms_pipe_b_c_ivb',
> > + 'kms_psr',
> > + 'kms_psr2_su',
> > + 'kms_psr2_sf',
> > 'sysfs_clients',
> > 'sysfs_defaults',
> > 'sysfs_heartbeat_interval',
> > --
> > 2.32.0
> >
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory
2021-09-03 5:31 ` Karthik B S
2021-09-10 18:40 ` Mark Yacoub
@ 2021-09-12 15:54 ` Modem, Bhanuprakash
1 sibling, 0 replies; 8+ messages in thread
From: Modem, Bhanuprakash @ 2021-09-12 15:54 UTC (permalink / raw)
To: B S, Karthik, igt-dev, Navare, Manasi D
Cc: Mark Yacoub, Latvala, Petri, Srinivas, Vidya
> From: B S, Karthik <karthik.b.s@intel.com>
> Sent: Friday, September 3, 2021 11:02 AM
> To: Modem, Bhanuprakash <bhanuprakash.modem@intel.com>; igt-
> dev@lists.freedesktop.org; Navare, Manasi D <manasi.d.navare@intel.com>
> Cc: Mark Yacoub <markyacoub@chromium.org>; Latvala, Petri
> <petri.latvala@intel.com>; Srinivas, Vidya <vidya.srinivas@intel.com>
> Subject: Re: [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915
> directory
>
> On 8/11/2021 12:32 PM, Bhanuprakash Modem wrote:
> > As KMS tests on IGT are officially supported on multiple SoCs
> > and there is an active development on it. So, KMS tests are
> > meant to be generic and if we need to test few things specific
> > to Intel, so we can use igt_require_intel(). But if the whole
> > test is Intel specific, then the best place for the test would
> > be tests/i915.
> >
> > This patch will move all Intel specific kms tests to tests/i915
> > directory. And update the tests those are generic but still open
> > the driver as 'drm_open_driver_master(DRIVER_INTEL);'. This patch
> > will also do some minor cleanups.
> >
> > V2:
> > * Few more tests
> >
> > Cc: Mark Yacoub <markyacoub@chromium.org>
> > Cc: Petri Latvala <petri.latvala@intel.com>
> > Cc: Vidya Srinivas <vidya.srinivas@intel.com>
> > Cc: Karthik B S <karthik.b.s@intel.com>
> > Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> > ---
> > tests/{ => i915}/kms_big_fb.c | 0
> > tests/{ => i915}/kms_busy.c | 0
> > tests/{ => i915}/kms_ccs.c | 0
> > tests/{ => i915}/kms_cdclk.c | 0
> > tests/{ => i915}/kms_draw_crc.c | 0
> > tests/{ => i915}/kms_dsc.c | 15 ++++-----
> > tests/{ => i915}/kms_fbcon_fbt.c | 0
> > tests/{ => i915}/kms_fence_pin_leak.c | 0
> > tests/{ => i915}/kms_flip_scaled_crc.c | 0
> > tests/{ => i915}/kms_flip_tiling.c | 0
> > tests/{ => i915}/kms_frontbuffer_tracking.c | 0
> > tests/{ => i915}/kms_invalid_dotclock.c | 0
> > tests/{ => i915}/kms_legacy_colorkey.c | 0
> > tests/{ => i915}/kms_pipe_b_c_ivb.c | 0
> > tests/{ => i915}/kms_psr.c | 0
> > tests/{ => i915}/kms_psr2_sf.c | 0
> > tests/{ => i915}/kms_psr2_su.c | 0
> > tests/kms_3d.c | 5 +--
> > tests/kms_big_joiner.c | 2 +-
> > tests/kms_cursor_edge_walk.c | 9 +++---
> > tests/kms_flip.c | 1 +
> > tests/kms_flip_event_leak.c | 2 +-
> > tests/kms_force_connector_basic.c | 4 +--
> > tests/kms_hdmi_inject.c | 14 +++++----
> > tests/kms_mmap_write_crc.c | 8 ++---
> > tests/kms_pwrite_crc.c | 8 ++---
> > tests/kms_tv_load_detect.c | 2 +-
> > tests/kms_universal_plane.c | 10 ++++--
> > tests/meson.build | 34 ++++++++++-----------
> > 29 files changed, 58 insertions(+), 56 deletions(-)
> > rename tests/{ => i915}/kms_big_fb.c (100%)
> > rename tests/{ => i915}/kms_busy.c (100%)
> > rename tests/{ => i915}/kms_ccs.c (100%)
> > rename tests/{ => i915}/kms_cdclk.c (100%)
> > rename tests/{ => i915}/kms_draw_crc.c (100%)
> > rename tests/{ => i915}/kms_dsc.c (95%)
> > rename tests/{ => i915}/kms_fbcon_fbt.c (100%)
> > rename tests/{ => i915}/kms_fence_pin_leak.c (100%)
> > rename tests/{ => i915}/kms_flip_scaled_crc.c (100%)
> > rename tests/{ => i915}/kms_flip_tiling.c (100%)
> > rename tests/{ => i915}/kms_frontbuffer_tracking.c (100%)
> > rename tests/{ => i915}/kms_invalid_dotclock.c (100%)
> > rename tests/{ => i915}/kms_legacy_colorkey.c (100%)
> > rename tests/{ => i915}/kms_pipe_b_c_ivb.c (100%)
> > rename tests/{ => i915}/kms_psr.c (100%)
> > rename tests/{ => i915}/kms_psr2_sf.c (100%)
> > rename tests/{ => i915}/kms_psr2_su.c (100%)
> >
> > diff --git a/tests/kms_big_fb.c b/tests/i915/kms_big_fb.c
> > similarity index 100%
> > rename from tests/kms_big_fb.c
> > rename to tests/i915/kms_big_fb.c
> > diff --git a/tests/kms_busy.c b/tests/i915/kms_busy.c
> > similarity index 100%
> > rename from tests/kms_busy.c
> > rename to tests/i915/kms_busy.c
> > diff --git a/tests/kms_ccs.c b/tests/i915/kms_ccs.c
> > similarity index 100%
> > rename from tests/kms_ccs.c
> > rename to tests/i915/kms_ccs.c
> > diff --git a/tests/kms_cdclk.c b/tests/i915/kms_cdclk.c
> > similarity index 100%
> > rename from tests/kms_cdclk.c
> > rename to tests/i915/kms_cdclk.c
> > diff --git a/tests/kms_draw_crc.c b/tests/i915/kms_draw_crc.c
> > similarity index 100%
> > rename from tests/kms_draw_crc.c
> > rename to tests/i915/kms_draw_crc.c
> > diff --git a/tests/kms_dsc.c b/tests/i915/kms_dsc.c
> > similarity index 95%
> > rename from tests/kms_dsc.c
> > rename to tests/i915/kms_dsc.c
> > index b56e01837..3e450207f 100644
> > --- a/tests/kms_dsc.c
> > +++ b/tests/i915/kms_dsc.c
> > @@ -244,14 +244,12 @@ static void run_test(data_t *data, enum dsc_test_type
> test_type)
> > &data->fb_test_pattern);
> >
> > for_each_pipe(&data->display, pipe) {
> > - if (is_i915_device(data->drm_fd)) {
> > - uint32_t devid = intel_get_drm_devid(data->drm_fd);
> > + uint32_t devid = intel_get_drm_devid(data->drm_fd);
> >
> > - if (data->output->config.connector->connector_type ==
> DRM_MODE_CONNECTOR_DisplayPort &&
> > - pipe == PIPE_A && IS_GEN11(devid)) {
> > - igt_debug("DSC not supported on Pipe A on external DP in
> Gen11 platforms\n");
> > - continue;
> > - }
> > + if (data->output->config.connector->connector_type ==
> DRM_MODE_CONNECTOR_DisplayPort &&
> > + pipe == PIPE_A && IS_GEN11(devid)) {
> > + igt_debug("DSC not supported on Pipe A on external DP in
> Gen11 platforms\n");
> > + continue;
> > }
> >
> > snprintf(test_name, sizeof(test_name), "-%dbpp", data-
> >compression_bpp);
> > @@ -279,8 +277,7 @@ igt_main
> > drmModeConnector *connector = NULL;
> > int i, j;
> > igt_fixture {
> > - data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> > - igt_require_intel(data.drm_fd);
> > + data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > data.devid = intel_get_drm_devid(data.drm_fd);
> > kmstest_set_vt_graphics_mode();
> > igt_install_exit_handler(kms_dsc_exit_handler);
> > diff --git a/tests/kms_fbcon_fbt.c b/tests/i915/kms_fbcon_fbt.c
> > similarity index 100%
> > rename from tests/kms_fbcon_fbt.c
> > rename to tests/i915/kms_fbcon_fbt.c
> > diff --git a/tests/kms_fence_pin_leak.c b/tests/i915/kms_fence_pin_leak.c
> > similarity index 100%
> > rename from tests/kms_fence_pin_leak.c
> > rename to tests/i915/kms_fence_pin_leak.c
> > diff --git a/tests/kms_flip_scaled_crc.c b/tests/i915/kms_flip_scaled_crc.c
> > similarity index 100%
> > rename from tests/kms_flip_scaled_crc.c
> > rename to tests/i915/kms_flip_scaled_crc.c
> > diff --git a/tests/kms_flip_tiling.c b/tests/i915/kms_flip_tiling.c
> > similarity index 100%
> > rename from tests/kms_flip_tiling.c
> > rename to tests/i915/kms_flip_tiling.c
> > diff --git a/tests/kms_frontbuffer_tracking.c
> b/tests/i915/kms_frontbuffer_tracking.c
> > similarity index 100%
> > rename from tests/kms_frontbuffer_tracking.c
> > rename to tests/i915/kms_frontbuffer_tracking.c
> > diff --git a/tests/kms_invalid_dotclock.c
> b/tests/i915/kms_invalid_dotclock.c
> > similarity index 100%
> > rename from tests/kms_invalid_dotclock.c
> > rename to tests/i915/kms_invalid_dotclock.c
> > diff --git a/tests/kms_legacy_colorkey.c b/tests/i915/kms_legacy_colorkey.c
> > similarity index 100%
> > rename from tests/kms_legacy_colorkey.c
> > rename to tests/i915/kms_legacy_colorkey.c
> > diff --git a/tests/kms_pipe_b_c_ivb.c b/tests/i915/kms_pipe_b_c_ivb.c
> > similarity index 100%
> > rename from tests/kms_pipe_b_c_ivb.c
> > rename to tests/i915/kms_pipe_b_c_ivb.c
> > diff --git a/tests/kms_psr.c b/tests/i915/kms_psr.c
> > similarity index 100%
> > rename from tests/kms_psr.c
> > rename to tests/i915/kms_psr.c
> > diff --git a/tests/kms_psr2_sf.c b/tests/i915/kms_psr2_sf.c
> > similarity index 100%
> > rename from tests/kms_psr2_sf.c
> > rename to tests/i915/kms_psr2_sf.c
> > diff --git a/tests/kms_psr2_su.c b/tests/i915/kms_psr2_su.c
> > similarity index 100%
> > rename from tests/kms_psr2_su.c
> > rename to tests/i915/kms_psr2_su.c
> > diff --git a/tests/kms_3d.c b/tests/kms_3d.c
> > index 2e438b430..c29d1d57c 100644
> > --- a/tests/kms_3d.c
> > +++ b/tests/kms_3d.c
> > @@ -34,7 +34,7 @@ igt_simple_main
> > const struct edid *edid;
> > int mode_count, connector_id;
> >
> > - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > res = drmModeGetResources(drm_fd);
> > igt_require(res);
> > @@ -44,7 +44,8 @@ igt_simple_main
> > /* find an hdmi connector */
> > for (int i = 0; i < res->count_connectors; i++) {
> > connector = drmModeGetConnectorCurrent(drm_fd, res->connectors[i]);
> > - if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)
> > + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
> > + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
>
> Hi,
>
> Please move the clean up parts to an individual patch.
Sure, I'll submit a new patch for clean-ups.
>
> > break;
> > drmModeFreeConnector(connector);
> > connector = NULL;
> > diff --git a/tests/kms_big_joiner.c b/tests/kms_big_joiner.c
> > index 4f1f3152e..45c5b2a2a 100644
> > --- a/tests/kms_big_joiner.c
> > +++ b/tests/kms_big_joiner.c
> > @@ -258,7 +258,7 @@ igt_main
> > uint16_t width = 0, height = 0;
> >
> > igt_fixture {
> > - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> I'm not sure if this test is valid for other drivers. Could you please
> check this.
>
> Manasi: Could you please provide your inputs here.
Code wise, I don't see anything Intel specific, so I kept this test as a
generic.
>
> > kmstest_set_vt_graphics_mode();
> >
> > igt_display_require(&data.display, data.drm_fd);
> > diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
> > index e9902f5e7..66781eec6 100644
> > --- a/tests/kms_cursor_edge_walk.c
> > +++ b/tests/kms_cursor_edge_walk.c
> > @@ -94,8 +94,8 @@ static void cursor_move(data_t *data, int x, int y, int i)
> > * fails). So let's accept a failure from the ioctl in that case.
> > */
> > igt_assert(drmModeMoveCursor(data->drm_fd, crtc_id, x, y) == 0 ||
> > - (IS_CHERRYVIEW(data->devid) && data->pipe == PIPE_C &&
> > - x < 0 && x > -data->curw));
> > + (data->devid && IS_CHERRYVIEW(data->devid) &&
> Could we combine this check into one? may be populate a flag in fixture
> and use it throughout the test?
This newly added check is not required, I'll revert this in next version
> > + data->pipe == PIPE_C && x < 0 && x > -data->curw));
> > igt_wait_for_vblank(data->drm_fd,
> > display->pipes[data->pipe].crtc_offset);
> > }
> > @@ -312,9 +312,10 @@ igt_main_args("", long_opts, help_str, opt_handler,
> &data)
> > igt_fixture {
> > int ret;
> >
> > - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > - data.devid = intel_get_drm_devid(data.drm_fd);
> > + if (is_i915_device(data.drm_fd))
> > + data.devid = intel_get_drm_devid(data.drm_fd);
> >
> > ret = drmGetCap(data.drm_fd, DRM_CAP_CURSOR_WIDTH, &max_curw);
> > igt_assert(ret == 0 || errno == EINVAL);
> > diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> > index b4836a44d..541378712 100755
> > --- a/tests/kms_flip.c
> > +++ b/tests/kms_flip.c
> > @@ -778,6 +778,7 @@ static bool run_test_step(struct test_output *o,
> unsigned int *events)
> >
> > memset(&hang, 0, sizeof(hang));
> > if (do_flip && (o->flags & TEST_HANG)) {
> > + igt_require_intel(drm_fd);
> Doesn't this make the test i915 specific? Or is it that only a few of
> the subtests use this?
Currently, only HANG tests are i915 specific.
> > ahnd = get_reloc_ahnd(drm_fd, 0);
> > hang = hang_gpu(drm_fd, ahnd);
> > }
> > diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
> > index 09c871911..97be91907 100644
> > --- a/tests/kms_flip_event_leak.c
> > +++ b/tests/kms_flip_event_leak.c
> > @@ -83,7 +83,7 @@ static void test(data_t *data, enum pipe pipe,
> igt_output_t *output)
> > igt_device_set_master(data->drm_fd);
> >
> > igt_plane_set_fb(primary, NULL);
> > - igt_output_set_pipe(output, PIPE_ANY);
> > + igt_output_set_pipe(output, PIPE_NONE);
> Please move the clean up parts to an individual patch.
> > igt_display_commit(&data->display);
> >
> > igt_remove_fb(data->drm_fd, &fb[0]);
> > diff --git a/tests/kms_force_connector_basic.c
> b/tests/kms_force_connector_basic.c
> > index 3b0146fe9..683d36720 100644
> > --- a/tests/kms_force_connector_basic.c
> > +++ b/tests/kms_force_connector_basic.c
> > @@ -37,7 +37,7 @@ static void reset_connectors(void)
> > drmModeRes *res;
> > drmModeConnector *connector = NULL;
> >
> > - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + drm_fd = drm_open_driver_master(DRIVER_ANY);
> > res = drmModeGetResources(drm_fd);
> >
> > for (int i = 0; i < res->count_connectors; i++) {
> > @@ -86,7 +86,7 @@ igt_main_args("", long_opts, help_str, opt_handler, NULL)
> > igt_fixture {
> > unsigned connector_id = 0;
> >
> > - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > res = drmModeGetResources(drm_fd);
> > igt_require(res);
> > diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c
> > index ad2dde569..13a05eb1e 100644
> > --- a/tests/kms_hdmi_inject.c
> > +++ b/tests/kms_hdmi_inject.c
> > @@ -63,7 +63,8 @@ get_connector(int drm_fd, drmModeRes *res)
> > connector =
> > drmModeGetConnectorCurrent(drm_fd, res->connectors[i]);
> >
> > - if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)
> > + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
> > + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
> Same as above.
> > break;
> >
> > drmModeFreeConnector(connector);
> > @@ -82,12 +83,13 @@ hdmi_inject_4k(int drm_fd, drmModeConnector *connector)
> > int fb_id;
> > struct igt_fb fb;
> > uint8_t found_4k_mode = 0;
> > - uint32_t devid;
> >
> > - devid = intel_get_drm_devid(drm_fd);
> > + if (is_i915_device(drm_fd)) {
> > + uint32_t devid = intel_get_drm_devid(drm_fd);
> >
> > - /* 4K requires at least HSW */
> > - igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
> > + /* 4K requires at least HSW */
> > + igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
> > + }
> >
> > edid = igt_kms_get_4k_edid();
> > kmstest_force_edid(drm_fd, connector, edid);
> > @@ -195,7 +197,7 @@ igt_main
> > drmModeConnector *connector;
> >
> > igt_fixture {
> > - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > res = drmModeGetResources(drm_fd);
> > igt_require(res);
> > diff --git a/tests/kms_mmap_write_crc.c b/tests/kms_mmap_write_crc.c
> > index 2e323a209..0c697c246 100644
> > --- a/tests/kms_mmap_write_crc.c
> > +++ b/tests/kms_mmap_write_crc.c
> > @@ -51,7 +51,6 @@ typedef struct {
> > enum pipe pipe;
> > igt_crc_t ref_crc;
> > igt_pipe_crc_t *pipe_crc;
> > - uint32_t devid;
> > } data_t;
> >
> > static int ioctl_sync = true;
> > @@ -103,6 +102,7 @@ static void test(data_t *data)
> > igt_display_commit(display);
> >
> > /* make sure caching mode has become UC/WT */
> > + igt_require_intel(data->drm_fd);
> Doesn't this make it i915 specific?
Yes, I'll takecare in next rev.
> > caching = gem_get_caching(data->drm_fd, fb->gem_handle);
> > igt_assert(caching == I915_CACHING_NONE || caching ==
> I915_CACHING_DISPLAY);
> >
> > @@ -204,7 +204,7 @@ static void cleanup_crtc(data_t *data)
> >
> > igt_plane_set_fb(data->primary, NULL);
> >
> > - igt_output_set_pipe(output, PIPE_ANY);
> > + igt_output_set_pipe(output, PIPE_NONE);
> Please move this to an individual patch.
> > igt_display_commit(display);
> >
> > igt_remove_fb(data->drm_fd, &data->fb[0]);
> > @@ -272,9 +272,7 @@ igt_main_args("n", NULL, NULL, opt_handler, NULL)
> > int i;
> >
> > igt_fixture {
> > - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > -
> > - data.devid = intel_get_drm_devid(data.drm_fd);
> > + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > kmstest_set_vt_graphics_mode();
> >
> > diff --git a/tests/kms_pwrite_crc.c b/tests/kms_pwrite_crc.c
> > index dc32a070c..a1642df6f 100644
> > --- a/tests/kms_pwrite_crc.c
> > +++ b/tests/kms_pwrite_crc.c
> > @@ -42,7 +42,6 @@ typedef struct {
> > enum pipe pipe;
> > igt_crc_t ref_crc;
> > igt_pipe_crc_t *pipe_crc;
> > - uint32_t devid;
> > } data_t;
> >
> > static void test(data_t *data)
> > @@ -77,6 +76,7 @@ static void test(data_t *data)
> > 0, 0, fb->width << 16, fb->height << 16);
> >
> > /* make sure caching mode has become UC/WT */
> > + igt_require_intel(data->drm_fd);
> Doesn't this make it i915 specific?
Yes, I'll takecare in next rev.
> > caching = gem_get_caching(data->drm_fd, fb->gem_handle);
> > igt_assert(caching == I915_CACHING_NONE || caching ==
> I915_CACHING_DISPLAY);
> >
> > @@ -141,7 +141,7 @@ static void cleanup_crtc(data_t *data)
> >
> > igt_plane_set_fb(data->primary, NULL);
> >
> > - igt_output_set_pipe(output, PIPE_ANY);
> > + igt_output_set_pipe(output, PIPE_NONE);
> Please move this to an individual patch.
> > igt_display_commit(display);
> >
> > igt_remove_fb(data->drm_fd, &data->fb[0]);
> > @@ -174,9 +174,7 @@ static data_t data;
> >
> > igt_simple_main
> > {
> > - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > -
> > - data.devid = intel_get_drm_devid(data.drm_fd);
> > + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > kmstest_set_vt_graphics_mode();
> >
> > diff --git a/tests/kms_tv_load_detect.c b/tests/kms_tv_load_detect.c
> > index caac3aecb..80ced9918 100644
> > --- a/tests/kms_tv_load_detect.c
> > +++ b/tests/kms_tv_load_detect.c
> > @@ -34,7 +34,7 @@ igt_main
> > drmModeConnector *tv_connector = NULL, *temp;
> >
> > igt_fixture {
> > - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > + drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > res = drmModeGetResources(drm_fd);
> > igt_require(res);
> > diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
> > index c9a9cd47a..ea9bd9a56 100644
> > --- a/tests/kms_universal_plane.c
> > +++ b/tests/kms_universal_plane.c
> > @@ -107,7 +107,7 @@ functional_test_fini(functional_test_t *test,
> igt_output_t *output)
> > igt_remove_fb(test->data->drm_fd, &test->red_fb);
> > igt_remove_fb(test->data->drm_fd, &test->yellow_fb);
> >
> > - igt_output_set_pipe(output, PIPE_ANY);
> > + igt_output_set_pipe(output, PIPE_NONE);
> > igt_display_commit2(&test->data->display, COMMIT_LEGACY);
> > }
> >
> > @@ -382,6 +382,7 @@ sanity_test_pipe(data_t *data, enum pipe pipe,
> igt_output_t *output)
> > * doesn't cover CRTC (should fail on pre-gen9 and succeed on
> > * gen9+).
> > */
> > + igt_require_intel(data->drm_fd);
> Doesn't this make it i915 specific?
As mentioned in earlier comments, as of now only Intel is using these tests
whoever wants to extend these tests can remove this check.
- Bhanu
> > igt_plane_set_fb(primary, &test.undersized_fb);
> > expect = (data->display_ver < 9) ? -EINVAL : 0;
> > igt_assert(igt_display_try_commit2(&data->display, COMMIT_UNIVERSAL) ==
> expect);
> > @@ -579,6 +580,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe,
> igt_output_t *output)
> >
> > igt_require_pipe(display, pipe);
> > igt_require(display->has_cursor_plane);
> > + igt_require_intel(data->drm_fd);
> Same as above.
> >
> > igt_output_set_pipe(output, pipe);
> > mode = igt_output_get_mode(output);
> > @@ -704,6 +706,7 @@ gen9_test_pipe(data_t *data, enum pipe pipe,
> igt_output_t *output)
> >
> > int ret = 0;
> >
> > + igt_require_intel(data->drm_fd);
>
> Same as above.
>
> Thanks,
>
> Karthik.B.S
>
> > igt_skip_on(data->display_ver < 9);
> > igt_require_pipe(&data->display, pipe);
> >
> > @@ -797,8 +800,9 @@ igt_main
> > enum pipe pipe;
> >
> > igt_fixture {
> > - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > - data.display_ver =
> intel_display_ver(intel_get_drm_devid(data.drm_fd));
> > + 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();
> >
> > diff --git a/tests/meson.build b/tests/meson.build
> > index 1bdfddbb2..8ca78fa0c 100644
> > --- a/tests/meson.build
> > +++ b/tests/meson.build
> > @@ -19,11 +19,7 @@ test_progs = [
> > 'kms_atomic',
> > 'kms_atomic_interruptible',
> > 'kms_atomic_transition',
> > - 'kms_big_fb',
> > 'kms_big_joiner' ,
> > - 'kms_busy',
> > - 'kms_ccs',
> > - 'kms_cdclk',
> > 'kms_concurrent',
> > 'kms_content_protection',
> > 'kms_cursor_crc',
> > @@ -32,26 +28,16 @@ test_progs = [
> > 'kms_dither',
> > 'kms_dp_aux_dev',
> > 'kms_dp_tiled_display',
> > - 'kms_draw_crc',
> > - 'kms_dsc',
> > - 'kms_fbcon_fbt',
> > - 'kms_fence_pin_leak',
> > 'kms_flip',
> > 'kms_flip_event_leak',
> > - 'kms_flip_scaled_crc',
> > - 'kms_flip_tiling',
> > 'kms_force_connector_basic',
> > - 'kms_frontbuffer_tracking',
> > 'kms_getfb',
> > 'kms_hdmi_inject',
> > 'kms_hdr',
> > - 'kms_invalid_dotclock',
> > 'kms_lease',
> > - 'kms_legacy_colorkey',
> > 'kms_mmap_write_crc',
> > 'kms_multipipe_modeset',
> > 'kms_panel_fitting',
> > - 'kms_pipe_b_c_ivb',
> > 'kms_pipe_crc_basic',
> > 'kms_plane',
> > 'kms_plane_alpha_blend',
> > @@ -62,9 +48,6 @@ test_progs = [
> > 'kms_prime',
> > 'kms_prop_blob',
> > 'kms_properties',
> > - 'kms_psr',
> > - 'kms_psr2_su',
> > - 'kms_psr2_sf',
> > 'kms_pwrite_crc',
> > 'kms_rmfb',
> > 'kms_rotation_crc',
> > @@ -235,6 +218,23 @@ i915_progs = [
> > 'i915_query',
> > 'i915_selftest',
> > 'i915_suspend',
> > + 'kms_big_fb',
> > + 'kms_busy',
> > + 'kms_ccs',
> > + 'kms_cdclk',
> > + 'kms_draw_crc',
> > + 'kms_dsc',
> > + 'kms_fbcon_fbt',
> > + 'kms_fence_pin_leak',
> > + 'kms_flip_scaled_crc',
> > + 'kms_flip_tiling',
> > + 'kms_frontbuffer_tracking',
> > + 'kms_invalid_dotclock',
> > + 'kms_legacy_colorkey',
> > + 'kms_pipe_b_c_ivb',
> > + 'kms_psr',
> > + 'kms_psr2_su',
> > + 'kms_psr2_sf',
> > 'sysfs_clients',
> > 'sysfs_defaults',
> > 'sysfs_heartbeat_interval',
> > --
> > 2.32.0
> >
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory
2021-08-11 7:02 [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory Bhanuprakash Modem
` (3 preceding siblings ...)
2021-09-03 5:31 ` Karthik B S
@ 2021-09-13 13:06 ` Rodrigo Siqueira
4 siblings, 0 replies; 8+ messages in thread
From: Rodrigo Siqueira @ 2021-09-13 13:06 UTC (permalink / raw)
To: Bhanuprakash Modem
Cc: igt-dev, Mark Yacoub, Petri Latvala, Vidya Srinivas, Karthik B S,
Nicholas Choi
Hi Bhanuprakash,
I think this is an excellent improvement to make IGT generic. In this
sense:
Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Is it possible to apply this patch?
Thanks
Siqueira
On 08/11, Bhanuprakash Modem wrote:
> As KMS tests on IGT are officially supported on multiple SoCs
> and there is an active development on it. So, KMS tests are
> meant to be generic and if we need to test few things specific
> to Intel, so we can use igt_require_intel(). But if the whole
> test is Intel specific, then the best place for the test would
> be tests/i915.
>
> This patch will move all Intel specific kms tests to tests/i915
> directory. And update the tests those are generic but still open
> the driver as 'drm_open_driver_master(DRIVER_INTEL);'. This patch
> will also do some minor cleanups.
>
> V2:
> * Few more tests
>
> Cc: Mark Yacoub <markyacoub@chromium.org>
> Cc: Petri Latvala <petri.latvala@intel.com>
> Cc: Vidya Srinivas <vidya.srinivas@intel.com>
> Cc: Karthik B S <karthik.b.s@intel.com>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> ---
> tests/{ => i915}/kms_big_fb.c | 0
> tests/{ => i915}/kms_busy.c | 0
> tests/{ => i915}/kms_ccs.c | 0
> tests/{ => i915}/kms_cdclk.c | 0
> tests/{ => i915}/kms_draw_crc.c | 0
> tests/{ => i915}/kms_dsc.c | 15 ++++-----
> tests/{ => i915}/kms_fbcon_fbt.c | 0
> tests/{ => i915}/kms_fence_pin_leak.c | 0
> tests/{ => i915}/kms_flip_scaled_crc.c | 0
> tests/{ => i915}/kms_flip_tiling.c | 0
> tests/{ => i915}/kms_frontbuffer_tracking.c | 0
> tests/{ => i915}/kms_invalid_dotclock.c | 0
> tests/{ => i915}/kms_legacy_colorkey.c | 0
> tests/{ => i915}/kms_pipe_b_c_ivb.c | 0
> tests/{ => i915}/kms_psr.c | 0
> tests/{ => i915}/kms_psr2_sf.c | 0
> tests/{ => i915}/kms_psr2_su.c | 0
> tests/kms_3d.c | 5 +--
> tests/kms_big_joiner.c | 2 +-
> tests/kms_cursor_edge_walk.c | 9 +++---
> tests/kms_flip.c | 1 +
> tests/kms_flip_event_leak.c | 2 +-
> tests/kms_force_connector_basic.c | 4 +--
> tests/kms_hdmi_inject.c | 14 +++++----
> tests/kms_mmap_write_crc.c | 8 ++---
> tests/kms_pwrite_crc.c | 8 ++---
> tests/kms_tv_load_detect.c | 2 +-
> tests/kms_universal_plane.c | 10 ++++--
> tests/meson.build | 34 ++++++++++-----------
> 29 files changed, 58 insertions(+), 56 deletions(-)
> rename tests/{ => i915}/kms_big_fb.c (100%)
> rename tests/{ => i915}/kms_busy.c (100%)
> rename tests/{ => i915}/kms_ccs.c (100%)
> rename tests/{ => i915}/kms_cdclk.c (100%)
> rename tests/{ => i915}/kms_draw_crc.c (100%)
> rename tests/{ => i915}/kms_dsc.c (95%)
> rename tests/{ => i915}/kms_fbcon_fbt.c (100%)
> rename tests/{ => i915}/kms_fence_pin_leak.c (100%)
> rename tests/{ => i915}/kms_flip_scaled_crc.c (100%)
> rename tests/{ => i915}/kms_flip_tiling.c (100%)
> rename tests/{ => i915}/kms_frontbuffer_tracking.c (100%)
> rename tests/{ => i915}/kms_invalid_dotclock.c (100%)
> rename tests/{ => i915}/kms_legacy_colorkey.c (100%)
> rename tests/{ => i915}/kms_pipe_b_c_ivb.c (100%)
> rename tests/{ => i915}/kms_psr.c (100%)
> rename tests/{ => i915}/kms_psr2_sf.c (100%)
> rename tests/{ => i915}/kms_psr2_su.c (100%)
>
> diff --git a/tests/kms_big_fb.c b/tests/i915/kms_big_fb.c
> similarity index 100%
> rename from tests/kms_big_fb.c
> rename to tests/i915/kms_big_fb.c
> diff --git a/tests/kms_busy.c b/tests/i915/kms_busy.c
> similarity index 100%
> rename from tests/kms_busy.c
> rename to tests/i915/kms_busy.c
> diff --git a/tests/kms_ccs.c b/tests/i915/kms_ccs.c
> similarity index 100%
> rename from tests/kms_ccs.c
> rename to tests/i915/kms_ccs.c
> diff --git a/tests/kms_cdclk.c b/tests/i915/kms_cdclk.c
> similarity index 100%
> rename from tests/kms_cdclk.c
> rename to tests/i915/kms_cdclk.c
> diff --git a/tests/kms_draw_crc.c b/tests/i915/kms_draw_crc.c
> similarity index 100%
> rename from tests/kms_draw_crc.c
> rename to tests/i915/kms_draw_crc.c
> diff --git a/tests/kms_dsc.c b/tests/i915/kms_dsc.c
> similarity index 95%
> rename from tests/kms_dsc.c
> rename to tests/i915/kms_dsc.c
> index b56e01837..3e450207f 100644
> --- a/tests/kms_dsc.c
> +++ b/tests/i915/kms_dsc.c
> @@ -244,14 +244,12 @@ static void run_test(data_t *data, enum dsc_test_type test_type)
> &data->fb_test_pattern);
>
> for_each_pipe(&data->display, pipe) {
> - if (is_i915_device(data->drm_fd)) {
> - uint32_t devid = intel_get_drm_devid(data->drm_fd);
> + uint32_t devid = intel_get_drm_devid(data->drm_fd);
>
> - if (data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
> - pipe == PIPE_A && IS_GEN11(devid)) {
> - igt_debug("DSC not supported on Pipe A on external DP in Gen11 platforms\n");
> - continue;
> - }
> + if (data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
> + pipe == PIPE_A && IS_GEN11(devid)) {
> + igt_debug("DSC not supported on Pipe A on external DP in Gen11 platforms\n");
> + continue;
> }
>
> snprintf(test_name, sizeof(test_name), "-%dbpp", data->compression_bpp);
> @@ -279,8 +277,7 @@ igt_main
> drmModeConnector *connector = NULL;
> int i, j;
> igt_fixture {
> - data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> - igt_require_intel(data.drm_fd);
> + data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> data.devid = intel_get_drm_devid(data.drm_fd);
> kmstest_set_vt_graphics_mode();
> igt_install_exit_handler(kms_dsc_exit_handler);
> diff --git a/tests/kms_fbcon_fbt.c b/tests/i915/kms_fbcon_fbt.c
> similarity index 100%
> rename from tests/kms_fbcon_fbt.c
> rename to tests/i915/kms_fbcon_fbt.c
> diff --git a/tests/kms_fence_pin_leak.c b/tests/i915/kms_fence_pin_leak.c
> similarity index 100%
> rename from tests/kms_fence_pin_leak.c
> rename to tests/i915/kms_fence_pin_leak.c
> diff --git a/tests/kms_flip_scaled_crc.c b/tests/i915/kms_flip_scaled_crc.c
> similarity index 100%
> rename from tests/kms_flip_scaled_crc.c
> rename to tests/i915/kms_flip_scaled_crc.c
> diff --git a/tests/kms_flip_tiling.c b/tests/i915/kms_flip_tiling.c
> similarity index 100%
> rename from tests/kms_flip_tiling.c
> rename to tests/i915/kms_flip_tiling.c
> diff --git a/tests/kms_frontbuffer_tracking.c b/tests/i915/kms_frontbuffer_tracking.c
> similarity index 100%
> rename from tests/kms_frontbuffer_tracking.c
> rename to tests/i915/kms_frontbuffer_tracking.c
> diff --git a/tests/kms_invalid_dotclock.c b/tests/i915/kms_invalid_dotclock.c
> similarity index 100%
> rename from tests/kms_invalid_dotclock.c
> rename to tests/i915/kms_invalid_dotclock.c
> diff --git a/tests/kms_legacy_colorkey.c b/tests/i915/kms_legacy_colorkey.c
> similarity index 100%
> rename from tests/kms_legacy_colorkey.c
> rename to tests/i915/kms_legacy_colorkey.c
> diff --git a/tests/kms_pipe_b_c_ivb.c b/tests/i915/kms_pipe_b_c_ivb.c
> similarity index 100%
> rename from tests/kms_pipe_b_c_ivb.c
> rename to tests/i915/kms_pipe_b_c_ivb.c
> diff --git a/tests/kms_psr.c b/tests/i915/kms_psr.c
> similarity index 100%
> rename from tests/kms_psr.c
> rename to tests/i915/kms_psr.c
> diff --git a/tests/kms_psr2_sf.c b/tests/i915/kms_psr2_sf.c
> similarity index 100%
> rename from tests/kms_psr2_sf.c
> rename to tests/i915/kms_psr2_sf.c
> diff --git a/tests/kms_psr2_su.c b/tests/i915/kms_psr2_su.c
> similarity index 100%
> rename from tests/kms_psr2_su.c
> rename to tests/i915/kms_psr2_su.c
> diff --git a/tests/kms_3d.c b/tests/kms_3d.c
> index 2e438b430..c29d1d57c 100644
> --- a/tests/kms_3d.c
> +++ b/tests/kms_3d.c
> @@ -34,7 +34,7 @@ igt_simple_main
> const struct edid *edid;
> int mode_count, connector_id;
>
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> res = drmModeGetResources(drm_fd);
> igt_require(res);
> @@ -44,7 +44,8 @@ igt_simple_main
> /* find an hdmi connector */
> for (int i = 0; i < res->count_connectors; i++) {
> connector = drmModeGetConnectorCurrent(drm_fd, res->connectors[i]);
> - if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)
> + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
> + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
> break;
> drmModeFreeConnector(connector);
> connector = NULL;
> diff --git a/tests/kms_big_joiner.c b/tests/kms_big_joiner.c
> index 4f1f3152e..45c5b2a2a 100644
> --- a/tests/kms_big_joiner.c
> +++ b/tests/kms_big_joiner.c
> @@ -258,7 +258,7 @@ igt_main
> uint16_t width = 0, height = 0;
>
> igt_fixture {
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> kmstest_set_vt_graphics_mode();
>
> igt_display_require(&data.display, data.drm_fd);
> diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
> index e9902f5e7..66781eec6 100644
> --- a/tests/kms_cursor_edge_walk.c
> +++ b/tests/kms_cursor_edge_walk.c
> @@ -94,8 +94,8 @@ static void cursor_move(data_t *data, int x, int y, int i)
> * fails). So let's accept a failure from the ioctl in that case.
> */
> igt_assert(drmModeMoveCursor(data->drm_fd, crtc_id, x, y) == 0 ||
> - (IS_CHERRYVIEW(data->devid) && data->pipe == PIPE_C &&
> - x < 0 && x > -data->curw));
> + (data->devid && IS_CHERRYVIEW(data->devid) &&
> + data->pipe == PIPE_C && x < 0 && x > -data->curw));
> igt_wait_for_vblank(data->drm_fd,
> display->pipes[data->pipe].crtc_offset);
> }
> @@ -312,9 +312,10 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
> igt_fixture {
> int ret;
>
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> - data.devid = intel_get_drm_devid(data.drm_fd);
> + if (is_i915_device(data.drm_fd))
> + data.devid = intel_get_drm_devid(data.drm_fd);
>
> ret = drmGetCap(data.drm_fd, DRM_CAP_CURSOR_WIDTH, &max_curw);
> igt_assert(ret == 0 || errno == EINVAL);
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> index b4836a44d..541378712 100755
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -778,6 +778,7 @@ static bool run_test_step(struct test_output *o, unsigned int *events)
>
> memset(&hang, 0, sizeof(hang));
> if (do_flip && (o->flags & TEST_HANG)) {
> + igt_require_intel(drm_fd);
> ahnd = get_reloc_ahnd(drm_fd, 0);
> hang = hang_gpu(drm_fd, ahnd);
> }
> diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
> index 09c871911..97be91907 100644
> --- a/tests/kms_flip_event_leak.c
> +++ b/tests/kms_flip_event_leak.c
> @@ -83,7 +83,7 @@ static void test(data_t *data, enum pipe pipe, igt_output_t *output)
> igt_device_set_master(data->drm_fd);
>
> igt_plane_set_fb(primary, NULL);
> - igt_output_set_pipe(output, PIPE_ANY);
> + igt_output_set_pipe(output, PIPE_NONE);
> igt_display_commit(&data->display);
>
> igt_remove_fb(data->drm_fd, &fb[0]);
> diff --git a/tests/kms_force_connector_basic.c b/tests/kms_force_connector_basic.c
> index 3b0146fe9..683d36720 100644
> --- a/tests/kms_force_connector_basic.c
> +++ b/tests/kms_force_connector_basic.c
> @@ -37,7 +37,7 @@ static void reset_connectors(void)
> drmModeRes *res;
> drmModeConnector *connector = NULL;
>
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
> res = drmModeGetResources(drm_fd);
>
> for (int i = 0; i < res->count_connectors; i++) {
> @@ -86,7 +86,7 @@ igt_main_args("", long_opts, help_str, opt_handler, NULL)
> igt_fixture {
> unsigned connector_id = 0;
>
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> res = drmModeGetResources(drm_fd);
> igt_require(res);
> diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c
> index ad2dde569..13a05eb1e 100644
> --- a/tests/kms_hdmi_inject.c
> +++ b/tests/kms_hdmi_inject.c
> @@ -63,7 +63,8 @@ get_connector(int drm_fd, drmModeRes *res)
> connector =
> drmModeGetConnectorCurrent(drm_fd, res->connectors[i]);
>
> - if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)
> + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
> + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
> break;
>
> drmModeFreeConnector(connector);
> @@ -82,12 +83,13 @@ hdmi_inject_4k(int drm_fd, drmModeConnector *connector)
> int fb_id;
> struct igt_fb fb;
> uint8_t found_4k_mode = 0;
> - uint32_t devid;
>
> - devid = intel_get_drm_devid(drm_fd);
> + if (is_i915_device(drm_fd)) {
> + uint32_t devid = intel_get_drm_devid(drm_fd);
>
> - /* 4K requires at least HSW */
> - igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
> + /* 4K requires at least HSW */
> + igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
> + }
>
> edid = igt_kms_get_4k_edid();
> kmstest_force_edid(drm_fd, connector, edid);
> @@ -195,7 +197,7 @@ igt_main
> drmModeConnector *connector;
>
> igt_fixture {
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> res = drmModeGetResources(drm_fd);
> igt_require(res);
> diff --git a/tests/kms_mmap_write_crc.c b/tests/kms_mmap_write_crc.c
> index 2e323a209..0c697c246 100644
> --- a/tests/kms_mmap_write_crc.c
> +++ b/tests/kms_mmap_write_crc.c
> @@ -51,7 +51,6 @@ typedef struct {
> enum pipe pipe;
> igt_crc_t ref_crc;
> igt_pipe_crc_t *pipe_crc;
> - uint32_t devid;
> } data_t;
>
> static int ioctl_sync = true;
> @@ -103,6 +102,7 @@ static void test(data_t *data)
> igt_display_commit(display);
>
> /* make sure caching mode has become UC/WT */
> + igt_require_intel(data->drm_fd);
> caching = gem_get_caching(data->drm_fd, fb->gem_handle);
> igt_assert(caching == I915_CACHING_NONE || caching == I915_CACHING_DISPLAY);
>
> @@ -204,7 +204,7 @@ static void cleanup_crtc(data_t *data)
>
> igt_plane_set_fb(data->primary, NULL);
>
> - igt_output_set_pipe(output, PIPE_ANY);
> + igt_output_set_pipe(output, PIPE_NONE);
> igt_display_commit(display);
>
> igt_remove_fb(data->drm_fd, &data->fb[0]);
> @@ -272,9 +272,7 @@ igt_main_args("n", NULL, NULL, opt_handler, NULL)
> int i;
>
> igt_fixture {
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> -
> - data.devid = intel_get_drm_devid(data.drm_fd);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> kmstest_set_vt_graphics_mode();
>
> diff --git a/tests/kms_pwrite_crc.c b/tests/kms_pwrite_crc.c
> index dc32a070c..a1642df6f 100644
> --- a/tests/kms_pwrite_crc.c
> +++ b/tests/kms_pwrite_crc.c
> @@ -42,7 +42,6 @@ typedef struct {
> enum pipe pipe;
> igt_crc_t ref_crc;
> igt_pipe_crc_t *pipe_crc;
> - uint32_t devid;
> } data_t;
>
> static void test(data_t *data)
> @@ -77,6 +76,7 @@ static void test(data_t *data)
> 0, 0, fb->width << 16, fb->height << 16);
>
> /* make sure caching mode has become UC/WT */
> + igt_require_intel(data->drm_fd);
> caching = gem_get_caching(data->drm_fd, fb->gem_handle);
> igt_assert(caching == I915_CACHING_NONE || caching == I915_CACHING_DISPLAY);
>
> @@ -141,7 +141,7 @@ static void cleanup_crtc(data_t *data)
>
> igt_plane_set_fb(data->primary, NULL);
>
> - igt_output_set_pipe(output, PIPE_ANY);
> + igt_output_set_pipe(output, PIPE_NONE);
> igt_display_commit(display);
>
> igt_remove_fb(data->drm_fd, &data->fb[0]);
> @@ -174,9 +174,7 @@ static data_t data;
>
> igt_simple_main
> {
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> -
> - data.devid = intel_get_drm_devid(data.drm_fd);
> + data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> kmstest_set_vt_graphics_mode();
>
> diff --git a/tests/kms_tv_load_detect.c b/tests/kms_tv_load_detect.c
> index caac3aecb..80ced9918 100644
> --- a/tests/kms_tv_load_detect.c
> +++ b/tests/kms_tv_load_detect.c
> @@ -34,7 +34,7 @@ igt_main
> drmModeConnector *tv_connector = NULL, *temp;
>
> igt_fixture {
> - drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> res = drmModeGetResources(drm_fd);
> igt_require(res);
> diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
> index c9a9cd47a..ea9bd9a56 100644
> --- a/tests/kms_universal_plane.c
> +++ b/tests/kms_universal_plane.c
> @@ -107,7 +107,7 @@ functional_test_fini(functional_test_t *test, igt_output_t *output)
> igt_remove_fb(test->data->drm_fd, &test->red_fb);
> igt_remove_fb(test->data->drm_fd, &test->yellow_fb);
>
> - igt_output_set_pipe(output, PIPE_ANY);
> + igt_output_set_pipe(output, PIPE_NONE);
> igt_display_commit2(&test->data->display, COMMIT_LEGACY);
> }
>
> @@ -382,6 +382,7 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
> * doesn't cover CRTC (should fail on pre-gen9 and succeed on
> * gen9+).
> */
> + igt_require_intel(data->drm_fd);
> igt_plane_set_fb(primary, &test.undersized_fb);
> expect = (data->display_ver < 9) ? -EINVAL : 0;
> igt_assert(igt_display_try_commit2(&data->display, COMMIT_UNIVERSAL) == expect);
> @@ -579,6 +580,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>
> igt_require_pipe(display, pipe);
> igt_require(display->has_cursor_plane);
> + igt_require_intel(data->drm_fd);
>
> igt_output_set_pipe(output, pipe);
> mode = igt_output_get_mode(output);
> @@ -704,6 +706,7 @@ gen9_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>
> int ret = 0;
>
> + igt_require_intel(data->drm_fd);
> igt_skip_on(data->display_ver < 9);
> igt_require_pipe(&data->display, pipe);
>
> @@ -797,8 +800,9 @@ igt_main
> enum pipe pipe;
>
> igt_fixture {
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> - data.display_ver = intel_display_ver(intel_get_drm_devid(data.drm_fd));
> + 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();
>
> diff --git a/tests/meson.build b/tests/meson.build
> index 1bdfddbb2..8ca78fa0c 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -19,11 +19,7 @@ test_progs = [
> 'kms_atomic',
> 'kms_atomic_interruptible',
> 'kms_atomic_transition',
> - 'kms_big_fb',
> 'kms_big_joiner' ,
> - 'kms_busy',
> - 'kms_ccs',
> - 'kms_cdclk',
> 'kms_concurrent',
> 'kms_content_protection',
> 'kms_cursor_crc',
> @@ -32,26 +28,16 @@ test_progs = [
> 'kms_dither',
> 'kms_dp_aux_dev',
> 'kms_dp_tiled_display',
> - 'kms_draw_crc',
> - 'kms_dsc',
> - 'kms_fbcon_fbt',
> - 'kms_fence_pin_leak',
> 'kms_flip',
> 'kms_flip_event_leak',
> - 'kms_flip_scaled_crc',
> - 'kms_flip_tiling',
> 'kms_force_connector_basic',
> - 'kms_frontbuffer_tracking',
> 'kms_getfb',
> 'kms_hdmi_inject',
> 'kms_hdr',
> - 'kms_invalid_dotclock',
> 'kms_lease',
> - 'kms_legacy_colorkey',
> 'kms_mmap_write_crc',
> 'kms_multipipe_modeset',
> 'kms_panel_fitting',
> - 'kms_pipe_b_c_ivb',
> 'kms_pipe_crc_basic',
> 'kms_plane',
> 'kms_plane_alpha_blend',
> @@ -62,9 +48,6 @@ test_progs = [
> 'kms_prime',
> 'kms_prop_blob',
> 'kms_properties',
> - 'kms_psr',
> - 'kms_psr2_su',
> - 'kms_psr2_sf',
> 'kms_pwrite_crc',
> 'kms_rmfb',
> 'kms_rotation_crc',
> @@ -235,6 +218,23 @@ i915_progs = [
> 'i915_query',
> 'i915_selftest',
> 'i915_suspend',
> + 'kms_big_fb',
> + 'kms_busy',
> + 'kms_ccs',
> + 'kms_cdclk',
> + 'kms_draw_crc',
> + 'kms_dsc',
> + 'kms_fbcon_fbt',
> + 'kms_fence_pin_leak',
> + 'kms_flip_scaled_crc',
> + 'kms_flip_tiling',
> + 'kms_frontbuffer_tracking',
> + 'kms_invalid_dotclock',
> + 'kms_legacy_colorkey',
> + 'kms_pipe_b_c_ivb',
> + 'kms_psr',
> + 'kms_psr2_su',
> + 'kms_psr2_sf',
> 'sysfs_clients',
> 'sysfs_defaults',
> 'sysfs_heartbeat_interval',
> --
> 2.32.0
>
--
Rodrigo Siqueira
https://siqueira.tech
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-09-13 13:06 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-11 7:02 [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory Bhanuprakash Modem
2021-08-11 7:40 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms: Move Intel specific kms tests to i915 directory (rev2) Patchwork
2021-08-11 8:55 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2021-09-01 18:38 ` [igt-dev] [PATCH i-g-t v2] tests/kms: Move Intel specific kms tests to i915 directory Mark Yacoub
2021-09-03 5:31 ` Karthik B S
2021-09-10 18:40 ` Mark Yacoub
2021-09-12 15:54 ` Modem, Bhanuprakash
2021-09-13 13:06 ` Rodrigo Siqueira
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.