* [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup
@ 2022-08-03 4:20 Nidhi Gupta
2022-08-03 4:20 ` [igt-dev] [PATCH 1/2] tests/i915/kms_draw_crc: Convert tests to dynamic Nidhi Gupta
` (3 more replies)
0 siblings, 4 replies; 23+ messages in thread
From: Nidhi Gupta @ 2022-08-03 4:20 UTC (permalink / raw)
To: igt-dev; +Cc: Nidhi Gupta
Convert all possible subtests to dynamic and replace drm function
call with existing library functions.
Nidhi Gupta (2):
tests/i915/kms_draw_crc: Convert tests to dynamic
tests/i915/kms_draw_crc: Test Cleanup
tests/i915/kms_draw_crc.c | 121 +++++++++++++++++++-------------------
1 file changed, 61 insertions(+), 60 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 23+ messages in thread* [igt-dev] [PATCH 1/2] tests/i915/kms_draw_crc: Convert tests to dynamic 2022-08-03 4:20 [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup Nidhi Gupta @ 2022-08-03 4:20 ` Nidhi Gupta 2022-08-03 7:04 ` Modem, Bhanuprakash 2022-08-03 4:20 ` [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup Nidhi Gupta ` (2 subsequent siblings) 3 siblings, 1 reply; 23+ messages in thread From: Nidhi Gupta @ 2022-08-03 4:20 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta Convert the existing subtests to dynamic subtests. v2: check all per-requisites before starting dynamic tests, since to avoid skip in igt_dynamic(). (Bhanu) Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> --- tests/i915/kms_draw_crc.c | 54 ++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c index 33fefed4..edab2f3b 100644 --- a/tests/i915/kms_draw_crc.c +++ b/tests/i915/kms_draw_crc.c @@ -177,15 +177,6 @@ static void draw_method_subtest(enum igt_draw_method method, { igt_crc_t crc; - igt_skip_on(modifier == I915_FORMAT_MOD_4_TILED && - !HAS_4TILE(intel_get_drm_devid(drm_fd))); - - igt_skip_on(method == IGT_DRAW_MMAP_WC && !gem_mmap__has_wc(drm_fd)); - igt_skip_on(method == IGT_DRAW_MMAP_GTT && - !gem_has_mappable_ggtt(drm_fd)); - - igt_require(format_is_supported(formats[format_index], modifier)); - /* Use IGT_DRAW_MMAP_GTT/WC on an untiled buffer as the parameter for * comparison. Cache the value so we don't recompute it for every single * subtest. */ @@ -331,22 +322,43 @@ igt_main { enum igt_draw_method method; int format_idx, modifier_idx; + uint64_t modifier; igt_fixture setup_environment(); - for (format_idx = 0; format_idx < ARRAY_SIZE(formats); format_idx++) { - for (method = 0; method < IGT_DRAW_METHOD_COUNT; method++) { - for (modifier_idx = 0; modifier_idx < ARRAY_SIZE(modifiers); modifier_idx++) { - igt_describe("This subtest verfies igt_draw library works " - "with different modifiers, DRM_FORMATS, DRAW_METHODS."); - igt_subtest_f("draw-method-%s-%s-%s", - format_str(format_idx), - igt_draw_get_method_name(method), - modifier_str(modifier_idx)) - draw_method_subtest(method, format_idx, - modifiers[modifier_idx]); - } } } + igt_describe("This subtest verfies igt_draw library works " + "with different modifiers, DRM_FORMATS, DRAW_METHODS."); + igt_subtest_with_dynamic("draw-method") { + for (format_idx = 0; format_idx < ARRAY_SIZE(formats); format_idx++) { + for (method = 0; method < IGT_DRAW_METHOD_COUNT; method++) { + for (modifier_idx = 0; modifier_idx < ARRAY_SIZE(modifiers); modifier_idx++) { + modifier = modifiers[modifier_idx]; + + if (modifier == I915_FORMAT_MOD_4_TILED && + !HAS_4TILE(intel_get_drm_devid(drm_fd))) + continue; + + if (method == IGT_DRAW_MMAP_WC && !gem_mmap__has_wc(drm_fd)) + continue; + + if (method == IGT_DRAW_MMAP_GTT && + !gem_has_mappable_ggtt(drm_fd)) + continue; + + if (!(format_is_supported(formats[format_idx], modifier))) + continue; + + igt_dynamic_f("draw-method-%s-%s-%s", + format_str(format_idx), + igt_draw_get_method_name(method), + modifier_str(modifier_idx)) + draw_method_subtest(method, format_idx, + modifiers[modifier_idx]); + } + } + } + } igt_describe("This subtest verifies CRC after filling fb with x-tiling " "or none."); -- 2.26.2 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [igt-dev] [PATCH 1/2] tests/i915/kms_draw_crc: Convert tests to dynamic 2022-08-03 4:20 ` [igt-dev] [PATCH 1/2] tests/i915/kms_draw_crc: Convert tests to dynamic Nidhi Gupta @ 2022-08-03 7:04 ` Modem, Bhanuprakash 0 siblings, 0 replies; 23+ messages in thread From: Modem, Bhanuprakash @ 2022-08-03 7:04 UTC (permalink / raw) To: Nidhi Gupta, igt-dev On Wed-03-08-2022 09:50 am, Nidhi Gupta wrote: > Convert the existing subtests to dynamic subtests. > > v2: check all per-requisites before starting dynamic > tests, since to avoid skip in igt_dynamic(). > (Bhanu) > > Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> > --- > tests/i915/kms_draw_crc.c | 54 ++++++++++++++++++++++++--------------- > 1 file changed, 33 insertions(+), 21 deletions(-) > > diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c > index 33fefed4..edab2f3b 100644 > --- a/tests/i915/kms_draw_crc.c > +++ b/tests/i915/kms_draw_crc.c > @@ -177,15 +177,6 @@ static void draw_method_subtest(enum igt_draw_method method, > { > igt_crc_t crc; > > - igt_skip_on(modifier == I915_FORMAT_MOD_4_TILED && > - !HAS_4TILE(intel_get_drm_devid(drm_fd))); > - > - igt_skip_on(method == IGT_DRAW_MMAP_WC && !gem_mmap__has_wc(drm_fd)); > - igt_skip_on(method == IGT_DRAW_MMAP_GTT && > - !gem_has_mappable_ggtt(drm_fd)); > - > - igt_require(format_is_supported(formats[format_index], modifier)); > - > /* Use IGT_DRAW_MMAP_GTT/WC on an untiled buffer as the parameter for > * comparison. Cache the value so we don't recompute it for every single > * subtest. */ > @@ -331,22 +322,43 @@ igt_main > { > enum igt_draw_method method; > int format_idx, modifier_idx; > + uint64_t modifier; > > igt_fixture > setup_environment(); > > - for (format_idx = 0; format_idx < ARRAY_SIZE(formats); format_idx++) { > - for (method = 0; method < IGT_DRAW_METHOD_COUNT; method++) { > - for (modifier_idx = 0; modifier_idx < ARRAY_SIZE(modifiers); modifier_idx++) { > - igt_describe("This subtest verfies igt_draw library works " > - "with different modifiers, DRM_FORMATS, DRAW_METHODS."); > - igt_subtest_f("draw-method-%s-%s-%s", > - format_str(format_idx), > - igt_draw_get_method_name(method), > - modifier_str(modifier_idx)) > - draw_method_subtest(method, format_idx, > - modifiers[modifier_idx]); > - } } } > + igt_describe("This subtest verfies igt_draw library works " > + "with different modifiers, DRM_FORMATS, DRAW_METHODS."); > + igt_subtest_with_dynamic("draw-method") { > + for (format_idx = 0; format_idx < ARRAY_SIZE(formats); format_idx++) { > + for (method = 0; method < IGT_DRAW_METHOD_COUNT; method++) { > + for (modifier_idx = 0; modifier_idx < ARRAY_SIZE(modifiers); modifier_idx++) { > + modifier = modifiers[modifier_idx]; > + > + if (modifier == I915_FORMAT_MOD_4_TILED && > + !HAS_4TILE(intel_get_drm_devid(drm_fd))) > + continue; > + > + if (method == IGT_DRAW_MMAP_WC && !gem_mmap__has_wc(drm_fd)) > + continue; > + > + if (method == IGT_DRAW_MMAP_GTT && > + !gem_has_mappable_ggtt(drm_fd)) > + continue; > + > + if (!(format_is_supported(formats[format_idx], modifier))) ---------------------------------------------^ NIT: Please drop unnecessary braces. > + continue; > + > + igt_dynamic_f("draw-method-%s-%s-%s", -------------------------------------------------------^ Please drop "draw-method" from dynamic subtest name. > + format_str(format_idx), > + igt_draw_get_method_name(method), > + modifier_str(modifier_idx)) > + draw_method_subtest(method, format_idx, > + modifiers[modifier_idx]);--------------------------------------------------------------------^ We can use "modifier" instead of "modifiers[modifier_idx]". By addressing above comments, this patch is Reviewed-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com> - Bhanu > + } > + } > + } > + } > > igt_describe("This subtest verifies CRC after filling fb with x-tiling " > "or none."); ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-03 4:20 [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup Nidhi Gupta 2022-08-03 4:20 ` [igt-dev] [PATCH 1/2] tests/i915/kms_draw_crc: Convert tests to dynamic Nidhi Gupta @ 2022-08-03 4:20 ` Nidhi Gupta 2022-08-03 7:40 ` Modem, Bhanuprakash 2022-08-03 5:01 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/i915/kms_draw_crc: Test Cleanup (rev3) Patchwork 2022-08-03 10:54 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork 3 siblings, 1 reply; 23+ messages in thread From: Nidhi Gupta @ 2022-08-03 4:20 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta v2: -Replace drm function call with existing library functions (Bhanu) v3: -Replace PIPE_A with compatible pipe/output combo. (Bhanu) Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> --- tests/i915/kms_draw_crc.c | 67 ++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c index edab2f3b..c1e395d6 100644 --- a/tests/i915/kms_draw_crc.c +++ b/tests/i915/kms_draw_crc.c @@ -31,12 +31,13 @@ struct modeset_params { uint32_t crtc_id; - uint32_t connector_id; drmModeModeInfoPtr mode; }; int drm_fd; -drmModeResPtr drm_res; +igt_display_t display; +enum pipe pipe1; +igt_output_t *output; drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; struct buf_ops *bops; igt_pipe_crc_t *pipe_crc; @@ -64,27 +65,33 @@ struct modeset_params ms; static void find_modeset_params(void) { - int i; uint32_t crtc_id; - drmModeConnectorPtr connector = NULL; - drmModeModeInfoPtr mode = NULL; + drmModeModeInfo *mode; - for (i = 0; i < drm_res->count_connectors; i++) { - drmModeConnectorPtr c = drm_connectors[i]; + igt_display_reset(&display); + igt_display_commit(&display); - if (c->count_modes) { - connector = c; - mode = &c->modes[0]; - break; + for_each_connected_output(&display, output) { + for_each_pipe(&display, pipe1) { + if (igt_pipe_connector_valid(pipe1, output)) + /*One pipe is enough*/ + break; } + /*One output is enough*/ + break; } - igt_require(connector); - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, - 0); + igt_info("pipe-%s-%s", kmstest_pipe_name(pipe1), output->name); + + output = igt_get_single_output_for_pipe(&display, pipe1); + igt_require(output); + igt_output_set_pipe(output, pipe1); + + mode = igt_output_get_mode(output); igt_assert(mode); - ms.connector_id = connector->connector_id; + crtc_id = display.pipes[pipe1].crtc_id; + ms.crtc_id = crtc_id; ms.mode = mode; @@ -144,8 +151,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, get_color(drm_format, 0, 1, 1)); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -203,8 +209,7 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) igt_draw_fill_fb(drm_fd, &fb, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -227,8 +232,7 @@ static void fill_fb_subtest(void) IGT_DRAW_MMAP_WC, 0, 0, fb.width, fb.height, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, &base_crc); @@ -251,40 +255,25 @@ static void fill_fb_subtest(void) static void setup_environment(void) { - int i; - drm_fd = drm_open_driver_master(DRIVER_INTEL); igt_require(drm_fd >= 0); - - drm_res = drmModeGetResources(drm_fd); - igt_require(drm_res); - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); - - for (i = 0; i < drm_res->count_connectors; i++) - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, - drm_res->connectors[i]); + igt_display_require(&display, drm_fd); + igt_display_require_output(&display); kmstest_set_vt_graphics_mode(); bops = buf_ops_create(drm_fd); find_modeset_params(); - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), - INTEL_PIPE_CRC_SOURCE_AUTO); + pipe_crc = igt_pipe_crc_new(drm_fd, pipe1, INTEL_PIPE_CRC_SOURCE_AUTO); } static void teardown_environment(void) { - int i; - igt_pipe_crc_free(pipe_crc); buf_ops_destroy(bops); - for (i = 0; i < drm_res->count_connectors; i++) - drmModeFreeConnector(drm_connectors[i]); - - drmModeFreeResources(drm_res); close(drm_fd); } -- 2.26.2 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-03 4:20 ` [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup Nidhi Gupta @ 2022-08-03 7:40 ` Modem, Bhanuprakash 0 siblings, 0 replies; 23+ messages in thread From: Modem, Bhanuprakash @ 2022-08-03 7:40 UTC (permalink / raw) To: Nidhi Gupta, igt-dev On Wed-03-08-2022 09:50 am, Nidhi Gupta wrote: > v2: -Replace drm function call with existing library functions > (Bhanu) > > v3: -Replace PIPE_A with compatible pipe/output combo. > (Bhanu) > > Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> > --- > tests/i915/kms_draw_crc.c | 67 ++++++++++++++++----------------------- > 1 file changed, 28 insertions(+), 39 deletions(-) > > diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c > index edab2f3b..c1e395d6 100644 > --- a/tests/i915/kms_draw_crc.c > +++ b/tests/i915/kms_draw_crc.c > @@ -31,12 +31,13 @@ > > struct modeset_params { > uint32_t crtc_id; > - uint32_t connector_id; > drmModeModeInfoPtr mode; > }; > > int drm_fd; > -drmModeResPtr drm_res; > +igt_display_t display; > +enum pipe pipe1; > +igt_output_t *output; We are nowhere using these pipe & output except setup_environment(). So, these variables are supposed to be local to setup_environment(). > drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; > struct buf_ops *bops; > igt_pipe_crc_t *pipe_crc; > @@ -64,27 +65,33 @@ struct modeset_params ms; > > static void find_modeset_params(void) > { > - int i; > uint32_t crtc_id; > - drmModeConnectorPtr connector = NULL; > - drmModeModeInfoPtr mode = NULL; > + drmModeModeInfo *mode; > > - for (i = 0; i < drm_res->count_connectors; i++) { > - drmModeConnectorPtr c = drm_connectors[i]; > + igt_display_reset(&display); > + igt_display_commit(&display); > > - if (c->count_modes) { > - connector = c; > - mode = &c->modes[0]; > - break; > + for_each_connected_output(&display, output) { > + for_each_pipe(&display, pipe1) { > + if (igt_pipe_connector_valid(pipe1, output)) > + /*One pipe is enough*/ > + break; > } > + /*One output is enough*/ > + break; This is wrong. If no pipe is valid for first output, we need to try with next available output. Instead, use for_each_pipe_with_valid_output() or for_each_pipe_with_single_output() > } > - igt_require(connector); > > - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, > - 0); > + igt_info("pipe-%s-%s", kmstest_pipe_name(pipe1), output->name); > + > + output = igt_get_single_output_for_pipe(&display, pipe1); > + igt_require(output); > + igt_output_set_pipe(output, pipe1); > + > + mode = igt_output_get_mode(output); > igt_assert(mode); > > - ms.connector_id = connector->connector_id; > + crtc_id = display.pipes[pipe1].crtc_id; > + > ms.crtc_id = crtc_id; crtc_id is nowhere useful, please drop it. > ms.mode = mode; > > @@ -144,8 +151,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, > igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, > get_color(drm_format, 0, 1, 1)); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); hmm, Just realized that we are creating a fb and playing it, but not actually using it. So, I guess we need to set the fb to any plane before commit. Otherwise, you'll get same CRC for any modifier/method/format combo, since we are not using any framebuffer. Example: igt_plane_set_fb(primary, &fb); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); > @@ -203,8 +209,7 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) > > igt_draw_fill_fb(drm_fd, &fb, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); > @@ -227,8 +232,7 @@ static void fill_fb_subtest(void) > IGT_DRAW_MMAP_WC, > 0, 0, fb.width, fb.height, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, &base_crc); > @@ -251,40 +255,25 @@ static void fill_fb_subtest(void) > > static void setup_environment(void) > { > - int i; > - > drm_fd = drm_open_driver_master(DRIVER_INTEL); > igt_require(drm_fd >= 0); > - > - drm_res = drmModeGetResources(drm_fd); > - igt_require(drm_res); > - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); > - > - for (i = 0; i < drm_res->count_connectors; i++) > - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, > - drm_res->connectors[i]); > + igt_display_require(&display, drm_fd); > + igt_display_require_output(&display); > > kmstest_set_vt_graphics_mode(); > > bops = buf_ops_create(drm_fd); > > find_modeset_params(); > - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), > - INTEL_PIPE_CRC_SOURCE_AUTO); > + pipe_crc = igt_pipe_crc_new(drm_fd, pipe1, INTEL_PIPE_CRC_SOURCE_AUTO); We can move this statement to find_modset_parms() and drop pipe1 from global declaration. > } > > static void teardown_environment(void) > { > - int i; > - > igt_pipe_crc_free(pipe_crc); > > buf_ops_destroy(bops); > > - for (i = 0; i < drm_res->count_connectors; i++) > - drmModeFreeConnector(drm_connectors[i]); > - > - drmModeFreeResources(drm_res); igt_output_set_pipe(PIPE_NONE); or igt_display_reset(); > close(drm_fd); > } > ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for tests/i915/kms_draw_crc: Test Cleanup (rev3) 2022-08-03 4:20 [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup Nidhi Gupta 2022-08-03 4:20 ` [igt-dev] [PATCH 1/2] tests/i915/kms_draw_crc: Convert tests to dynamic Nidhi Gupta 2022-08-03 4:20 ` [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup Nidhi Gupta @ 2022-08-03 5:01 ` Patchwork 2022-08-03 10:54 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork 3 siblings, 0 replies; 23+ messages in thread From: Patchwork @ 2022-08-03 5:01 UTC (permalink / raw) To: Nidhi Gupta; +Cc: igt-dev [-- Attachment #1: Type: text/plain, Size: 10099 bytes --] == Series Details == Series: tests/i915/kms_draw_crc: Test Cleanup (rev3) URL : https://patchwork.freedesktop.org/series/106898/ State : success == Summary == CI Bug Log - changes from IGT_6610 -> IGTPW_7599 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/index.html Participating hosts (44 -> 43) ------------------------------ Additional (2): bat-dg2-8 fi-ilk-650 Missing (3): fi-ctg-p8600 fi-icl-u2 fi-hsw-4200u Known issues ------------ Here are the changes found in IGTPW_7599 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@i915_pm_rpm@basic-pci-d3-state: - fi-ilk-650: NOTRUN -> [SKIP][1] ([fdo#109271]) +19 similar issues [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/fi-ilk-650/igt@i915_pm_rpm@basic-pci-d3-state.html * igt@i915_selftest@live@hangcheck: - fi-ivb-3770: [PASS][2] -> [INCOMPLETE][3] ([i915#3303] / [i915#5370]) [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/fi-ivb-3770/igt@i915_selftest@live@hangcheck.html [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/fi-ivb-3770/igt@i915_selftest@live@hangcheck.html * igt@kms_chamelium@common-hpd-after-suspend: - fi-rkl-11600: NOTRUN -> [SKIP][4] ([fdo#111827]) [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/fi-rkl-11600/igt@kms_chamelium@common-hpd-after-suspend.html * igt@kms_chamelium@dp-hpd-fast: - fi-ilk-650: NOTRUN -> [SKIP][5] ([fdo#109271] / [fdo#111827]) +8 similar issues [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/fi-ilk-650/igt@kms_chamelium@dp-hpd-fast.html * igt@runner@aborted: - fi-ivb-3770: NOTRUN -> [FAIL][6] ([fdo#109271] / [i915#4312]) [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/fi-ivb-3770/igt@runner@aborted.html - fi-bdw-5557u: NOTRUN -> [FAIL][7] ([i915#4312]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/fi-bdw-5557u/igt@runner@aborted.html - fi-cfl-8700k: NOTRUN -> [FAIL][8] ([i915#4312]) [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/fi-cfl-8700k/igt@runner@aborted.html #### Possible fixes #### * igt@gem_exec_suspend@basic-s0@smem: - {bat-adlm-1}: [DMESG-WARN][9] ([i915#2867]) -> [PASS][10] [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/bat-adlm-1/igt@gem_exec_suspend@basic-s0@smem.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/bat-adlm-1/igt@gem_exec_suspend@basic-s0@smem.html * igt@i915_selftest@live@hangcheck: - {fi-jsl-1}: [INCOMPLETE][11] ([i915#6106]) -> [PASS][12] [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/fi-jsl-1/igt@i915_selftest@live@hangcheck.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/fi-jsl-1/igt@i915_selftest@live@hangcheck.html * igt@i915_suspend@basic-s3-without-i915: - fi-rkl-11600: [INCOMPLETE][13] ([i915#5982]) -> [PASS][14] [13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/fi-rkl-11600/igt@i915_suspend@basic-s3-without-i915.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/fi-rkl-11600/igt@i915_suspend@basic-s3-without-i915.html - fi-bdw-5557u: [INCOMPLETE][15] ([i915#146]) -> [PASS][16] [15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/fi-bdw-5557u/igt@i915_suspend@basic-s3-without-i915.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/fi-bdw-5557u/igt@i915_suspend@basic-s3-without-i915.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285 [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827 [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072 [i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155 [i915#146]: https://gitlab.freedesktop.org/drm/intel/issues/146 [i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582 [i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867 [i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291 [i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303 [i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555 [i915#3595]: https://gitlab.freedesktop.org/drm/intel/issues/3595 [i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708 [i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077 [i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079 [i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083 [i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212 [i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215 [i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312 [i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579 [i915#4873]: https://gitlab.freedesktop.org/drm/intel/issues/4873 [i915#5190]: https://gitlab.freedesktop.org/drm/intel/issues/5190 [i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274 [i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354 [i915#5370]: https://gitlab.freedesktop.org/drm/intel/issues/5370 [i915#5903]: https://gitlab.freedesktop.org/drm/intel/issues/5903 [i915#5982]: https://gitlab.freedesktop.org/drm/intel/issues/5982 [i915#6106]: https://gitlab.freedesktop.org/drm/intel/issues/6106 Build changes ------------- * CI: CI-20190529 -> None * IGT: IGT_6610 -> IGTPW_7599 CI-20190529: 20190529 CI_DRM_11963: d0b86a71849272bc47e5434cd0b0c428c1c6b2f5 @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_7599: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/index.html IGT_6610: c93f93dfe91a77e6a884f826d61f927106988b5f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git Testlist changes ---------------- +igt@kms_draw_crc@draw-method -igt@kms_draw_crc@draw-method-rgb565-blt-4tiled -igt@kms_draw_crc@draw-method-rgb565-blt-untiled -igt@kms_draw_crc@draw-method-rgb565-blt-xtiled -igt@kms_draw_crc@draw-method-rgb565-blt-ytiled -igt@kms_draw_crc@draw-method-rgb565-mmap-cpu-4tiled -igt@kms_draw_crc@draw-method-rgb565-mmap-cpu-untiled -igt@kms_draw_crc@draw-method-rgb565-mmap-cpu-xtiled -igt@kms_draw_crc@draw-method-rgb565-mmap-cpu-ytiled -igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-4tiled -igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-untiled -igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-xtiled -igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-ytiled -igt@kms_draw_crc@draw-method-rgb565-mmap-wc-4tiled -igt@kms_draw_crc@draw-method-rgb565-mmap-wc-untiled -igt@kms_draw_crc@draw-method-rgb565-mmap-wc-xtiled -igt@kms_draw_crc@draw-method-rgb565-mmap-wc-ytiled -igt@kms_draw_crc@draw-method-rgb565-pwrite-4tiled -igt@kms_draw_crc@draw-method-rgb565-pwrite-untiled -igt@kms_draw_crc@draw-method-rgb565-pwrite-xtiled -igt@kms_draw_crc@draw-method-rgb565-pwrite-ytiled -igt@kms_draw_crc@draw-method-rgb565-render-4tiled -igt@kms_draw_crc@draw-method-rgb565-render-untiled -igt@kms_draw_crc@draw-method-rgb565-render-xtiled -igt@kms_draw_crc@draw-method-rgb565-render-ytiled -igt@kms_draw_crc@draw-method-xrgb8888-blt-4tiled -igt@kms_draw_crc@draw-method-xrgb8888-blt-untiled -igt@kms_draw_crc@draw-method-xrgb8888-blt-xtiled -igt@kms_draw_crc@draw-method-xrgb8888-blt-ytiled -igt@kms_draw_crc@draw-method-xrgb8888-mmap-cpu-4tiled -igt@kms_draw_crc@draw-method-xrgb8888-mmap-cpu-untiled -igt@kms_draw_crc@draw-method-xrgb8888-mmap-cpu-xtiled -igt@kms_draw_crc@draw-method-xrgb8888-mmap-cpu-ytiled -igt@kms_draw_crc@draw-method-xrgb8888-mmap-gtt-4tiled -igt@kms_draw_crc@draw-method-xrgb8888-mmap-gtt-untiled -igt@kms_draw_crc@draw-method-xrgb8888-mmap-gtt-xtiled -igt@kms_draw_crc@draw-method-xrgb8888-mmap-gtt-ytiled -igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-4tiled -igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-untiled -igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-xtiled -igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-ytiled -igt@kms_draw_crc@draw-method-xrgb8888-pwrite-4tiled -igt@kms_draw_crc@draw-method-xrgb8888-pwrite-untiled -igt@kms_draw_crc@draw-method-xrgb8888-pwrite-xtiled -igt@kms_draw_crc@draw-method-xrgb8888-pwrite-ytiled -igt@kms_draw_crc@draw-method-xrgb8888-render-4tiled -igt@kms_draw_crc@draw-method-xrgb8888-render-untiled -igt@kms_draw_crc@draw-method-xrgb8888-render-xtiled -igt@kms_draw_crc@draw-method-xrgb8888-render-ytiled -igt@kms_draw_crc@draw-method-xrgb2101010-blt-4tiled -igt@kms_draw_crc@draw-method-xrgb2101010-blt-untiled -igt@kms_draw_crc@draw-method-xrgb2101010-blt-xtiled -igt@kms_draw_crc@draw-method-xrgb2101010-blt-ytiled -igt@kms_draw_crc@draw-method-xrgb2101010-mmap-cpu-4tiled -igt@kms_draw_crc@draw-method-xrgb2101010-mmap-cpu-untiled -igt@kms_draw_crc@draw-method-xrgb2101010-mmap-cpu-xtiled -igt@kms_draw_crc@draw-method-xrgb2101010-mmap-cpu-ytiled -igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-4tiled -igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-untiled -igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-xtiled -igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-ytiled -igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-4tiled -igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-untiled -igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-xtiled -igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-ytiled -igt@kms_draw_crc@draw-method-xrgb2101010-pwrite-4tiled -igt@kms_draw_crc@draw-method-xrgb2101010-pwrite-untiled -igt@kms_draw_crc@draw-method-xrgb2101010-pwrite-xtiled -igt@kms_draw_crc@draw-method-xrgb2101010-pwrite-ytiled -igt@kms_draw_crc@draw-method-xrgb2101010-render-4tiled -igt@kms_draw_crc@draw-method-xrgb2101010-render-untiled -igt@kms_draw_crc@draw-method-xrgb2101010-render-xtiled -igt@kms_draw_crc@draw-method-xrgb2101010-render-ytiled == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/index.html [-- Attachment #2: Type: text/html, Size: 10422 bytes --] ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] ✗ Fi.CI.IGT: failure for tests/i915/kms_draw_crc: Test Cleanup (rev3) 2022-08-03 4:20 [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup Nidhi Gupta ` (2 preceding siblings ...) 2022-08-03 5:01 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/i915/kms_draw_crc: Test Cleanup (rev3) Patchwork @ 2022-08-03 10:54 ` Patchwork 3 siblings, 0 replies; 23+ messages in thread From: Patchwork @ 2022-08-03 10:54 UTC (permalink / raw) To: Nidhi Gupta; +Cc: igt-dev [-- Attachment #1: Type: text/plain, Size: 53543 bytes --] == Series Details == Series: tests/i915/kms_draw_crc: Test Cleanup (rev3) URL : https://patchwork.freedesktop.org/series/106898/ State : failure == Summary == CI Bug Log - changes from IGT_6610_full -> IGTPW_7599_full ==================================================== Summary ------- **FAILURE** Serious unknown changes coming with IGTPW_7599_full absolutely need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in IGTPW_7599_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/index.html Participating hosts (10 -> 9) ------------------------------ Missing (1): shard-dg1 Possible new issues ------------------- Here are the unknown changes that may have been introduced in IGTPW_7599_full: ### IGT changes ### #### Possible regressions #### * igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_rc_ccs: - shard-tglb: NOTRUN -> [INCOMPLETE][1] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb8/igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_rc_ccs.html #### Suppressed #### The following results come from untrusted machines, tests, or statuses. They do not affect the overall result. * {igt@i915_pm_rps@engine-order}: - {shard-rkl}: NOTRUN -> [TIMEOUT][2] [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-2/igt@i915_pm_rps@engine-order.html New tests --------- New tests have been introduced between IGT_6610_full and IGTPW_7599_full: ### New IGT tests (1) ### * igt@kms_draw_crc@draw-method: - Statuses : 1 skip(s) - Exec time: [0.0] s Known issues ------------ Here are the changes found in IGTPW_7599_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@feature_discovery@display-4x: - shard-tglb: NOTRUN -> [SKIP][3] ([i915#1839]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb3/igt@feature_discovery@display-4x.html - shard-iclb: NOTRUN -> [SKIP][4] ([i915#1839]) [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb4/igt@feature_discovery@display-4x.html * igt@gem_ctx_persistence@hostile: - shard-snb: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#1099]) +1 similar issue [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-snb2/igt@gem_ctx_persistence@hostile.html * igt@gem_exec_balancer@parallel-bb-first: - shard-iclb: [PASS][6] -> [SKIP][7] ([i915#4525]) [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-iclb4/igt@gem_exec_balancer@parallel-bb-first.html [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb5/igt@gem_exec_balancer@parallel-bb-first.html * igt@gem_exec_balancer@parallel-keep-in-fence: - shard-iclb: NOTRUN -> [SKIP][8] ([i915#4525]) [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb7/igt@gem_exec_balancer@parallel-keep-in-fence.html * igt@gem_exec_capture@capture-invisible@smem0: - shard-iclb: NOTRUN -> [SKIP][9] ([i915#6334]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb6/igt@gem_exec_capture@capture-invisible@smem0.html - shard-tglb: NOTRUN -> [SKIP][10] ([i915#6334]) [10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb1/igt@gem_exec_capture@capture-invisible@smem0.html * igt@gem_exec_fair@basic-none-rrul@rcs0: - shard-glk: NOTRUN -> [FAIL][11] ([i915#2842]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-glk8/igt@gem_exec_fair@basic-none-rrul@rcs0.html - shard-iclb: NOTRUN -> [FAIL][12] ([i915#2852]) [12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb7/igt@gem_exec_fair@basic-none-rrul@rcs0.html - shard-tglb: NOTRUN -> [FAIL][13] ([i915#2842]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb5/igt@gem_exec_fair@basic-none-rrul@rcs0.html * igt@gem_exec_fair@basic-none@vcs1: - shard-kbl: [PASS][14] -> [FAIL][15] ([i915#2842]) +2 similar issues [14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-kbl4/igt@gem_exec_fair@basic-none@vcs1.html [15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl4/igt@gem_exec_fair@basic-none@vcs1.html * igt@gem_huc_copy@huc-copy: - shard-kbl: NOTRUN -> [SKIP][16] ([fdo#109271] / [i915#2190]) [16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl4/igt@gem_huc_copy@huc-copy.html - shard-apl: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#2190]) [17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl2/igt@gem_huc_copy@huc-copy.html - shard-glk: NOTRUN -> [SKIP][18] ([fdo#109271] / [i915#2190]) [18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-glk9/igt@gem_huc_copy@huc-copy.html - shard-iclb: NOTRUN -> [SKIP][19] ([i915#2190]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb2/igt@gem_huc_copy@huc-copy.html * igt@gem_lmem_swapping@heavy-verify-multi: - shard-apl: NOTRUN -> [SKIP][20] ([fdo#109271] / [i915#4613]) +2 similar issues [20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl8/igt@gem_lmem_swapping@heavy-verify-multi.html - shard-tglb: NOTRUN -> [SKIP][21] ([i915#4613]) [21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb5/igt@gem_lmem_swapping@heavy-verify-multi.html - shard-glk: NOTRUN -> [SKIP][22] ([fdo#109271] / [i915#4613]) [22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-glk8/igt@gem_lmem_swapping@heavy-verify-multi.html - shard-iclb: NOTRUN -> [SKIP][23] ([i915#4613]) [23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb7/igt@gem_lmem_swapping@heavy-verify-multi.html * igt@gem_lmem_swapping@verify-ccs: - shard-kbl: NOTRUN -> [SKIP][24] ([fdo#109271] / [i915#4613]) +2 similar issues [24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl7/igt@gem_lmem_swapping@verify-ccs.html * igt@gem_pxp@verify-pxp-key-change-after-suspend-resume: - shard-tglb: NOTRUN -> [SKIP][25] ([i915#4270]) [25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb2/igt@gem_pxp@verify-pxp-key-change-after-suspend-resume.html - shard-iclb: NOTRUN -> [SKIP][26] ([i915#4270]) +1 similar issue [26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb6/igt@gem_pxp@verify-pxp-key-change-after-suspend-resume.html * igt@gem_render_copy@y-tiled-ccs-to-y-tiled-mc-ccs: - shard-glk: NOTRUN -> [SKIP][27] ([fdo#109271]) +64 similar issues [27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-glk2/igt@gem_render_copy@y-tiled-ccs-to-y-tiled-mc-ccs.html - shard-iclb: NOTRUN -> [SKIP][28] ([i915#768]) +2 similar issues [28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb8/igt@gem_render_copy@y-tiled-ccs-to-y-tiled-mc-ccs.html * igt@gem_userptr_blits@readonly-unsync: - shard-tglb: NOTRUN -> [SKIP][29] ([i915#3297]) [29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb2/igt@gem_userptr_blits@readonly-unsync.html * igt@gem_userptr_blits@unsync-unmap: - shard-iclb: NOTRUN -> [SKIP][30] ([i915#3297]) +1 similar issue [30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb3/igt@gem_userptr_blits@unsync-unmap.html * igt@gem_workarounds@suspend-resume-context: - shard-apl: [PASS][31] -> [DMESG-WARN][32] ([i915#180]) +2 similar issues [31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-apl8/igt@gem_workarounds@suspend-resume-context.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl1/igt@gem_workarounds@suspend-resume-context.html * igt@gen9_exec_parse@allowed-all: - shard-glk: [PASS][33] -> [DMESG-WARN][34] ([i915#5566] / [i915#716]) [33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-glk9/igt@gen9_exec_parse@allowed-all.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-glk5/igt@gen9_exec_parse@allowed-all.html * igt@gen9_exec_parse@allowed-single: - shard-apl: [PASS][35] -> [DMESG-WARN][36] ([i915#5566] / [i915#716]) [35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-apl8/igt@gen9_exec_parse@allowed-single.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl4/igt@gen9_exec_parse@allowed-single.html * igt@gen9_exec_parse@cmd-crossing-page: - shard-tglb: NOTRUN -> [SKIP][37] ([i915#2527] / [i915#2856]) [37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb3/igt@gen9_exec_parse@cmd-crossing-page.html - shard-iclb: NOTRUN -> [SKIP][38] ([i915#2856]) +1 similar issue [38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb2/igt@gen9_exec_parse@cmd-crossing-page.html * igt@i915_pm_rc6_residency@rc6-idle@rcs0: - shard-tglb: NOTRUN -> [WARN][39] ([i915#2681]) +3 similar issues [39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb2/igt@i915_pm_rc6_residency@rc6-idle@rcs0.html - shard-iclb: NOTRUN -> [WARN][40] ([i915#2684]) +3 similar issues [40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb6/igt@i915_pm_rc6_residency@rc6-idle@rcs0.html * igt@i915_pm_rpm@modeset-non-lpsp-stress: - shard-iclb: NOTRUN -> [SKIP][41] ([fdo#110892]) [41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb5/igt@i915_pm_rpm@modeset-non-lpsp-stress.html - shard-tglb: NOTRUN -> [SKIP][42] ([fdo#111644] / [i915#1397] / [i915#2411]) [42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb8/igt@i915_pm_rpm@modeset-non-lpsp-stress.html * igt@i915_query@query-topology-unsupported: - shard-iclb: NOTRUN -> [SKIP][43] ([fdo#109302]) [43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb8/igt@i915_query@query-topology-unsupported.html * igt@kms_atomic@atomic_plane_damage: - shard-iclb: NOTRUN -> [SKIP][44] ([i915#4765]) [44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb1/igt@kms_atomic@atomic_plane_damage.html * igt@kms_big_fb@4-tiled-16bpp-rotate-90: - shard-iclb: NOTRUN -> [SKIP][45] ([i915#5286]) +4 similar issues [45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb5/igt@kms_big_fb@4-tiled-16bpp-rotate-90.html * igt@kms_big_fb@4-tiled-64bpp-rotate-270: - shard-tglb: NOTRUN -> [SKIP][46] ([i915#5286]) +2 similar issues [46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb5/igt@kms_big_fb@4-tiled-64bpp-rotate-270.html * igt@kms_big_fb@linear-32bpp-rotate-270: - shard-tglb: NOTRUN -> [SKIP][47] ([fdo#111614]) +1 similar issue [47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb1/igt@kms_big_fb@linear-32bpp-rotate-270.html - shard-iclb: NOTRUN -> [SKIP][48] ([fdo#110725] / [fdo#111614]) +2 similar issues [48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb6/igt@kms_big_fb@linear-32bpp-rotate-270.html * igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-hflip: - shard-apl: NOTRUN -> [SKIP][49] ([fdo#109271]) +119 similar issues [49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl2/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-hflip.html * igt@kms_big_fb@yf-tiled-addfb-size-offset-overflow: - shard-tglb: NOTRUN -> [SKIP][50] ([fdo#111615]) +2 similar issues [50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb5/igt@kms_big_fb@yf-tiled-addfb-size-offset-overflow.html * igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-180-hflip: - shard-iclb: NOTRUN -> [SKIP][51] ([fdo#110723]) +1 similar issue [51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb5/igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-180-hflip.html * igt@kms_ccs@pipe-a-crc-sprite-planes-basic-yf_tiled_ccs: - shard-tglb: NOTRUN -> [SKIP][52] ([fdo#111615] / [i915#3689]) +1 similar issue [52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb1/igt@kms_ccs@pipe-a-crc-sprite-planes-basic-yf_tiled_ccs.html * igt@kms_ccs@pipe-b-crc-primary-rotation-180-4_tiled_dg2_rc_ccs_cc: - shard-tglb: NOTRUN -> [SKIP][53] ([i915#6095]) [53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb1/igt@kms_ccs@pipe-b-crc-primary-rotation-180-4_tiled_dg2_rc_ccs_cc.html * igt@kms_ccs@pipe-b-crc-sprite-planes-basic-4_tiled_dg2_rc_ccs_cc: - shard-tglb: NOTRUN -> [SKIP][54] ([i915#3689] / [i915#6095]) +2 similar issues [54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb3/igt@kms_ccs@pipe-b-crc-sprite-planes-basic-4_tiled_dg2_rc_ccs_cc.html * igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc: - shard-kbl: NOTRUN -> [SKIP][55] ([fdo#109271] / [i915#3886]) +3 similar issues [55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl1/igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html * igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc: - shard-glk: NOTRUN -> [SKIP][56] ([fdo#109271] / [i915#3886]) [56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-glk1/igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc.html - shard-iclb: NOTRUN -> [SKIP][57] ([fdo#109278] / [i915#3886]) +1 similar issue [57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb5/igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc.html - shard-apl: NOTRUN -> [SKIP][58] ([fdo#109271] / [i915#3886]) +2 similar issues [58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl4/igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc.html * igt@kms_ccs@pipe-d-ccs-on-another-bo-y_tiled_gen12_mc_ccs: - shard-tglb: NOTRUN -> [SKIP][59] ([i915#3689]) +1 similar issue [59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb8/igt@kms_ccs@pipe-d-ccs-on-another-bo-y_tiled_gen12_mc_ccs.html * igt@kms_cdclk@mode-transition: - shard-iclb: NOTRUN -> [SKIP][60] ([i915#3742]) [60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb4/igt@kms_cdclk@mode-transition.html - shard-tglb: NOTRUN -> [SKIP][61] ([i915#3742]) [61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb5/igt@kms_cdclk@mode-transition.html * igt@kms_color_chamelium@pipe-b-degamma: - shard-apl: NOTRUN -> [SKIP][62] ([fdo#109271] / [fdo#111827]) +3 similar issues [62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl6/igt@kms_color_chamelium@pipe-b-degamma.html - shard-iclb: NOTRUN -> [SKIP][63] ([fdo#109284] / [fdo#111827]) +3 similar issues [63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb4/igt@kms_color_chamelium@pipe-b-degamma.html * igt@kms_color_chamelium@pipe-d-ctm-0-25: - shard-tglb: NOTRUN -> [SKIP][64] ([fdo#109284] / [fdo#111827]) +2 similar issues [64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb8/igt@kms_color_chamelium@pipe-d-ctm-0-25.html - shard-glk: NOTRUN -> [SKIP][65] ([fdo#109271] / [fdo#111827]) +2 similar issues [65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-glk3/igt@kms_color_chamelium@pipe-d-ctm-0-25.html - shard-iclb: NOTRUN -> [SKIP][66] ([fdo#109278] / [fdo#109284] / [fdo#111827]) +1 similar issue [66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb7/igt@kms_color_chamelium@pipe-d-ctm-0-25.html - shard-kbl: NOTRUN -> [SKIP][67] ([fdo#109271] / [fdo#111827]) +6 similar issues [67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl1/igt@kms_color_chamelium@pipe-d-ctm-0-25.html - shard-snb: NOTRUN -> [SKIP][68] ([fdo#109271] / [fdo#111827]) +2 similar issues [68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-snb4/igt@kms_color_chamelium@pipe-d-ctm-0-25.html * igt@kms_content_protection@legacy: - shard-apl: NOTRUN -> [TIMEOUT][69] ([i915#1319]) +1 similar issue [69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl7/igt@kms_content_protection@legacy.html - shard-tglb: NOTRUN -> [SKIP][70] ([i915#1063]) [70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb3/igt@kms_content_protection@legacy.html - shard-iclb: NOTRUN -> [SKIP][71] ([fdo#109300] / [fdo#111066]) +1 similar issue [71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb6/igt@kms_content_protection@legacy.html - shard-kbl: NOTRUN -> [TIMEOUT][72] ([i915#1319]) +1 similar issue [72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl7/igt@kms_content_protection@legacy.html * igt@kms_cursor_legacy@2x-cursor-vs-flip-legacy: - shard-iclb: NOTRUN -> [SKIP][73] ([fdo#109274]) +1 similar issue [73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb3/igt@kms_cursor_legacy@2x-cursor-vs-flip-legacy.html - shard-tglb: NOTRUN -> [SKIP][74] ([fdo#109274] / [fdo#111825]) [74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb5/igt@kms_cursor_legacy@2x-cursor-vs-flip-legacy.html * igt@kms_dp_tiled_display@basic-test-pattern-with-chamelium: - shard-iclb: NOTRUN -> [SKIP][75] ([i915#3528]) [75]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb2/igt@kms_dp_tiled_display@basic-test-pattern-with-chamelium.html * {igt@kms_draw_crc@draw-method} (NEW): - {shard-rkl}: NOTRUN -> [SKIP][76] ([i915#4098]) [76]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-2/igt@kms_draw_crc@draw-method.html * igt@kms_fbcon_fbt@fbc-suspend: - shard-kbl: NOTRUN -> [FAIL][77] ([i915#4767]) [77]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl7/igt@kms_fbcon_fbt@fbc-suspend.html * igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1: - shard-glk: [PASS][78] -> [FAIL][79] ([i915#79]) [78]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-glk5/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1.html [79]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-glk8/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1.html * igt@kms_flip@flip-vs-suspend-interruptible@a-dp1: - shard-apl: NOTRUN -> [DMESG-WARN][80] ([i915#180]) [80]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl6/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html * igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-64bpp-yftile-upscaling@pipe-a-default-mode: - shard-iclb: NOTRUN -> [SKIP][81] ([i915#2672]) +6 similar issues [81]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb3/igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-64bpp-yftile-upscaling@pipe-a-default-mode.html * igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-64bpp-yftile-upscaling@pipe-a-valid-mode: - shard-tglb: NOTRUN -> [SKIP][82] ([i915#2672]) [82]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb5/igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-64bpp-yftile-upscaling@pipe-a-valid-mode.html * igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-default-mode: - shard-iclb: NOTRUN -> [SKIP][83] ([i915#2672] / [i915#3555]) [83]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-default-mode.html * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt: - shard-tglb: NOTRUN -> [SKIP][84] ([i915#6497]) +6 similar issues [84]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt.html * igt@kms_frontbuffer_tracking@fbcpsr-badstride: - shard-iclb: [PASS][85] -> [FAIL][86] ([i915#1888] / [i915#2546]) [85]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-iclb6/igt@kms_frontbuffer_tracking@fbcpsr-badstride.html [86]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-badstride.html * igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-mmap-gtt: - shard-kbl: NOTRUN -> [SKIP][87] ([fdo#109271]) +145 similar issues [87]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl7/igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-mmap-gtt.html * igt@kms_frontbuffer_tracking@psr-2p-scndscrn-indfb-pgflip-blt: - shard-iclb: NOTRUN -> [SKIP][88] ([fdo#109280]) +17 similar issues [88]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb2/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-indfb-pgflip-blt.html * igt@kms_frontbuffer_tracking@psr-2p-scndscrn-pri-indfb-draw-pwrite: - shard-tglb: NOTRUN -> [SKIP][89] ([fdo#109280] / [fdo#111825]) +13 similar issues [89]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb5/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-pri-indfb-draw-pwrite.html * igt@kms_hdr@static-swap: - shard-tglb: NOTRUN -> [SKIP][90] ([i915#3555]) [90]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb5/igt@kms_hdr@static-swap.html - shard-iclb: NOTRUN -> [SKIP][91] ([i915#3555]) +1 similar issue [91]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb7/igt@kms_hdr@static-swap.html * igt@kms_pipe_b_c_ivb@pipe-b-double-modeset-then-modeset-pipe-c: - shard-tglb: NOTRUN -> [SKIP][92] ([fdo#109289]) +2 similar issues [92]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb8/igt@kms_pipe_b_c_ivb@pipe-b-double-modeset-then-modeset-pipe-c.html - shard-iclb: NOTRUN -> [SKIP][93] ([fdo#109289]) +2 similar issues [93]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb2/igt@kms_pipe_b_c_ivb@pipe-b-double-modeset-then-modeset-pipe-c.html * igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb: - shard-apl: NOTRUN -> [FAIL][94] ([fdo#108145] / [i915#265]) +1 similar issue [94]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl3/igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb.html - shard-kbl: NOTRUN -> [FAIL][95] ([fdo#108145] / [i915#265]) [95]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl1/igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb.html * igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb: - shard-apl: NOTRUN -> [FAIL][96] ([i915#265]) [96]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl6/igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb.html - shard-glk: NOTRUN -> [FAIL][97] ([i915#265]) [97]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-glk8/igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb.html - shard-kbl: NOTRUN -> [FAIL][98] ([i915#265]) [98]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl1/igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb.html * igt@kms_plane_multiple@atomic-pipe-b-tiling-4: - shard-tglb: NOTRUN -> [SKIP][99] ([i915#5288]) [99]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb2/igt@kms_plane_multiple@atomic-pipe-b-tiling-4.html * igt@kms_plane_scaling@planes-downscale-factor-0-5@pipe-a-edp-1: - shard-iclb: [PASS][100] -> [SKIP][101] ([i915#5235]) +2 similar issues [100]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-iclb3/igt@kms_plane_scaling@planes-downscale-factor-0-5@pipe-a-edp-1.html [101]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb2/igt@kms_plane_scaling@planes-downscale-factor-0-5@pipe-a-edp-1.html * igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area: - shard-kbl: NOTRUN -> [SKIP][102] ([fdo#109271] / [i915#658]) [102]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl4/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area.html * igt@kms_psr@psr2_cursor_blt: - shard-iclb: [PASS][103] -> [SKIP][104] ([fdo#109441]) +1 similar issue [103]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html [104]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb6/igt@kms_psr@psr2_cursor_blt.html * igt@kms_psr@psr2_cursor_mmap_gtt: - shard-tglb: NOTRUN -> [FAIL][105] ([i915#132] / [i915#3467]) +1 similar issue [105]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb7/igt@kms_psr@psr2_cursor_mmap_gtt.html * igt@kms_psr@psr2_sprite_mmap_gtt: - shard-iclb: NOTRUN -> [SKIP][106] ([fdo#109441]) +2 similar issues [106]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb4/igt@kms_psr@psr2_sprite_mmap_gtt.html * igt@kms_psr_stress_test@flip-primary-invalidate-overlay: - shard-tglb: [PASS][107] -> [SKIP][108] ([i915#5519]) [107]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-tglb2/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html [108]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb5/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html - shard-iclb: [PASS][109] -> [SKIP][110] ([i915#5519]) +1 similar issue [109]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-iclb4/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html [110]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb4/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html * igt@kms_tv_load_detect@load-detect: - shard-snb: NOTRUN -> [SKIP][111] ([fdo#109271]) +117 similar issues [111]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-snb2/igt@kms_tv_load_detect@load-detect.html - shard-tglb: NOTRUN -> [SKIP][112] ([fdo#109309]) [112]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb2/igt@kms_tv_load_detect@load-detect.html - shard-iclb: NOTRUN -> [SKIP][113] ([fdo#109309]) [113]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb8/igt@kms_tv_load_detect@load-detect.html * igt@kms_vblank@pipe-a-ts-continuation-suspend: - shard-kbl: [PASS][114] -> [DMESG-WARN][115] ([i915#180]) +3 similar issues [114]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-kbl1/igt@kms_vblank@pipe-a-ts-continuation-suspend.html [115]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl4/igt@kms_vblank@pipe-a-ts-continuation-suspend.html * igt@kms_vblank@pipe-d-ts-continuation-idle: - shard-iclb: NOTRUN -> [SKIP][116] ([fdo#109278]) +25 similar issues [116]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb5/igt@kms_vblank@pipe-d-ts-continuation-idle.html * igt@nouveau_crc@ctx-flip-threshold-reset-after-capture: - shard-tglb: NOTRUN -> [SKIP][117] ([i915#2530]) [117]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb7/igt@nouveau_crc@ctx-flip-threshold-reset-after-capture.html * igt@nouveau_crc@pipe-c-source-outp-inactive: - shard-iclb: NOTRUN -> [SKIP][118] ([i915#2530]) +2 similar issues [118]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb5/igt@nouveau_crc@pipe-c-source-outp-inactive.html * igt@prime_nv_api@nv_self_import_to_different_fd: - shard-iclb: NOTRUN -> [SKIP][119] ([fdo#109291]) +1 similar issue [119]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb1/igt@prime_nv_api@nv_self_import_to_different_fd.html * igt@prime_nv_pcopy@test2: - shard-tglb: NOTRUN -> [SKIP][120] ([fdo#109291]) +1 similar issue [120]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb7/igt@prime_nv_pcopy@test2.html * igt@prime_vgem@coherency-gtt: - shard-iclb: NOTRUN -> [SKIP][121] ([fdo#109292] / [fdo#109295]) [121]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb2/igt@prime_vgem@coherency-gtt.html - shard-tglb: NOTRUN -> [SKIP][122] ([fdo#109295] / [fdo#111656]) [122]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb7/igt@prime_vgem@coherency-gtt.html * igt@prime_vgem@fence-flip-hang: - shard-iclb: NOTRUN -> [SKIP][123] ([fdo#109295]) [123]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb5/igt@prime_vgem@fence-flip-hang.html * igt@sysfs_clients@split-10: - shard-kbl: NOTRUN -> [SKIP][124] ([fdo#109271] / [i915#2994]) [124]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl7/igt@sysfs_clients@split-10.html #### Possible fixes #### * igt@fbdev@write: - {shard-rkl}: [SKIP][125] ([i915#2582]) -> [PASS][126] [125]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-1/igt@fbdev@write.html [126]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-2/igt@fbdev@write.html * igt@gem_exec_balancer@fairslice: - {shard-rkl}: [SKIP][127] ([i915#6259]) -> [PASS][128] [127]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-5/igt@gem_exec_balancer@fairslice.html [128]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-1/igt@gem_exec_balancer@fairslice.html * igt@gem_exec_balancer@parallel-out-fence: - shard-iclb: [SKIP][129] ([i915#4525]) -> [PASS][130] [129]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-iclb3/igt@gem_exec_balancer@parallel-out-fence.html [130]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb1/igt@gem_exec_balancer@parallel-out-fence.html * igt@gem_exec_fair@basic-none-share@rcs0: - shard-tglb: [FAIL][131] ([i915#2842]) -> [PASS][132] +1 similar issue [131]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-tglb5/igt@gem_exec_fair@basic-none-share@rcs0.html [132]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb2/igt@gem_exec_fair@basic-none-share@rcs0.html - shard-glk: [FAIL][133] ([i915#2842]) -> [PASS][134] [133]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-glk6/igt@gem_exec_fair@basic-none-share@rcs0.html [134]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-glk2/igt@gem_exec_fair@basic-none-share@rcs0.html * igt@gem_exec_fair@basic-pace-share@rcs0: - {shard-tglu}: [FAIL][135] ([i915#2842]) -> [PASS][136] [135]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-tglu-4/igt@gem_exec_fair@basic-pace-share@rcs0.html [136]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglu-2/igt@gem_exec_fair@basic-pace-share@rcs0.html * igt@gem_exec_fair@basic-throttle@rcs0: - shard-iclb: [FAIL][137] ([i915#2849]) -> [PASS][138] [137]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-iclb8/igt@gem_exec_fair@basic-throttle@rcs0.html [138]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb6/igt@gem_exec_fair@basic-throttle@rcs0.html * igt@gem_exec_reloc@basic-write-read: - {shard-rkl}: [SKIP][139] ([i915#3281]) -> [PASS][140] +6 similar issues [139]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-1/igt@gem_exec_reloc@basic-write-read.html [140]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-5/igt@gem_exec_reloc@basic-write-read.html * igt@gem_mmap_wc@set-cache-level: - {shard-rkl}: [SKIP][141] ([i915#1850]) -> [PASS][142] [141]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-5/igt@gem_mmap_wc@set-cache-level.html [142]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-6/igt@gem_mmap_wc@set-cache-level.html * igt@gem_pread@snoop: - {shard-rkl}: [SKIP][143] ([i915#3282]) -> [PASS][144] +5 similar issues [143]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-6/igt@gem_pread@snoop.html [144]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-5/igt@gem_pread@snoop.html * igt@gem_workarounds@suspend-resume-context: - {shard-tglu}: [DMESG-WARN][145] ([i915#5122]) -> [PASS][146] [145]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-tglu-6/igt@gem_workarounds@suspend-resume-context.html [146]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglu-2/igt@gem_workarounds@suspend-resume-context.html * igt@gen9_exec_parse@bb-start-param: - {shard-rkl}: [SKIP][147] ([i915#2527]) -> [PASS][148] [147]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-6/igt@gen9_exec_parse@bb-start-param.html [148]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-5/igt@gen9_exec_parse@bb-start-param.html * igt@i915_pm_dc@dc6-psr: - {shard-rkl}: [SKIP][149] ([i915#658]) -> [PASS][150] [149]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-1/igt@i915_pm_dc@dc6-psr.html [150]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-6/igt@i915_pm_dc@dc6-psr.html * igt@i915_pm_rpm@fences: - shard-iclb: [INCOMPLETE][151] ([i915#4185]) -> [PASS][152] [151]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-iclb4/igt@i915_pm_rpm@fences.html [152]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb8/igt@i915_pm_rpm@fences.html * igt@i915_pm_rpm@i2c: - {shard-rkl}: [SKIP][153] ([fdo#109308]) -> [PASS][154] [153]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-5/igt@i915_pm_rpm@i2c.html [154]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-6/igt@i915_pm_rpm@i2c.html * igt@i915_suspend@fence-restore-untiled: - shard-kbl: [DMESG-WARN][155] ([i915#180]) -> [PASS][156] +5 similar issues [155]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-kbl4/igt@i915_suspend@fence-restore-untiled.html [156]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl7/igt@i915_suspend@fence-restore-untiled.html * igt@kms_atomic@plane-primary-legacy: - {shard-rkl}: [SKIP][157] ([i915#1845] / [i915#4098]) -> [PASS][158] +16 similar issues [157]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-5/igt@kms_atomic@plane-primary-legacy.html [158]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-6/igt@kms_atomic@plane-primary-legacy.html * igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size: - shard-glk: [FAIL][159] ([i915#2346]) -> [PASS][160] [159]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-glk7/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size.html [160]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-glk8/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size.html * igt@kms_fbcon_fbt@psr: - {shard-rkl}: [SKIP][161] ([fdo#110189] / [i915#3955]) -> [PASS][162] [161]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-1/igt@kms_fbcon_fbt@psr.html [162]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-6/igt@kms_fbcon_fbt@psr.html * igt@kms_flip@2x-plain-flip-ts-check-interruptible@ac-hdmi-a1-hdmi-a2: - shard-glk: [FAIL][163] ([i915#2122]) -> [PASS][164] [163]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-glk5/igt@kms_flip@2x-plain-flip-ts-check-interruptible@ac-hdmi-a1-hdmi-a2.html [164]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-glk6/igt@kms_flip@2x-plain-flip-ts-check-interruptible@ac-hdmi-a1-hdmi-a2.html * igt@kms_frontbuffer_tracking@psr-rgb565-draw-blt: - shard-tglb: [INCOMPLETE][165] -> [PASS][166] [165]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-tglb8/igt@kms_frontbuffer_tracking@psr-rgb565-draw-blt.html [166]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb1/igt@kms_frontbuffer_tracking@psr-rgb565-draw-blt.html * igt@kms_frontbuffer_tracking@psr-rgb565-draw-render: - {shard-rkl}: [SKIP][167] ([i915#1849] / [i915#4098]) -> [PASS][168] +17 similar issues [167]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-5/igt@kms_frontbuffer_tracking@psr-rgb565-draw-render.html [168]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-6/igt@kms_frontbuffer_tracking@psr-rgb565-draw-render.html * igt@kms_hdr@bpc-switch@pipe-a-dp-1: - shard-kbl: [FAIL][169] ([i915#1188]) -> [PASS][170] [169]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-kbl7/igt@kms_hdr@bpc-switch@pipe-a-dp-1.html [170]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-kbl1/igt@kms_hdr@bpc-switch@pipe-a-dp-1.html * igt@kms_plane@plane-panning-bottom-right@pipe-b-planes: - {shard-rkl}: [SKIP][171] ([i915#1849] / [i915#3558]) -> [PASS][172] +1 similar issue [171]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-2/igt@kms_plane@plane-panning-bottom-right@pipe-b-planes.html [172]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-6/igt@kms_plane@plane-panning-bottom-right@pipe-b-planes.html * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min: - {shard-rkl}: [SKIP][173] ([i915#1849] / [i915#3546] / [i915#4070] / [i915#4098]) -> [PASS][174] [173]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-1/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html [174]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-6/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html * igt@kms_properties@crtc-properties-legacy: - {shard-rkl}: [SKIP][175] ([i915#1849]) -> [PASS][176] [175]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-1/igt@kms_properties@crtc-properties-legacy.html [176]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-6/igt@kms_properties@crtc-properties-legacy.html * igt@kms_psr@no_drrs: - {shard-rkl}: [SKIP][177] ([i915#1072]) -> [PASS][178] +1 similar issue [177]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-4/igt@kms_psr@no_drrs.html [178]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-6/igt@kms_psr@no_drrs.html * igt@kms_psr@psr2_no_drrs: - shard-iclb: [SKIP][179] ([fdo#109441]) -> [PASS][180] [179]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-iclb7/igt@kms_psr@psr2_no_drrs.html [180]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb2/igt@kms_psr@psr2_no_drrs.html * igt@kms_universal_plane@universal-plane-pipe-a-functional: - {shard-rkl}: [SKIP][181] ([i915#1845] / [i915#4070] / [i915#4098]) -> [PASS][182] +1 similar issue [181]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-1/igt@kms_universal_plane@universal-plane-pipe-a-functional.html [182]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-6/igt@kms_universal_plane@universal-plane-pipe-a-functional.html * igt@kms_vblank@pipe-a-ts-continuation-suspend: - shard-apl: [DMESG-WARN][183] ([i915#180]) -> [PASS][184] [183]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-apl1/igt@kms_vblank@pipe-a-ts-continuation-suspend.html [184]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl7/igt@kms_vblank@pipe-a-ts-continuation-suspend.html * igt@prime_vgem@basic-fence-flip: - {shard-rkl}: [SKIP][185] ([fdo#109295] / [i915#3708] / [i915#4098]) -> [PASS][186] [185]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-rkl-1/igt@prime_vgem@basic-fence-flip.html [186]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-rkl-6/igt@prime_vgem@basic-fence-flip.html #### Warnings #### * igt@kms_content_protection@mei_interface: - shard-tglb: [SKIP][187] ([fdo#109300]) -> [SKIP][188] ([i915#1063]) [187]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-tglb8/igt@kms_content_protection@mei_interface.html [188]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-tglb8/igt@kms_content_protection@mei_interface.html - shard-iclb: [SKIP][189] ([fdo#109300]) -> [SKIP][190] ([fdo#109300] / [fdo#111066]) [189]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-iclb3/igt@kms_content_protection@mei_interface.html [190]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb3/igt@kms_content_protection@mei_interface.html * igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-sf: - shard-iclb: [SKIP][191] ([i915#658]) -> [SKIP][192] ([i915#2920]) [191]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-iclb8/igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-sf.html [192]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb2/igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-sf.html * igt@kms_psr2_sf@primary-plane-update-sf-dmg-area: - shard-iclb: [SKIP][193] ([fdo#111068] / [i915#658]) -> [SKIP][194] ([i915#2920]) +1 similar issue [193]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-iclb1/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area.html [194]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area.html * igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-big-fb: - shard-iclb: [SKIP][195] ([i915#2920]) -> [SKIP][196] ([i915#658]) +1 similar issue [195]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-big-fb.html [196]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-iclb1/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-big-fb.html * igt@runner@aborted: - shard-apl: ([FAIL][197], [FAIL][198], [FAIL][199], [FAIL][200]) ([i915#180] / [i915#3002] / [i915#4312] / [i915#5257]) -> ([FAIL][201], [FAIL][202], [FAIL][203], [FAIL][204], [FAIL][205], [FAIL][206], [FAIL][207]) ([fdo#109271] / [i915#180] / [i915#3002] / [i915#4312] / [i915#5257]) [197]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-apl6/igt@runner@aborted.html [198]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-apl1/igt@runner@aborted.html [199]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-apl1/igt@runner@aborted.html [200]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_6610/shard-apl8/igt@runner@aborted.html [201]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl6/igt@runner@aborted.html [202]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl6/igt@runner@aborted.html [203]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl6/igt@runner@aborted.html [204]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl4/igt@runner@aborted.html [205]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl6/igt@runner@aborted.html [206]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl8/igt@runner@aborted.html [207]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/shard-apl1/igt@runner@aborted.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [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#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280 [fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284 [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285 [fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289 [fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291 [fdo#109292]: https://bugs.freedesktop.org/show_bug.cgi?id=109292 [fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295 [fdo#109300]: https://bugs.freedesktop.org/show_bug.cgi?id=109300 [fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302 [fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308 [fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309 [fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312 [fdo#109313]: https://bugs.freedesktop.org/show_bug.cgi?id=109313 [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 [fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189 [fdo#110542]: https://bugs.freedesktop.org/show_bug.cgi?id=110542 [fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723 [fdo#110725]: https://bugs.freedesktop.org/show_bug.cgi?id=110725 [fdo#110892]: https://bugs.freedesktop.org/show_bug.cgi?id=110892 [fdo#111066]: https://bugs.freedesktop.org/show_bug.cgi?id=111066 [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068 [fdo#111314]: https://bugs.freedesktop.org/show_bug.cgi?id=111314 [fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614 [fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615 [fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644 [fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656 [fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825 [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827 [fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283 [i915#1063]: https://gitlab.freedesktop.org/drm/intel/issues/1063 [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072 [i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099 [i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155 [i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188 [i915#1257]: https://gitlab.freedesktop.org/drm/intel/issues/1257 [i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319 [i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132 [i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397 [i915#1722]: https://gitlab.freedesktop.org/drm/intel/issues/1722 [i915#1769]: https://gitlab.freedesktop.org/drm/intel/issues/1769 [i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180 [i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825 [i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839 [i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845 [i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849 [i915#1850]: https://gitlab.freedesktop.org/drm/intel/issues/1850 [i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888 [i915#1911]: https://gitlab.freedesktop.org/drm/intel/issues/1911 [i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122 [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190 [i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346 [i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411 [i915#2433]: https://gitlab.freedesktop.org/drm/intel/issues/2433 [i915#2435]: https://gitlab.freedesktop.org/drm/intel/issues/2435 [i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527 [i915#2530]: https://gitlab.freedesktop.org/drm/intel/issues/2530 [i915#2546]: https://gitlab.freedesktop.org/drm/intel/issues/2546 [i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582 [i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265 [i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672 [i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681 [i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684 [i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705 [i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280 [i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842 [i915#2849]: https://gitlab.freedesktop.org/drm/intel/issues/2849 [i915#2852]: https://gitlab.freedesktop.org/drm/intel/issues/2852 [i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856 [i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920 [i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994 [i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002 [i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012 [i915#3063]: https://gitlab.freedesktop.org/drm/intel/issues/3063 [i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116 [i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281 [i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282 [i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291 [i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297 [i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299 [i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323 [i915#3467]: https://gitlab.freedesktop.org/drm/intel/issues/3467 [i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469 [i915#3528]: https://gitlab.freedesktop.org/drm/intel/issues/3528 [i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546 [i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555 [i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558 [i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591 [i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637 [i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638 [i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689 [i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708 [i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734 [i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742 [i915#3810]: https://gitlab.freedesktop.org/drm/intel/issues/3810 [i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886 [i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955 [i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070 [i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098 [i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103 [i915#4185]: https://gitlab.freedesktop.org/drm/intel/issues/4185 [i915#426]: https://gitlab.freedesktop.org/drm/intel/issues/426 [i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270 [i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312 [i915#4369]: https://gitlab.freedesktop.org/drm/intel/issues/4369 [i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525 [i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613 [i915#4765]: https://gitlab.freedesktop.org/drm/intel/issues/4765 [i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767 [i915#4991]: https://gitlab.freedesktop.org/drm/intel/issues/4991 [i915#5122]: https://gitlab.freedesktop.org/drm/intel/issues/5122 [i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176 [i915#5182]: https://gitlab.freedesktop.org/drm/intel/issues/5182 [i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235 [i915#5257]: https://gitlab.freedesktop.org/drm/intel/issues/5257 [i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286 [i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288 [i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325 [i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533 [i915#5519]: https://gitlab.freedesktop.org/drm/intel/issues/5519 [i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566 [i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095 [i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248 [i915#6252]: https://gitlab.freedesktop.org/drm/intel/issues/6252 [i915#6258]: https://gitlab.freedesktop.org/drm/intel/issues/6258 [i915#6259]: https://gitlab.freedesktop.org/drm/intel/issues/6259 [i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268 [i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334 [i915#6335]: https://gitlab.freedesktop.org/drm/intel/issues/6335 [i915#6344]: https://gitlab.freedesktop.org/drm/intel/issues/6344 [i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433 [i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497 [i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524 [i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658 [i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716 [i915#768]: https://gitlab.freedesktop.org/drm/intel/issues/768 [i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79 Build changes ------------- * CI: CI-20190529 -> None * IGT: IGT_6610 -> IGTPW_7599 CI-20190529: 20190529 CI_DRM_11963: d0b86a71849272bc47e5434cd0b0c428c1c6b2f5 @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_7599: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/index.html IGT_6610: c93f93dfe91a77e6a884f826d61f927106988b5f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7599/index.html [-- Attachment #2: Type: text/html, Size: 62917 bytes --] ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup @ 2022-09-05 11:24 Nidhi Gupta 2022-09-05 11:24 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 0 siblings, 1 reply; 23+ messages in thread From: Nidhi Gupta @ 2022-09-05 11:24 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta Convert all possible subtests to dynamic and replace drm function call with existing library functions. Nidhi Gupta (2): tests/i915/kms_draw_crc: Convert tests to dynamic tests/i915/kms_draw_crc: Test Cleanup tests/i915/kms_draw_crc.c | 161 +++++++++++++++----------------------- 1 file changed, 64 insertions(+), 97 deletions(-) -- 2.36.0 ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-09-05 11:24 [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup Nidhi Gupta @ 2022-09-05 11:24 ` Nidhi Gupta 0 siblings, 0 replies; 23+ messages in thread From: Nidhi Gupta @ 2022-09-05 11:24 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta v2: -Replace drm function call with existing library functions (Bhanu) v3: -Replace PIPE_A with compatible pipe/output combo. (Bhanu) v4: -use for_each_pipe_with_single_output() for finding compatible pipe/ouput combo. -remove crtc_id as not used anywhere. -set fb to primary plane before commiting. (Bhanu) v5: -set fb to primary plane before commiting for fill_fb_subtest() also. -use existing IGT lib helper igt_display_has_format_mod() instead of format_is_supported(). (Bhanu) -added igt_display_fini(..) for cleanup (Juha-Pekka Heikkila) v6: -replace each_pipe_with_single_output() with each_pipe_with_valid_output (Bhanu) Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> Reviewed-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com> --- tests/i915/kms_draw_crc.c | 113 ++++++++++++-------------------------- 1 file changed, 36 insertions(+), 77 deletions(-) diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c index 380be11b..b99f348d 100644 --- a/tests/i915/kms_draw_crc.c +++ b/tests/i915/kms_draw_crc.c @@ -29,15 +29,10 @@ #define MAX_CONNECTORS 32 -struct modeset_params { - uint32_t crtc_id; - uint32_t connector_id; - drmModeModeInfoPtr mode; -}; - int drm_fd; -drmModeResPtr drm_res; -drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; +igt_display_t display; +igt_output_t *output; +drmModeModeInfoPtr mode; struct buf_ops *bops; igt_pipe_crc_t *pipe_crc; @@ -60,34 +55,24 @@ struct base_crc { }; struct base_crc base_crcs[ARRAY_SIZE(formats)]; -struct modeset_params ms; - static void find_modeset_params(void) { - int i; - uint32_t crtc_id; - drmModeConnectorPtr connector = NULL; - drmModeModeInfoPtr mode = NULL; - - for (i = 0; i < drm_res->count_connectors; i++) { - drmModeConnectorPtr c = drm_connectors[i]; - - if (c->count_modes) { - connector = c; - mode = &c->modes[0]; - break; - } - } - igt_require(connector); + enum pipe pipe; - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, - 0); - igt_assert(mode); + igt_display_reset(&display); + igt_display_commit(&display); - ms.connector_id = connector->connector_id; - ms.crtc_id = crtc_id; - ms.mode = mode; + for_each_pipe_with_valid_output(&display, pipe, output) { + igt_output_set_pipe(output, pipe); + mode = igt_output_get_mode(output); + if (!mode) + continue; + + pipe_crc = igt_pipe_crc_new(drm_fd, pipe, INTEL_PIPE_CRC_SOURCE_AUTO); + /*Only one pipe/output is enough*/ + break; + } } static uint32_t get_color(uint32_t drm_format, bool r, bool g, bool b) @@ -122,9 +107,14 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, { struct igt_fb fb; int rc; + igt_plane_t *primary; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); + + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, drm_format, modifier, &fb); + igt_plane_set_fb(primary, &fb); + igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 0, 0, fb.width, fb.height, get_color(drm_format, 0, 0, 1)); @@ -144,8 +134,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, get_color(drm_format, 0, 1, 1)); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -153,25 +142,6 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_remove_fb(drm_fd, &fb); } -static bool format_is_supported(uint32_t format, uint64_t modifier) -{ - uint32_t gem_handle, fb_id; - unsigned int offsets[4] = {}; - unsigned int strides[4] = {}; - int ret; - - gem_handle = igt_create_bo_with_dimensions(drm_fd, 64, 64, - format, modifier, - 0, NULL, &strides[0], NULL); - ret = __kms_addfb(drm_fd, gem_handle, 64, 64, - format, modifier, strides, offsets, 1, - DRM_MODE_FB_MODIFIERS, &fb_id); - drmModeRmFB(drm_fd, fb_id); - gem_close(drm_fd, gem_handle); - - return ret == 0; -} - static void draw_method_subtest(enum igt_draw_method method, uint32_t format_index, uint64_t modifier) { @@ -198,13 +168,12 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) struct igt_fb fb; int rc; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, modifier, &fb); igt_draw_fill_fb(drm_fd, &fb, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -217,18 +186,22 @@ static void fill_fb_subtest(void) int rc; struct igt_fb fb; igt_crc_t base_crc, crc; + igt_plane_t *primary; bool has_4tile = intel_get_device_info(intel_get_drm_devid(drm_fd))->has_4tile; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); + + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &fb); + igt_plane_set_fb(primary, &fb); + igt_draw_rect_fb(drm_fd, bops, 0, &fb, gem_has_mappable_ggtt(drm_fd) ? IGT_DRAW_MMAP_GTT : IGT_DRAW_MMAP_WC, 0, 0, fb.width, fb.height, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, &base_crc); @@ -251,40 +224,26 @@ static void fill_fb_subtest(void) static void setup_environment(void) { - int i; - drm_fd = drm_open_driver_master(DRIVER_INTEL); igt_require(drm_fd >= 0); - - drm_res = drmModeGetResources(drm_fd); - igt_require(drm_res); - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); - - for (i = 0; i < drm_res->count_connectors; i++) - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, - drm_res->connectors[i]); + igt_display_require(&display, drm_fd); + igt_display_require_output(&display); kmstest_set_vt_graphics_mode(); bops = buf_ops_create(drm_fd); find_modeset_params(); - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), - INTEL_PIPE_CRC_SOURCE_AUTO); } static void teardown_environment(void) { - int i; + igt_display_fini(&display); igt_pipe_crc_free(pipe_crc); buf_ops_destroy(bops); - for (i = 0; i < drm_res->count_connectors; i++) - drmModeFreeConnector(drm_connectors[i]); - - drmModeFreeResources(drm_res); close(drm_fd); } @@ -342,7 +301,7 @@ igt_main !gem_has_mappable_ggtt(drm_fd)) continue; - if (!format_is_supported(formats[format_idx], modifier)) + if (!igt_display_has_format_mod(&display, formats[format_idx], modifier)) continue; igt_dynamic_f("%s-%s-%s", -- 2.36.0 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup @ 2022-08-26 5:44 Nidhi Gupta 2022-08-26 5:44 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 0 siblings, 1 reply; 23+ messages in thread From: Nidhi Gupta @ 2022-08-26 5:44 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta Convert all possible subtests to dynamic and replace drm function call with existing library functions. Nidhi Gupta (2): tests/i915/kms_draw_crc: Convert tests to dynamic tests/i915/kms_draw_crc: Test Cleanup tests/i915/kms_draw_crc.c | 161 +++++++++++++++----------------------- 1 file changed, 64 insertions(+), 97 deletions(-) -- 2.36.0 ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-26 5:44 [igt-dev] [PATCH 0/2] " Nidhi Gupta @ 2022-08-26 5:44 ` Nidhi Gupta 0 siblings, 0 replies; 23+ messages in thread From: Nidhi Gupta @ 2022-08-26 5:44 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta v2: -Replace drm function call with existing library functions (Bhanu) v3: -Replace PIPE_A with compatible pipe/output combo. (Bhanu) v4: -use for_each_pipe_with_single_output() for finding compatible pipe/ouput combo. -remove crtc_id as not used anywhere. -set fb to primary plane before commiting. (Bhanu) v5: -set fb to primary plane before commiting for fill_fb_subtest() also. -use existing IGT lib helper igt_display_has_format_mod() instead of format_is_supported(). (Bhanu) -added igt_display_fini(..) for cleanup (Juha-Pekka Heikkila) v6: -replace each_pipe_with_single_output() with each_pipe_with_valid_output (Bhanu) Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> Reviewed-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com> --- tests/i915/kms_draw_crc.c | 117 ++++++++++++-------------------------- 1 file changed, 36 insertions(+), 81 deletions(-) diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c index 48c7d931..b99f348d 100644 --- a/tests/i915/kms_draw_crc.c +++ b/tests/i915/kms_draw_crc.c @@ -29,15 +29,10 @@ #define MAX_CONNECTORS 32 -struct modeset_params { - uint32_t crtc_id; - uint32_t connector_id; - drmModeModeInfoPtr mode; -}; - int drm_fd; -drmModeResPtr drm_res; -drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; +igt_display_t display; +igt_output_t *output; +drmModeModeInfoPtr mode; struct buf_ops *bops; igt_pipe_crc_t *pipe_crc; @@ -60,34 +55,24 @@ struct base_crc { }; struct base_crc base_crcs[ARRAY_SIZE(formats)]; -struct modeset_params ms; - static void find_modeset_params(void) { - int i; - uint32_t crtc_id; - drmModeConnectorPtr connector = NULL; - drmModeModeInfoPtr mode = NULL; - - for (i = 0; i < drm_res->count_connectors; i++) { - drmModeConnectorPtr c = drm_connectors[i]; - - if (c->count_modes) { - connector = c; - mode = &c->modes[0]; - break; - } - } - igt_require(connector); + enum pipe pipe; + + igt_display_reset(&display); + igt_display_commit(&display); - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, - 0); - igt_assert(mode); + for_each_pipe_with_valid_output(&display, pipe, output) { + igt_output_set_pipe(output, pipe); - ms.connector_id = connector->connector_id; - ms.crtc_id = crtc_id; - ms.mode = mode; + mode = igt_output_get_mode(output); + if (!mode) + continue; + pipe_crc = igt_pipe_crc_new(drm_fd, pipe, INTEL_PIPE_CRC_SOURCE_AUTO); + /*Only one pipe/output is enough*/ + break; + } } static uint32_t get_color(uint32_t drm_format, bool r, bool g, bool b) @@ -122,9 +107,14 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, { struct igt_fb fb; int rc; + igt_plane_t *primary; + + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, drm_format, modifier, &fb); + igt_plane_set_fb(primary, &fb); + igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 0, 0, fb.width, fb.height, get_color(drm_format, 0, 0, 1)); @@ -144,8 +134,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, get_color(drm_format, 0, 1, 1)); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -153,25 +142,6 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_remove_fb(drm_fd, &fb); } -static bool format_is_supported(uint32_t format, uint64_t modifier) -{ - uint32_t gem_handle, fb_id; - unsigned int offsets[4] = {}; - unsigned int strides[4] = {}; - int ret; - - gem_handle = igt_create_bo_with_dimensions(drm_fd, 64, 64, - format, modifier, - 0, NULL, &strides[0], NULL); - ret = __kms_addfb(drm_fd, gem_handle, 64, 64, - format, modifier, strides, offsets, 1, - DRM_MODE_FB_MODIFIERS, &fb_id); - drmModeRmFB(drm_fd, fb_id); - gem_close(drm_fd, gem_handle); - - return ret == 0; -} - static void draw_method_subtest(enum igt_draw_method method, uint32_t format_index, uint64_t modifier) { @@ -198,13 +168,12 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) struct igt_fb fb; int rc; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, modifier, &fb); igt_draw_fill_fb(drm_fd, &fb, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -217,18 +186,22 @@ static void fill_fb_subtest(void) int rc; struct igt_fb fb; igt_crc_t base_crc, crc; + igt_plane_t *primary; bool has_4tile = intel_get_device_info(intel_get_drm_devid(drm_fd))->has_4tile; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); + + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &fb); + igt_plane_set_fb(primary, &fb); + igt_draw_rect_fb(drm_fd, bops, 0, &fb, gem_has_mappable_ggtt(drm_fd) ? IGT_DRAW_MMAP_GTT : IGT_DRAW_MMAP_WC, 0, 0, fb.width, fb.height, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, &base_crc); @@ -251,40 +224,26 @@ static void fill_fb_subtest(void) static void setup_environment(void) { - int i; - drm_fd = drm_open_driver_master(DRIVER_INTEL); igt_require(drm_fd >= 0); - - drm_res = drmModeGetResources(drm_fd); - igt_require(drm_res); - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); - - for (i = 0; i < drm_res->count_connectors; i++) - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, - drm_res->connectors[i]); + igt_display_require(&display, drm_fd); + igt_display_require_output(&display); kmstest_set_vt_graphics_mode(); bops = buf_ops_create(drm_fd); find_modeset_params(); - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), - INTEL_PIPE_CRC_SOURCE_AUTO); } static void teardown_environment(void) { - int i; + igt_display_fini(&display); igt_pipe_crc_free(pipe_crc); buf_ops_destroy(bops); - for (i = 0; i < drm_res->count_connectors; i++) - drmModeFreeConnector(drm_connectors[i]); - - drmModeFreeResources(drm_res); close(drm_fd); } @@ -335,10 +294,6 @@ igt_main for (modifier_idx = 0; modifier_idx < ARRAY_SIZE(modifiers); modifier_idx++) { modifier = modifiers[modifier_idx]; - if (modifier == I915_FORMAT_MOD_4_TILED && - !HAS_4TILE(intel_get_drm_devid(drm_fd))) - continue; - if (method == IGT_DRAW_MMAP_WC && !gem_mmap__has_wc(drm_fd)) continue; @@ -346,7 +301,7 @@ igt_main !gem_has_mappable_ggtt(drm_fd)) continue; - if (!format_is_supported(formats[format_idx], modifier)) + if (!igt_display_has_format_mod(&display, formats[format_idx], modifier)) continue; igt_dynamic_f("%s-%s-%s", -- 2.36.0 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup @ 2022-08-22 9:20 Nidhi Gupta 2022-08-22 9:20 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 0 siblings, 1 reply; 23+ messages in thread From: Nidhi Gupta @ 2022-08-22 9:20 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta, juha-pekka.heikkila Convert all possible subtests to dynamic and replace drm function call with existing library functions. Nidhi Gupta (2): tests/i915/kms_draw_crc: Convert tests to dynamic tests/i915/kms_draw_crc: Test Cleanup tests/i915/kms_draw_crc.c | 157 +++++++++++++++----------------------- 1 file changed, 60 insertions(+), 97 deletions(-) -- 2.36.0 ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-22 9:20 [igt-dev] [PATCH 0/2] " Nidhi Gupta @ 2022-08-22 9:20 ` Nidhi Gupta 0 siblings, 0 replies; 23+ messages in thread From: Nidhi Gupta @ 2022-08-22 9:20 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta, juha-pekka.heikkila v2: -Replace drm function call with existing library functions (Bhanu) v3: -Replace PIPE_A with compatible pipe/output combo. (Bhanu) v4: -use for_each_pipe_with_single_output() for finding compatible pipe/ouput combo. -remove crtc_id as not used anywhere. -set fb to primary plane before commiting. (Bhanu) v5: -set fb to primary plane before commiting for fill_fb_subtest() also. -use existing IGT lib helper igt_display_has_format_mod() instead of format_is_supported(). (Bhanu) -added igt_display_fini(..) for cleanup (Juha-Pekka Heikkila) v6: -for_each_pipe_with_single_output() with for_each_pipe_with_valid_output(). (Bhanu) Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> Reviewed-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com> --- tests/i915/kms_draw_crc.c | 109 +++++++++++--------------------------- 1 file changed, 32 insertions(+), 77 deletions(-) diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c index 380be11b..d7107b7c 100644 --- a/tests/i915/kms_draw_crc.c +++ b/tests/i915/kms_draw_crc.c @@ -29,15 +29,10 @@ #define MAX_CONNECTORS 32 -struct modeset_params { - uint32_t crtc_id; - uint32_t connector_id; - drmModeModeInfoPtr mode; -}; - int drm_fd; -drmModeResPtr drm_res; -drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; +igt_display_t display; +igt_output_t *output; +drmModeModeInfoPtr mode; struct buf_ops *bops; igt_pipe_crc_t *pipe_crc; @@ -60,34 +55,20 @@ struct base_crc { }; struct base_crc base_crcs[ARRAY_SIZE(formats)]; -struct modeset_params ms; - static void find_modeset_params(void) { - int i; - uint32_t crtc_id; - drmModeConnectorPtr connector = NULL; - drmModeModeInfoPtr mode = NULL; - - for (i = 0; i < drm_res->count_connectors; i++) { - drmModeConnectorPtr c = drm_connectors[i]; - - if (c->count_modes) { - connector = c; - mode = &c->modes[0]; - break; - } - } - igt_require(connector); + enum pipe pipe; - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, - 0); - igt_assert(mode); + igt_display_reset(&display); + igt_display_commit(&display); - ms.connector_id = connector->connector_id; - ms.crtc_id = crtc_id; - ms.mode = mode; + for_each_pipe_with_valid_output(&display, pipe, output) { + igt_output_set_pipe(output, pipe); + pipe_crc = igt_pipe_crc_new(drm_fd, pipe, INTEL_PIPE_CRC_SOURCE_AUTO); + /*Only one pipe/output is enough*/ + break; + } } static uint32_t get_color(uint32_t drm_format, bool r, bool g, bool b) @@ -122,9 +103,14 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, { struct igt_fb fb; int rc; + igt_plane_t *primary; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); + + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, drm_format, modifier, &fb); + igt_plane_set_fb(primary, &fb); + igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 0, 0, fb.width, fb.height, get_color(drm_format, 0, 0, 1)); @@ -144,8 +130,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, get_color(drm_format, 0, 1, 1)); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -153,25 +138,6 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_remove_fb(drm_fd, &fb); } -static bool format_is_supported(uint32_t format, uint64_t modifier) -{ - uint32_t gem_handle, fb_id; - unsigned int offsets[4] = {}; - unsigned int strides[4] = {}; - int ret; - - gem_handle = igt_create_bo_with_dimensions(drm_fd, 64, 64, - format, modifier, - 0, NULL, &strides[0], NULL); - ret = __kms_addfb(drm_fd, gem_handle, 64, 64, - format, modifier, strides, offsets, 1, - DRM_MODE_FB_MODIFIERS, &fb_id); - drmModeRmFB(drm_fd, fb_id); - gem_close(drm_fd, gem_handle); - - return ret == 0; -} - static void draw_method_subtest(enum igt_draw_method method, uint32_t format_index, uint64_t modifier) { @@ -198,13 +164,12 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) struct igt_fb fb; int rc; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, modifier, &fb); igt_draw_fill_fb(drm_fd, &fb, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -217,18 +182,22 @@ static void fill_fb_subtest(void) int rc; struct igt_fb fb; igt_crc_t base_crc, crc; + igt_plane_t *primary; bool has_4tile = intel_get_device_info(intel_get_drm_devid(drm_fd))->has_4tile; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); + + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &fb); + igt_plane_set_fb(primary, &fb); + igt_draw_rect_fb(drm_fd, bops, 0, &fb, gem_has_mappable_ggtt(drm_fd) ? IGT_DRAW_MMAP_GTT : IGT_DRAW_MMAP_WC, 0, 0, fb.width, fb.height, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, &base_crc); @@ -251,40 +220,26 @@ static void fill_fb_subtest(void) static void setup_environment(void) { - int i; - drm_fd = drm_open_driver_master(DRIVER_INTEL); igt_require(drm_fd >= 0); - - drm_res = drmModeGetResources(drm_fd); - igt_require(drm_res); - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); - - for (i = 0; i < drm_res->count_connectors; i++) - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, - drm_res->connectors[i]); + igt_display_require(&display, drm_fd); + igt_display_require_output(&display); kmstest_set_vt_graphics_mode(); bops = buf_ops_create(drm_fd); find_modeset_params(); - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), - INTEL_PIPE_CRC_SOURCE_AUTO); } static void teardown_environment(void) { - int i; + igt_display_fini(&display); igt_pipe_crc_free(pipe_crc); buf_ops_destroy(bops); - for (i = 0; i < drm_res->count_connectors; i++) - drmModeFreeConnector(drm_connectors[i]); - - drmModeFreeResources(drm_res); close(drm_fd); } @@ -342,7 +297,7 @@ igt_main !gem_has_mappable_ggtt(drm_fd)) continue; - if (!format_is_supported(formats[format_idx], modifier)) + if (!igt_display_has_format_mod(&display, formats[format_idx], modifier)) continue; igt_dynamic_f("%s-%s-%s", -- 2.36.0 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup @ 2022-08-04 3:40 Nidhi Gupta 2022-08-04 3:40 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 0 siblings, 1 reply; 23+ messages in thread From: Nidhi Gupta @ 2022-08-04 3:40 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta Convert all possible subtests to dynamic and replace drm function call with existing library functions. Nidhi Gupta (2): tests/i915/kms_draw_crc: Convert tests to dynamic tests/i915/kms_draw_crc: Test Cleanup tests/i915/kms_draw_crc.c | 127 ++++++++++++++++++-------------------- 1 file changed, 61 insertions(+), 66 deletions(-) -- 2.36.0 ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-04 3:40 [igt-dev] [PATCH 0/2] " Nidhi Gupta @ 2022-08-04 3:40 ` Nidhi Gupta 2022-08-08 11:16 ` Gupta, Nidhi1 ` (4 more replies) 0 siblings, 5 replies; 23+ messages in thread From: Nidhi Gupta @ 2022-08-04 3:40 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta v2: -Replace drm function call with existing library functions (Bhanu) v3: -Replace PIPE_A with compatible pipe/output combo. (Bhanu) v4: -use for_each_pipe_with_single_output() for finding compatible pipe/ouput combo. -remove crtc_id as not used anywhere. -set fb to primary plane before commiting. (Bhanu) Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> --- tests/i915/kms_draw_crc.c | 73 +++++++++++++++------------------------ 1 file changed, 28 insertions(+), 45 deletions(-) diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c index 48c7d931..c7354df9 100644 --- a/tests/i915/kms_draw_crc.c +++ b/tests/i915/kms_draw_crc.c @@ -31,12 +31,12 @@ struct modeset_params { uint32_t crtc_id; - uint32_t connector_id; drmModeModeInfoPtr mode; }; int drm_fd; -drmModeResPtr drm_res; +igt_display_t display; +igt_output_t *output; drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; struct buf_ops *bops; igt_pipe_crc_t *pipe_crc; @@ -64,30 +64,25 @@ struct modeset_params ms; static void find_modeset_params(void) { - int i; - uint32_t crtc_id; - drmModeConnectorPtr connector = NULL; - drmModeModeInfoPtr mode = NULL; - - for (i = 0; i < drm_res->count_connectors; i++) { - drmModeConnectorPtr c = drm_connectors[i]; + enum pipe pipe1; + drmModeModeInfo *mode; - if (c->count_modes) { - connector = c; - mode = &c->modes[0]; - break; - } - } - igt_require(connector); + igt_display_reset(&display); + igt_display_commit(&display); - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, - 0); - igt_assert(mode); + for_each_pipe_with_single_output(&display, pipe1, output) { + output = igt_get_single_output_for_pipe(&display, pipe1); + igt_require(output); + igt_output_set_pipe(output, pipe1); - ms.connector_id = connector->connector_id; - ms.crtc_id = crtc_id; - ms.mode = mode; + mode = igt_output_get_mode(output); + igt_assert(mode); + ms.mode = mode; + pipe_crc = igt_pipe_crc_new(drm_fd, pipe1, INTEL_PIPE_CRC_SOURCE_AUTO); + /*Only one pipe/output is enough*/ + break; + } } static uint32_t get_color(uint32_t drm_format, bool r, bool g, bool b) @@ -122,9 +117,14 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, { struct igt_fb fb; int rc; + igt_plane_t *primary; + + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, drm_format, modifier, &fb); + igt_plane_set_fb(primary, &fb); + igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 0, 0, fb.width, fb.height, get_color(drm_format, 0, 0, 1)); @@ -144,8 +144,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, get_color(drm_format, 0, 1, 1)); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -203,8 +202,7 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) igt_draw_fill_fb(drm_fd, &fb, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -227,8 +225,7 @@ static void fill_fb_subtest(void) IGT_DRAW_MMAP_WC, 0, 0, fb.width, fb.height, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, &base_crc); @@ -251,40 +248,26 @@ static void fill_fb_subtest(void) static void setup_environment(void) { - int i; - drm_fd = drm_open_driver_master(DRIVER_INTEL); igt_require(drm_fd >= 0); - - drm_res = drmModeGetResources(drm_fd); - igt_require(drm_res); - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); - - for (i = 0; i < drm_res->count_connectors; i++) - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, - drm_res->connectors[i]); + igt_display_require(&display, drm_fd); + igt_display_require_output(&display); kmstest_set_vt_graphics_mode(); bops = buf_ops_create(drm_fd); find_modeset_params(); - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), - INTEL_PIPE_CRC_SOURCE_AUTO); } static void teardown_environment(void) { - int i; - igt_pipe_crc_free(pipe_crc); buf_ops_destroy(bops); - for (i = 0; i < drm_res->count_connectors; i++) - drmModeFreeConnector(drm_connectors[i]); + igt_display_reset(&display); - drmModeFreeResources(drm_res); close(drm_fd); } -- 2.36.0 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-04 3:40 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta @ 2022-08-08 11:16 ` Gupta, Nidhi1 2022-08-08 14:02 ` Modem, Bhanuprakash 2022-08-09 8:00 ` Modem, Bhanuprakash ` (3 subsequent siblings) 4 siblings, 1 reply; 23+ messages in thread From: Gupta, Nidhi1 @ 2022-08-08 11:16 UTC (permalink / raw) To: igt-dev@lists.freedesktop.org Hi Bhanu, If you could review the below patch it would be helpful. Thanks Nidhi. -----Original Message----- From: Gupta, Nidhi1 <nidhi1.gupta@intel.com> Sent: Thursday, August 4, 2022 9:10 AM To: igt-dev@lists.freedesktop.org Cc: Modem, Bhanuprakash <bhanuprakash.modem@intel.com>; Gupta, Nidhi1 <nidhi1.gupta@intel.com> Subject: [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup v2: -Replace drm function call with existing library functions (Bhanu) v3: -Replace PIPE_A with compatible pipe/output combo. (Bhanu) v4: -use for_each_pipe_with_single_output() for finding compatible pipe/ouput combo. -remove crtc_id as not used anywhere. -set fb to primary plane before commiting. (Bhanu) Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> --- tests/i915/kms_draw_crc.c | 73 +++++++++++++++------------------------ 1 file changed, 28 insertions(+), 45 deletions(-) diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c index 48c7d931..c7354df9 100644 --- a/tests/i915/kms_draw_crc.c +++ b/tests/i915/kms_draw_crc.c @@ -31,12 +31,12 @@ struct modeset_params { uint32_t crtc_id; - uint32_t connector_id; drmModeModeInfoPtr mode; }; int drm_fd; -drmModeResPtr drm_res; +igt_display_t display; +igt_output_t *output; drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; struct buf_ops *bops; igt_pipe_crc_t *pipe_crc; @@ -64,30 +64,25 @@ struct modeset_params ms; static void find_modeset_params(void) { - int i; - uint32_t crtc_id; - drmModeConnectorPtr connector = NULL; - drmModeModeInfoPtr mode = NULL; - - for (i = 0; i < drm_res->count_connectors; i++) { - drmModeConnectorPtr c = drm_connectors[i]; + enum pipe pipe1; + drmModeModeInfo *mode; - if (c->count_modes) { - connector = c; - mode = &c->modes[0]; - break; - } - } - igt_require(connector); + igt_display_reset(&display); + igt_display_commit(&display); - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, - 0); - igt_assert(mode); + for_each_pipe_with_single_output(&display, pipe1, output) { + output = igt_get_single_output_for_pipe(&display, pipe1); + igt_require(output); + igt_output_set_pipe(output, pipe1); - ms.connector_id = connector->connector_id; - ms.crtc_id = crtc_id; - ms.mode = mode; + mode = igt_output_get_mode(output); + igt_assert(mode); + ms.mode = mode; + pipe_crc = igt_pipe_crc_new(drm_fd, pipe1, INTEL_PIPE_CRC_SOURCE_AUTO); + /*Only one pipe/output is enough*/ + break; + } } static uint32_t get_color(uint32_t drm_format, bool r, bool g, bool b) @@ -122,9 +117,14 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, { struct igt_fb fb; int rc; + igt_plane_t *primary; + + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, drm_format, modifier, &fb); + igt_plane_set_fb(primary, &fb); + igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 0, 0, fb.width, fb.height, get_color(drm_format, 0, 0, 1)); @@ -144,8 +144,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, get_color(drm_format, 0, 1, 1)); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : +COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -203,8 +202,7 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) igt_draw_fill_fb(drm_fd, &fb, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : +COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -227,8 +225,7 @@ static void fill_fb_subtest(void) IGT_DRAW_MMAP_WC, 0, 0, fb.width, fb.height, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : +COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, &base_crc); @@ -251,40 +248,26 @@ static void fill_fb_subtest(void) static void setup_environment(void) { - int i; - drm_fd = drm_open_driver_master(DRIVER_INTEL); igt_require(drm_fd >= 0); - - drm_res = drmModeGetResources(drm_fd); - igt_require(drm_res); - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); - - for (i = 0; i < drm_res->count_connectors; i++) - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, - drm_res->connectors[i]); + igt_display_require(&display, drm_fd); + igt_display_require_output(&display); kmstest_set_vt_graphics_mode(); bops = buf_ops_create(drm_fd); find_modeset_params(); - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), - INTEL_PIPE_CRC_SOURCE_AUTO); } static void teardown_environment(void) { - int i; - igt_pipe_crc_free(pipe_crc); buf_ops_destroy(bops); - for (i = 0; i < drm_res->count_connectors; i++) - drmModeFreeConnector(drm_connectors[i]); + igt_display_reset(&display); - drmModeFreeResources(drm_res); close(drm_fd); } -- 2.36.0 ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-08 11:16 ` Gupta, Nidhi1 @ 2022-08-08 14:02 ` Modem, Bhanuprakash 0 siblings, 0 replies; 23+ messages in thread From: Modem, Bhanuprakash @ 2022-08-08 14:02 UTC (permalink / raw) To: Gupta, Nidhi1, igt-dev@lists.freedesktop.org Hi Nidhi, Sure, I'll try to do it by tomorrow. BTW, did you visually verified this patch locally? Thanks, Bhanu > -----Original Message----- > From: Gupta, Nidhi1 <nidhi1.gupta@intel.com> > Sent: Monday, August 8, 2022 4:46 PM > To: igt-dev@lists.freedesktop.org > Cc: Modem, Bhanuprakash <bhanuprakash.modem@intel.com> > Subject: RE: [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup > > Hi Bhanu, > > If you could review the below patch it would be helpful. > > Thanks > Nidhi. > > -----Original Message----- > From: Gupta, Nidhi1 <nidhi1.gupta@intel.com> > Sent: Thursday, August 4, 2022 9:10 AM > To: igt-dev@lists.freedesktop.org > Cc: Modem, Bhanuprakash <bhanuprakash.modem@intel.com>; Gupta, Nidhi1 > <nidhi1.gupta@intel.com> > Subject: [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup > > v2: -Replace drm function call with existing library functions > (Bhanu) > > v3: -Replace PIPE_A with compatible pipe/output combo. > (Bhanu) > > v4: -use for_each_pipe_with_single_output() for finding > compatible pipe/ouput combo. > -remove crtc_id as not used anywhere. > -set fb to primary plane before commiting. > (Bhanu) > > Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> > --- > tests/i915/kms_draw_crc.c | 73 +++++++++++++++------------------------ > 1 file changed, 28 insertions(+), 45 deletions(-) > > diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c index > 48c7d931..c7354df9 100644 > --- a/tests/i915/kms_draw_crc.c > +++ b/tests/i915/kms_draw_crc.c > @@ -31,12 +31,12 @@ > > struct modeset_params { > uint32_t crtc_id; > - uint32_t connector_id; > drmModeModeInfoPtr mode; > }; > > int drm_fd; > -drmModeResPtr drm_res; > +igt_display_t display; > +igt_output_t *output; > drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; struct buf_ops *bops; > igt_pipe_crc_t *pipe_crc; @@ -64,30 +64,25 @@ struct modeset_params ms; > > static void find_modeset_params(void) > { > - int i; > - uint32_t crtc_id; > - drmModeConnectorPtr connector = NULL; > - drmModeModeInfoPtr mode = NULL; > - > - for (i = 0; i < drm_res->count_connectors; i++) { > - drmModeConnectorPtr c = drm_connectors[i]; > + enum pipe pipe1; > + drmModeModeInfo *mode; > > - if (c->count_modes) { > - connector = c; > - mode = &c->modes[0]; > - break; > - } > - } > - igt_require(connector); > + igt_display_reset(&display); > + igt_display_commit(&display); > > - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, > - 0); > - igt_assert(mode); > + for_each_pipe_with_single_output(&display, pipe1, output) { > + output = igt_get_single_output_for_pipe(&display, pipe1); > + igt_require(output); > + igt_output_set_pipe(output, pipe1); > > - ms.connector_id = connector->connector_id; > - ms.crtc_id = crtc_id; > - ms.mode = mode; > + mode = igt_output_get_mode(output); > + igt_assert(mode); > > + ms.mode = mode; > + pipe_crc = igt_pipe_crc_new(drm_fd, pipe1, > INTEL_PIPE_CRC_SOURCE_AUTO); > + /*Only one pipe/output is enough*/ > + break; > + } > } > > static uint32_t get_color(uint32_t drm_format, bool r, bool g, bool b) @@ - > 122,9 +117,14 @@ static void get_method_crc(enum igt_draw_method method, > uint32_t drm_format, { > struct igt_fb fb; > int rc; > + igt_plane_t *primary; > + > + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); > > igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, > drm_format, modifier, &fb); > + igt_plane_set_fb(primary, &fb); > + > igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, > 0, 0, fb.width, fb.height, > get_color(drm_format, 0, 0, 1)); > @@ -144,8 +144,7 @@ static void get_method_crc(enum igt_draw_method method, > uint32_t drm_format, > igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, > get_color(drm_format, 0, 1, 1)); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : > +COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -203,8 +202,7 @@ static void > get_fill_crc(uint64_t modifier, igt_crc_t *crc) > > igt_draw_fill_fb(drm_fd, &fb, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : > +COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -227,8 +225,7 @@ static void > fill_fb_subtest(void) > IGT_DRAW_MMAP_WC, > 0, 0, fb.width, fb.height, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : > +COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, &base_crc); @@ -251,40 +248,26 @@ > static void fill_fb_subtest(void) > > static void setup_environment(void) > { > - int i; > - > drm_fd = drm_open_driver_master(DRIVER_INTEL); > igt_require(drm_fd >= 0); > - > - drm_res = drmModeGetResources(drm_fd); > - igt_require(drm_res); > - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); > - > - for (i = 0; i < drm_res->count_connectors; i++) > - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, > - drm_res->connectors[i]); > + igt_display_require(&display, drm_fd); > + igt_display_require_output(&display); > > kmstest_set_vt_graphics_mode(); > > bops = buf_ops_create(drm_fd); > > find_modeset_params(); > - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, > ms.crtc_id), > - INTEL_PIPE_CRC_SOURCE_AUTO); > } > > static void teardown_environment(void) > { > - int i; > - > igt_pipe_crc_free(pipe_crc); > > buf_ops_destroy(bops); > > - for (i = 0; i < drm_res->count_connectors; i++) > - drmModeFreeConnector(drm_connectors[i]); > + igt_display_reset(&display); > > - drmModeFreeResources(drm_res); > close(drm_fd); > } > > -- > 2.36.0 ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-04 3:40 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 2022-08-08 11:16 ` Gupta, Nidhi1 @ 2022-08-09 8:00 ` Modem, Bhanuprakash 2022-08-09 9:08 ` Modem, Bhanuprakash ` (2 subsequent siblings) 4 siblings, 0 replies; 23+ messages in thread From: Modem, Bhanuprakash @ 2022-08-09 8:00 UTC (permalink / raw) To: Nidhi Gupta, igt-dev On Thu-04-08-2022 09:10 am, Nidhi Gupta wrote: > v2: -Replace drm function call with existing library functions > (Bhanu) > > v3: -Replace PIPE_A with compatible pipe/output combo. > (Bhanu) > > v4: -use for_each_pipe_with_single_output() for finding > compatible pipe/ouput combo. > -remove crtc_id as not used anywhere. > -set fb to primary plane before commiting. > (Bhanu) > > Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> > --- > tests/i915/kms_draw_crc.c | 73 +++++++++++++++------------------------ > 1 file changed, 28 insertions(+), 45 deletions(-) > > diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c > index 48c7d931..c7354df9 100644 > --- a/tests/i915/kms_draw_crc.c > +++ b/tests/i915/kms_draw_crc.c > @@ -31,12 +31,12 @@ > > struct modeset_params { > uint32_t crtc_id; > - uint32_t connector_id; > drmModeModeInfoPtr mode; > }; This entire structure is not required, only mode is enough. > > int drm_fd; > -drmModeResPtr drm_res; > +igt_display_t display; > +igt_output_t *output; > drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; Unused variable, please drop it. > struct buf_ops *bops; > igt_pipe_crc_t *pipe_crc; > @@ -64,30 +64,25 @@ struct modeset_params ms; > > static void find_modeset_params(void) > { > - int i; > - uint32_t crtc_id; > - drmModeConnectorPtr connector = NULL; > - drmModeModeInfoPtr mode = NULL; > - > - for (i = 0; i < drm_res->count_connectors; i++) { > - drmModeConnectorPtr c = drm_connectors[i]; > + enum pipe pipe1; s/pipe1/pipe/ > + drmModeModeInfo *mode; > > - if (c->count_modes) { > - connector = c; > - mode = &c->modes[0]; > - break; > - } > - } > - igt_require(connector); > + igt_display_reset(&display); > + igt_display_commit(&display); > > - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, > - 0); > - igt_assert(mode); > + for_each_pipe_with_single_output(&display, pipe1, output) { > + output = igt_get_single_output_for_pipe(&display, pipe1); > + igt_require(output); These 2 lines are redundant, please drop those. You can directly use output. > + igt_output_set_pipe(output, pipe1); > > - ms.connector_id = connector->connector_id; > - ms.crtc_id = crtc_id; > - ms.mode = mode; > + mode = igt_output_get_mode(output); > + igt_assert(mode); hmm, Instead of asserting, how about trying with another output? for_each_pipe_with_valid_output() { if (!mode) continue; } igt_require(mode); > > + ms.mode = mode; Please update this as per the first comment in this patch. > + pipe_crc = igt_pipe_crc_new(drm_fd, pipe1, INTEL_PIPE_CRC_SOURCE_AUTO); > + /*Only one pipe/output is enough*/ > + break; > + } > } > > static uint32_t get_color(uint32_t drm_format, bool r, bool g, bool b) > @@ -122,9 +117,14 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, > { > struct igt_fb fb; > int rc; > + igt_plane_t *primary; > + > + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); We need similar logic to "fill_fb_subtest()" too. - Bhanu > > igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, > drm_format, modifier, &fb); > + igt_plane_set_fb(primary, &fb); > + > igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, > 0, 0, fb.width, fb.height, > get_color(drm_format, 0, 0, 1)); > @@ -144,8 +144,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, > igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, > get_color(drm_format, 0, 1, 1)); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); > @@ -203,8 +202,7 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) > > igt_draw_fill_fb(drm_fd, &fb, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); > @@ -227,8 +225,7 @@ static void fill_fb_subtest(void) > IGT_DRAW_MMAP_WC, > 0, 0, fb.width, fb.height, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, &base_crc); > @@ -251,40 +248,26 @@ static void fill_fb_subtest(void) > > static void setup_environment(void) > { > - int i; > - > drm_fd = drm_open_driver_master(DRIVER_INTEL); > igt_require(drm_fd >= 0); > - > - drm_res = drmModeGetResources(drm_fd); > - igt_require(drm_res); > - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); > - > - for (i = 0; i < drm_res->count_connectors; i++) > - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, > - drm_res->connectors[i]); > + igt_display_require(&display, drm_fd); > + igt_display_require_output(&display); > > kmstest_set_vt_graphics_mode(); > > bops = buf_ops_create(drm_fd); > > find_modeset_params(); > - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), > - INTEL_PIPE_CRC_SOURCE_AUTO); > } > > static void teardown_environment(void) > { > - int i; > - > igt_pipe_crc_free(pipe_crc); > > buf_ops_destroy(bops); > > - for (i = 0; i < drm_res->count_connectors; i++) > - drmModeFreeConnector(drm_connectors[i]); > + igt_display_reset(&display); > > - drmModeFreeResources(drm_res); > close(drm_fd); > } > ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-04 3:40 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 2022-08-08 11:16 ` Gupta, Nidhi1 2022-08-09 8:00 ` Modem, Bhanuprakash @ 2022-08-09 9:08 ` Modem, Bhanuprakash 2022-08-09 12:53 ` Juha-Pekka Heikkila 2022-08-10 10:11 ` Nidhi Gupta 4 siblings, 0 replies; 23+ messages in thread From: Modem, Bhanuprakash @ 2022-08-09 9:08 UTC (permalink / raw) To: Nidhi Gupta, igt-dev On Thu-04-08-2022 09:10 am, Nidhi Gupta wrote: > v2: -Replace drm function call with existing library functions > (Bhanu) > > v3: -Replace PIPE_A with compatible pipe/output combo. > (Bhanu) > > v4: -use for_each_pipe_with_single_output() for finding > compatible pipe/ouput combo. > -remove crtc_id as not used anywhere. > -set fb to primary plane before commiting. > (Bhanu) > Also, is it possible to use existing IGT lib helper "igt_display_has_format_mod()" instead of "format_is_supported()"? - Bhanu > Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> > --- > tests/i915/kms_draw_crc.c | 73 +++++++++++++++------------------------ > 1 file changed, 28 insertions(+), 45 deletions(-) > > diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c > index 48c7d931..c7354df9 100644 > --- a/tests/i915/kms_draw_crc.c > +++ b/tests/i915/kms_draw_crc.c > @@ -31,12 +31,12 @@ > > struct modeset_params { > uint32_t crtc_id; > - uint32_t connector_id; > drmModeModeInfoPtr mode; > }; > > int drm_fd; > -drmModeResPtr drm_res; > +igt_display_t display; > +igt_output_t *output; > drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; > struct buf_ops *bops; > igt_pipe_crc_t *pipe_crc; > @@ -64,30 +64,25 @@ struct modeset_params ms; > > static void find_modeset_params(void) > { > - int i; > - uint32_t crtc_id; > - drmModeConnectorPtr connector = NULL; > - drmModeModeInfoPtr mode = NULL; > - > - for (i = 0; i < drm_res->count_connectors; i++) { > - drmModeConnectorPtr c = drm_connectors[i]; > + enum pipe pipe1; > + drmModeModeInfo *mode; > > - if (c->count_modes) { > - connector = c; > - mode = &c->modes[0]; > - break; > - } > - } > - igt_require(connector); > + igt_display_reset(&display); > + igt_display_commit(&display); > > - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, > - 0); > - igt_assert(mode); > + for_each_pipe_with_single_output(&display, pipe1, output) { > + output = igt_get_single_output_for_pipe(&display, pipe1); > + igt_require(output); > + igt_output_set_pipe(output, pipe1); > > - ms.connector_id = connector->connector_id; > - ms.crtc_id = crtc_id; > - ms.mode = mode; > + mode = igt_output_get_mode(output); > + igt_assert(mode); > > + ms.mode = mode; > + pipe_crc = igt_pipe_crc_new(drm_fd, pipe1, INTEL_PIPE_CRC_SOURCE_AUTO); > + /*Only one pipe/output is enough*/ > + break; > + } > } > > static uint32_t get_color(uint32_t drm_format, bool r, bool g, bool b) > @@ -122,9 +117,14 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, > { > struct igt_fb fb; > int rc; > + igt_plane_t *primary; > + > + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); > > igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, > drm_format, modifier, &fb); > + igt_plane_set_fb(primary, &fb); > + > igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, > 0, 0, fb.width, fb.height, > get_color(drm_format, 0, 0, 1)); > @@ -144,8 +144,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, > igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, > get_color(drm_format, 0, 1, 1)); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); > @@ -203,8 +202,7 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) > > igt_draw_fill_fb(drm_fd, &fb, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); > @@ -227,8 +225,7 @@ static void fill_fb_subtest(void) > IGT_DRAW_MMAP_WC, > 0, 0, fb.width, fb.height, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, &base_crc); > @@ -251,40 +248,26 @@ static void fill_fb_subtest(void) > > static void setup_environment(void) > { > - int i; > - > drm_fd = drm_open_driver_master(DRIVER_INTEL); > igt_require(drm_fd >= 0); > - > - drm_res = drmModeGetResources(drm_fd); > - igt_require(drm_res); > - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); > - > - for (i = 0; i < drm_res->count_connectors; i++) > - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, > - drm_res->connectors[i]); > + igt_display_require(&display, drm_fd); > + igt_display_require_output(&display); > > kmstest_set_vt_graphics_mode(); > > bops = buf_ops_create(drm_fd); > > find_modeset_params(); > - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), > - INTEL_PIPE_CRC_SOURCE_AUTO); > } > > static void teardown_environment(void) > { > - int i; > - > igt_pipe_crc_free(pipe_crc); > > buf_ops_destroy(bops); > > - for (i = 0; i < drm_res->count_connectors; i++) > - drmModeFreeConnector(drm_connectors[i]); > + igt_display_reset(&display); > > - drmModeFreeResources(drm_res); > close(drm_fd); > } > ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-04 3:40 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta ` (2 preceding siblings ...) 2022-08-09 9:08 ` Modem, Bhanuprakash @ 2022-08-09 12:53 ` Juha-Pekka Heikkila 2022-08-10 10:11 ` Nidhi Gupta 4 siblings, 0 replies; 23+ messages in thread From: Juha-Pekka Heikkila @ 2022-08-09 12:53 UTC (permalink / raw) To: Nidhi Gupta, igt-dev Hi Nidhi, quickly looking I noticed few things which Bhanu didn't comment on On 4.8.2022 6.40, Nidhi Gupta wrote: > v2: -Replace drm function call with existing library functions > (Bhanu) > > v3: -Replace PIPE_A with compatible pipe/output combo. > (Bhanu) > > v4: -use for_each_pipe_with_single_output() for finding > compatible pipe/ouput combo. > -remove crtc_id as not used anywhere. > -set fb to primary plane before commiting. > (Bhanu) > > Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> > --- > tests/i915/kms_draw_crc.c | 73 +++++++++++++++------------------------ > 1 file changed, 28 insertions(+), 45 deletions(-) > > diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c > index 48c7d931..c7354df9 100644 > --- a/tests/i915/kms_draw_crc.c > +++ b/tests/i915/kms_draw_crc.c > @@ -31,12 +31,12 @@ > > struct modeset_params { > uint32_t crtc_id; > - uint32_t connector_id; > drmModeModeInfoPtr mode; > }; > > int drm_fd; > -drmModeResPtr drm_res; > +igt_display_t display; > +igt_output_t *output; > drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; > struct buf_ops *bops; > igt_pipe_crc_t *pipe_crc; > @@ -64,30 +64,25 @@ struct modeset_params ms; > > static void find_modeset_params(void) > { > - int i; > - uint32_t crtc_id; > - drmModeConnectorPtr connector = NULL; > - drmModeModeInfoPtr mode = NULL; > - > - for (i = 0; i < drm_res->count_connectors; i++) { > - drmModeConnectorPtr c = drm_connectors[i]; > + enum pipe pipe1; > + drmModeModeInfo *mode; Here is being replaced drmModeModeInfoPtr (drmModeModeInfo pointer) called 'mode' with pointer to drmModeModeInfo which is called 'mode' > > - if (c->count_modes) { > - connector = c; > - mode = &c->modes[0]; > - break; > - } > - } > - igt_require(connector); > + igt_display_reset(&display); > + igt_display_commit(&display); > > - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, > - 0); > - igt_assert(mode); > + for_each_pipe_with_single_output(&display, pipe1, output) { > + output = igt_get_single_output_for_pipe(&display, pipe1); > + igt_require(output); > + igt_output_set_pipe(output, pipe1); > > - ms.connector_id = connector->connector_id; > - ms.crtc_id = crtc_id; > - ms.mode = mode; > + mode = igt_output_get_mode(output); > + igt_assert(mode); > > + ms.mode = mode; > + pipe_crc = igt_pipe_crc_new(drm_fd, pipe1, INTEL_PIPE_CRC_SOURCE_AUTO); > + /*Only one pipe/output is enough*/ > + break; > + } > } > > static uint32_t get_color(uint32_t drm_format, bool r, bool g, bool b) > @@ -122,9 +117,14 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, > { > struct igt_fb fb; > int rc; > + igt_plane_t *primary; > + > + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); > > igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, > drm_format, modifier, &fb); > + igt_plane_set_fb(primary, &fb); > + > igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, > 0, 0, fb.width, fb.height, > get_color(drm_format, 0, 0, 1)); > @@ -144,8 +144,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, > igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, > get_color(drm_format, 0, 1, 1)); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); > @@ -203,8 +202,7 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) > > igt_draw_fill_fb(drm_fd, &fb, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); > @@ -227,8 +225,7 @@ static void fill_fb_subtest(void) > IGT_DRAW_MMAP_WC, > 0, 0, fb.width, fb.height, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, &base_crc); > @@ -251,40 +248,26 @@ static void fill_fb_subtest(void) > > static void setup_environment(void) > { > - int i; > - > drm_fd = drm_open_driver_master(DRIVER_INTEL); > igt_require(drm_fd >= 0); > - > - drm_res = drmModeGetResources(drm_fd); > - igt_require(drm_res); > - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); > - > - for (i = 0; i < drm_res->count_connectors; i++) > - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, > - drm_res->connectors[i]); > + igt_display_require(&display, drm_fd); you add igt_display_require(..) which you should clean up afterwards with igt_display_fini(..) > + igt_display_require_output(&display); > > kmstest_set_vt_graphics_mode(); > > bops = buf_ops_create(drm_fd); > > find_modeset_params(); > - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), > - INTEL_PIPE_CRC_SOURCE_AUTO); > } > > static void teardown_environment(void) > { > - int i; > - > igt_pipe_crc_free(pipe_crc); > > buf_ops_destroy(bops); > > - for (i = 0; i < drm_res->count_connectors; i++) > - drmModeFreeConnector(drm_connectors[i]); > + igt_display_reset(&display); If you want this reset to go in you'll need to commit it before closing fd. > > - drmModeFreeResources(drm_res); > close(drm_fd); > } > ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-04 3:40 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta ` (3 preceding siblings ...) 2022-08-09 12:53 ` Juha-Pekka Heikkila @ 2022-08-10 10:11 ` Nidhi Gupta 2022-08-10 13:27 ` Nidhi Gupta 4 siblings, 1 reply; 23+ messages in thread From: Nidhi Gupta @ 2022-08-10 10:11 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta v2: -Replace drm function call with existing library functions (Bhanu) v3: -Replace PIPE_A with compatible pipe/output combo. (Bhanu) v4: -use for_each_pipe_with_single_output() for finding compatible pipe/ouput combo. -remove crtc_id as not used anywhere. -set fb to primary plane before commiting. (Bhanu) v5: -set fb to primary plane before commiting for fill_fb_subtest() also. -use existing IGT lib helper igt_display_has_format_mod() instead of format_is_supported(). (Bhanu) -added igt_display_fini(..) for cleanup (Juha-Pekka Heikkila) Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> --- tests/i915/kms_draw_crc.c | 96 +++++++++++++++------------------------ 1 file changed, 37 insertions(+), 59 deletions(-) diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c index 48c7d931..97cadb02 100644 --- a/tests/i915/kms_draw_crc.c +++ b/tests/i915/kms_draw_crc.c @@ -29,15 +29,10 @@ #define MAX_CONNECTORS 32 -struct modeset_params { - uint32_t crtc_id; - uint32_t connector_id; - drmModeModeInfoPtr mode; -}; - int drm_fd; -drmModeResPtr drm_res; -drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; +igt_display_t display; +igt_output_t *output; +drmModeModeInfoPtr mode; struct buf_ops *bops; igt_pipe_crc_t *pipe_crc; @@ -60,34 +55,24 @@ struct base_crc { }; struct base_crc base_crcs[ARRAY_SIZE(formats)]; -struct modeset_params ms; - static void find_modeset_params(void) { - int i; - uint32_t crtc_id; - drmModeConnectorPtr connector = NULL; - drmModeModeInfoPtr mode = NULL; - - for (i = 0; i < drm_res->count_connectors; i++) { - drmModeConnectorPtr c = drm_connectors[i]; - - if (c->count_modes) { - connector = c; - mode = &c->modes[0]; - break; - } - } - igt_require(connector); + enum pipe pipe; + + igt_display_reset(&display); + igt_display_commit(&display); - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, - 0); - igt_assert(mode); + for_each_pipe_with_single_output(&display, pipe, output) { + igt_output_set_pipe(output, pipe); - ms.connector_id = connector->connector_id; - ms.crtc_id = crtc_id; - ms.mode = mode; + mode = igt_output_get_mode(output); + if (!mode) + continue; + pipe_crc = igt_pipe_crc_new(drm_fd, pipe, INTEL_PIPE_CRC_SOURCE_AUTO); + /*Only one pipe/output is enough*/ + break; + } } static uint32_t get_color(uint32_t drm_format, bool r, bool g, bool b) @@ -122,9 +107,14 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, { struct igt_fb fb; int rc; + igt_plane_t *primary; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); + + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, drm_format, modifier, &fb); + igt_plane_set_fb(primary, &fb); + igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 0, 0, fb.width, fb.height, get_color(drm_format, 0, 0, 1)); @@ -144,8 +134,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, get_color(drm_format, 0, 1, 1)); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -198,13 +187,12 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) struct igt_fb fb; int rc; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, modifier, &fb); igt_draw_fill_fb(drm_fd, &fb, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -217,18 +205,22 @@ static void fill_fb_subtest(void) int rc; struct igt_fb fb; igt_crc_t base_crc, crc; + igt_plane_t *primary; bool has_4tile = intel_get_device_info(intel_get_drm_devid(drm_fd))->has_4tile; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, - DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &fb); + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); + + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, + + igt_plane_set_fb(primary, &fb); + DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &fb); igt_draw_rect_fb(drm_fd, bops, 0, &fb, gem_has_mappable_ggtt(drm_fd) ? IGT_DRAW_MMAP_GTT : IGT_DRAW_MMAP_WC, 0, 0, fb.width, fb.height, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, &base_crc); @@ -251,40 +243,26 @@ static void fill_fb_subtest(void) static void setup_environment(void) { - int i; - drm_fd = drm_open_driver_master(DRIVER_INTEL); igt_require(drm_fd >= 0); - - drm_res = drmModeGetResources(drm_fd); - igt_require(drm_res); - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); - - for (i = 0; i < drm_res->count_connectors; i++) - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, - drm_res->connectors[i]); + igt_display_require(&display, drm_fd); + igt_display_require_output(&display); kmstest_set_vt_graphics_mode(); bops = buf_ops_create(drm_fd); find_modeset_params(); - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), - INTEL_PIPE_CRC_SOURCE_AUTO); } static void teardown_environment(void) { - int i; + igt_display_fini(&display); igt_pipe_crc_free(pipe_crc); buf_ops_destroy(bops); - for (i = 0; i < drm_res->count_connectors; i++) - drmModeFreeConnector(drm_connectors[i]); - - drmModeFreeResources(drm_res); close(drm_fd); } @@ -346,7 +324,7 @@ igt_main !gem_has_mappable_ggtt(drm_fd)) continue; - if (!format_is_supported(formats[format_idx], modifier)) + if (!igt_display_has_format_mod(display, formats[format_idx], modifier)) continue; igt_dynamic_f("%s-%s-%s", -- 2.36.0 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-10 10:11 ` Nidhi Gupta @ 2022-08-10 13:27 ` Nidhi Gupta 2022-08-12 10:37 ` Modem, Bhanuprakash 0 siblings, 1 reply; 23+ messages in thread From: Nidhi Gupta @ 2022-08-10 13:27 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta v2: -Replace drm function call with existing library functions (Bhanu) v3: -Replace PIPE_A with compatible pipe/output combo. (Bhanu) v4: -use for_each_pipe_with_single_output() for finding compatible pipe/ouput combo. -remove crtc_id as not used anywhere. -set fb to primary plane before commiting. (Bhanu) v5: -set fb to primary plane before commiting for fill_fb_subtest() also. -use existing IGT lib helper igt_display_has_format_mod() instead of format_is_supported(). (Bhanu) -added igt_display_fini(..) for cleanup (Juha-Pekka Heikkila) Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> --- tests/i915/kms_draw_crc.c | 113 ++++++++++++-------------------------- 1 file changed, 36 insertions(+), 77 deletions(-) diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c index 48c7d931..f1887470 100644 --- a/tests/i915/kms_draw_crc.c +++ b/tests/i915/kms_draw_crc.c @@ -29,15 +29,10 @@ #define MAX_CONNECTORS 32 -struct modeset_params { - uint32_t crtc_id; - uint32_t connector_id; - drmModeModeInfoPtr mode; -}; - int drm_fd; -drmModeResPtr drm_res; -drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; +igt_display_t display; +igt_output_t *output; +drmModeModeInfoPtr mode; struct buf_ops *bops; igt_pipe_crc_t *pipe_crc; @@ -60,34 +55,24 @@ struct base_crc { }; struct base_crc base_crcs[ARRAY_SIZE(formats)]; -struct modeset_params ms; - static void find_modeset_params(void) { - int i; - uint32_t crtc_id; - drmModeConnectorPtr connector = NULL; - drmModeModeInfoPtr mode = NULL; - - for (i = 0; i < drm_res->count_connectors; i++) { - drmModeConnectorPtr c = drm_connectors[i]; - - if (c->count_modes) { - connector = c; - mode = &c->modes[0]; - break; - } - } - igt_require(connector); + enum pipe pipe; - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, - 0); - igt_assert(mode); + igt_display_reset(&display); + igt_display_commit(&display); - ms.connector_id = connector->connector_id; - ms.crtc_id = crtc_id; - ms.mode = mode; + for_each_pipe_with_single_output(&display, pipe, output) { + igt_output_set_pipe(output, pipe); + mode = igt_output_get_mode(output); + if (!mode) + continue; + + pipe_crc = igt_pipe_crc_new(drm_fd, pipe, INTEL_PIPE_CRC_SOURCE_AUTO); + /*Only one pipe/output is enough*/ + break; + } } static uint32_t get_color(uint32_t drm_format, bool r, bool g, bool b) @@ -122,9 +107,14 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, { struct igt_fb fb; int rc; + igt_plane_t *primary; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); + + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, drm_format, modifier, &fb); + igt_plane_set_fb(primary, &fb); + igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 0, 0, fb.width, fb.height, get_color(drm_format, 0, 0, 1)); @@ -144,8 +134,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, get_color(drm_format, 0, 1, 1)); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -153,25 +142,6 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_remove_fb(drm_fd, &fb); } -static bool format_is_supported(uint32_t format, uint64_t modifier) -{ - uint32_t gem_handle, fb_id; - unsigned int offsets[4] = {}; - unsigned int strides[4] = {}; - int ret; - - gem_handle = igt_create_bo_with_dimensions(drm_fd, 64, 64, - format, modifier, - 0, NULL, &strides[0], NULL); - ret = __kms_addfb(drm_fd, gem_handle, 64, 64, - format, modifier, strides, offsets, 1, - DRM_MODE_FB_MODIFIERS, &fb_id); - drmModeRmFB(drm_fd, fb_id); - gem_close(drm_fd, gem_handle); - - return ret == 0; -} - static void draw_method_subtest(enum igt_draw_method method, uint32_t format_index, uint64_t modifier) { @@ -198,13 +168,12 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) struct igt_fb fb; int rc; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, modifier, &fb); igt_draw_fill_fb(drm_fd, &fb, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -217,18 +186,22 @@ static void fill_fb_subtest(void) int rc; struct igt_fb fb; igt_crc_t base_crc, crc; + igt_plane_t *primary; bool has_4tile = intel_get_device_info(intel_get_drm_devid(drm_fd))->has_4tile; - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); + + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &fb); + igt_plane_set_fb(primary, &fb); + igt_draw_rect_fb(drm_fd, bops, 0, &fb, gem_has_mappable_ggtt(drm_fd) ? IGT_DRAW_MMAP_GTT : IGT_DRAW_MMAP_WC, 0, 0, fb.width, fb.height, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, &base_crc); @@ -251,40 +224,26 @@ static void fill_fb_subtest(void) static void setup_environment(void) { - int i; - drm_fd = drm_open_driver_master(DRIVER_INTEL); igt_require(drm_fd >= 0); - - drm_res = drmModeGetResources(drm_fd); - igt_require(drm_res); - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); - - for (i = 0; i < drm_res->count_connectors; i++) - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, - drm_res->connectors[i]); + igt_display_require(&display, drm_fd); + igt_display_require_output(&display); kmstest_set_vt_graphics_mode(); bops = buf_ops_create(drm_fd); find_modeset_params(); - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), - INTEL_PIPE_CRC_SOURCE_AUTO); } static void teardown_environment(void) { - int i; + igt_display_fini(&display); igt_pipe_crc_free(pipe_crc); buf_ops_destroy(bops); - for (i = 0; i < drm_res->count_connectors; i++) - drmModeFreeConnector(drm_connectors[i]); - - drmModeFreeResources(drm_res); close(drm_fd); } @@ -346,7 +305,7 @@ igt_main !gem_has_mappable_ggtt(drm_fd)) continue; - if (!format_is_supported(formats[format_idx], modifier)) + if (!igt_display_has_format_mod(&display, formats[format_idx], modifier)) continue; igt_dynamic_f("%s-%s-%s", -- 2.36.0 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-10 13:27 ` Nidhi Gupta @ 2022-08-12 10:37 ` Modem, Bhanuprakash 0 siblings, 0 replies; 23+ messages in thread From: Modem, Bhanuprakash @ 2022-08-12 10:37 UTC (permalink / raw) To: Nidhi Gupta, igt-dev On Wed-10-08-2022 06:57 pm, Nidhi Gupta wrote: > v2: -Replace drm function call with existing library functions > (Bhanu) > > v3: -Replace PIPE_A with compatible pipe/output combo. > (Bhanu) > > v4: -use for_each_pipe_with_single_output() for finding > compatible pipe/ouput combo. > -remove crtc_id as not used anywhere. > -set fb to primary plane before commiting. > (Bhanu) > > v5: -set fb to primary plane before commiting > for fill_fb_subtest() also. > -use existing IGT lib helper igt_display_has_format_mod() > instead of format_is_supported(). > (Bhanu) > -added igt_display_fini(..) for cleanup > (Juha-Pekka Heikkila) > > Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> > --- > tests/i915/kms_draw_crc.c | 113 ++++++++++++-------------------------- > 1 file changed, 36 insertions(+), 77 deletions(-) > > diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c > index 48c7d931..f1887470 100644 > --- a/tests/i915/kms_draw_crc.c > +++ b/tests/i915/kms_draw_crc.c > @@ -29,15 +29,10 @@ > > #define MAX_CONNECTORS 32 > > -struct modeset_params { > - uint32_t crtc_id; > - uint32_t connector_id; > - drmModeModeInfoPtr mode; > -}; > - > int drm_fd; > -drmModeResPtr drm_res; > -drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; > +igt_display_t display; > +igt_output_t *output; > +drmModeModeInfoPtr mode; > struct buf_ops *bops; > igt_pipe_crc_t *pipe_crc; > > @@ -60,34 +55,24 @@ struct base_crc { > }; > struct base_crc base_crcs[ARRAY_SIZE(formats)]; > > -struct modeset_params ms; > - > static void find_modeset_params(void) > { > - int i; > - uint32_t crtc_id; > - drmModeConnectorPtr connector = NULL; > - drmModeModeInfoPtr mode = NULL; > - > - for (i = 0; i < drm_res->count_connectors; i++) { > - drmModeConnectorPtr c = drm_connectors[i]; > - > - if (c->count_modes) { > - connector = c; > - mode = &c->modes[0]; > - break; > - } > - } > - igt_require(connector); > + enum pipe pipe; > > - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, > - 0); > - igt_assert(mode); > + igt_display_reset(&display); > + igt_display_commit(&display); > > - ms.connector_id = connector->connector_id; > - ms.crtc_id = crtc_id; > - ms.mode = mode; > + for_each_pipe_with_single_output(&display, pipe, output) { s/for_each_pipe_with_single_output/for_each_pipe_with_valid_output/ > + igt_output_set_pipe(output, pipe); > > + mode = igt_output_get_mode(output); > + if (!mode) > + continue; I guess, every connected output will have atleast one valid mode, so we can drop this check. Otherwise, we must unset output/pipe & continue, and we need a check to handle if there is no valid mode found with all connected outputs. By addressing above commets, this patch is Reviewed-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com> - Bhanu > + > + pipe_crc = igt_pipe_crc_new(drm_fd, pipe, INTEL_PIPE_CRC_SOURCE_AUTO); > + /*Only one pipe/output is enough*/ > + break; > + } > } > > static uint32_t get_color(uint32_t drm_format, bool r, bool g, bool b) > @@ -122,9 +107,14 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, > { > struct igt_fb fb; > int rc; > + igt_plane_t *primary; > > - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, > + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); > + > + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, > drm_format, modifier, &fb); > + igt_plane_set_fb(primary, &fb); > + > igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, > 0, 0, fb.width, fb.height, > get_color(drm_format, 0, 0, 1)); > @@ -144,8 +134,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, > igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, > get_color(drm_format, 0, 1, 1)); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); > @@ -153,25 +142,6 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, > igt_remove_fb(drm_fd, &fb); > } > > -static bool format_is_supported(uint32_t format, uint64_t modifier) > -{ > - uint32_t gem_handle, fb_id; > - unsigned int offsets[4] = {}; > - unsigned int strides[4] = {}; > - int ret; > - > - gem_handle = igt_create_bo_with_dimensions(drm_fd, 64, 64, > - format, modifier, > - 0, NULL, &strides[0], NULL); > - ret = __kms_addfb(drm_fd, gem_handle, 64, 64, > - format, modifier, strides, offsets, 1, > - DRM_MODE_FB_MODIFIERS, &fb_id); > - drmModeRmFB(drm_fd, fb_id); > - gem_close(drm_fd, gem_handle); > - > - return ret == 0; > -} > - > static void draw_method_subtest(enum igt_draw_method method, > uint32_t format_index, uint64_t modifier) > { > @@ -198,13 +168,12 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) > struct igt_fb fb; > int rc; > > - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, > + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, > DRM_FORMAT_XRGB8888, modifier, &fb); > > igt_draw_fill_fb(drm_fd, &fb, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); > @@ -217,18 +186,22 @@ static void fill_fb_subtest(void) > int rc; > struct igt_fb fb; > igt_crc_t base_crc, crc; > + igt_plane_t *primary; > bool has_4tile = intel_get_device_info(intel_get_drm_devid(drm_fd))->has_4tile; > > - igt_create_fb(drm_fd, ms.mode->hdisplay, ms.mode->vdisplay, > + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); > + > + igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay, > DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &fb); > > + igt_plane_set_fb(primary, &fb); > + > igt_draw_rect_fb(drm_fd, bops, 0, &fb, > gem_has_mappable_ggtt(drm_fd) ? IGT_DRAW_MMAP_GTT : > IGT_DRAW_MMAP_WC, > 0, 0, fb.width, fb.height, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, &base_crc); > @@ -251,40 +224,26 @@ static void fill_fb_subtest(void) > > static void setup_environment(void) > { > - int i; > - > drm_fd = drm_open_driver_master(DRIVER_INTEL); > igt_require(drm_fd >= 0); > - > - drm_res = drmModeGetResources(drm_fd); > - igt_require(drm_res); > - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); > - > - for (i = 0; i < drm_res->count_connectors; i++) > - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, > - drm_res->connectors[i]); > + igt_display_require(&display, drm_fd); > + igt_display_require_output(&display); > > kmstest_set_vt_graphics_mode(); > > bops = buf_ops_create(drm_fd); > > find_modeset_params(); > - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), > - INTEL_PIPE_CRC_SOURCE_AUTO); > } > > static void teardown_environment(void) > { > - int i; > + igt_display_fini(&display); > > igt_pipe_crc_free(pipe_crc); > > buf_ops_destroy(bops); > > - for (i = 0; i < drm_res->count_connectors; i++) > - drmModeFreeConnector(drm_connectors[i]); > - > - drmModeFreeResources(drm_res); > close(drm_fd); > } > > @@ -346,7 +305,7 @@ igt_main > !gem_has_mappable_ggtt(drm_fd)) > continue; > > - if (!format_is_supported(formats[format_idx], modifier)) > + if (!igt_display_has_format_mod(&display, formats[format_idx], modifier)) > continue; > > igt_dynamic_f("%s-%s-%s", ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup @ 2022-08-03 4:15 Nidhi Gupta 2022-08-03 4:15 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 0 siblings, 1 reply; 23+ messages in thread From: Nidhi Gupta @ 2022-08-03 4:15 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta Convert all possible subtests to dynamic and replace drm function call with existing library functions. Nidhi Gupta (2): tests/i915/kms_draw_crc: Convert tests to dynamic tests/i915/kms_draw_crc: Test Cleanup tests/i915/kms_draw_crc.c | 125 ++++++++++++++++++++------------------ 1 file changed, 65 insertions(+), 60 deletions(-) -- 2.26.2 ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-03 4:15 [igt-dev] [PATCH 0/2] " Nidhi Gupta @ 2022-08-03 4:15 ` Nidhi Gupta 0 siblings, 0 replies; 23+ messages in thread From: Nidhi Gupta @ 2022-08-03 4:15 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta v2: -Replace drm function call with existing library functions (Bhanu) v3: -Replace PIPE_A with compatible pipe/output combo. (Bhanu) Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> --- tests/i915/kms_draw_crc.c | 71 ++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 39 deletions(-) diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c index edab2f3b..d3c44c5c 100644 --- a/tests/i915/kms_draw_crc.c +++ b/tests/i915/kms_draw_crc.c @@ -31,12 +31,13 @@ struct modeset_params { uint32_t crtc_id; - uint32_t connector_id; drmModeModeInfoPtr mode; }; int drm_fd; -drmModeResPtr drm_res; +igt_display_t display; +enum pipe pipe1; +igt_output_t *output; drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; struct buf_ops *bops; igt_pipe_crc_t *pipe_crc; @@ -64,27 +65,37 @@ struct modeset_params ms; static void find_modeset_params(void) { - int i; uint32_t crtc_id; - drmModeConnectorPtr connector = NULL; - drmModeModeInfoPtr mode = NULL; + drmModeModeInfo *mode; - for (i = 0; i < drm_res->count_connectors; i++) { - drmModeConnectorPtr c = drm_connectors[i]; + igt_display_reset(&display); + igt_display_commit(&display); - if (c->count_modes) { - connector = c; - mode = &c->modes[0]; - break; + for_each_connected_output(&display, output) { + + //if (!is_supported(output)) + // continue; + + for_each_pipe(&display, pipe1) { + if (igt_pipe_connector_valid(pipe1, output)) + /*One pipe is enough*/ + break; } + /*One output is enough*/ + break; } - igt_require(connector); - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, - 0); + igt_info("pipe-%s-%s", kmstest_pipe_name(pipe1), output->name); + + output = igt_get_single_output_for_pipe(&display, pipe1); + igt_require(output); + igt_output_set_pipe(output, pipe1); + + mode = igt_output_get_mode(output); igt_assert(mode); - ms.connector_id = connector->connector_id; + crtc_id = display.pipes[pipe1].crtc_id; + ms.crtc_id = crtc_id; ms.mode = mode; @@ -144,8 +155,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, get_color(drm_format, 0, 1, 1)); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -203,8 +213,7 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) igt_draw_fill_fb(drm_fd, &fb, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -227,8 +236,7 @@ static void fill_fb_subtest(void) IGT_DRAW_MMAP_WC, 0, 0, fb.width, fb.height, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, &base_crc); @@ -251,40 +259,25 @@ static void fill_fb_subtest(void) static void setup_environment(void) { - int i; - drm_fd = drm_open_driver_master(DRIVER_INTEL); igt_require(drm_fd >= 0); - - drm_res = drmModeGetResources(drm_fd); - igt_require(drm_res); - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); - - for (i = 0; i < drm_res->count_connectors; i++) - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, - drm_res->connectors[i]); + igt_display_require(&display, drm_fd); + igt_display_require_output(&display); kmstest_set_vt_graphics_mode(); bops = buf_ops_create(drm_fd); find_modeset_params(); - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), - INTEL_PIPE_CRC_SOURCE_AUTO); + pipe_crc = igt_pipe_crc_new(drm_fd, pipe1, INTEL_PIPE_CRC_SOURCE_AUTO); } static void teardown_environment(void) { - int i; - igt_pipe_crc_free(pipe_crc); buf_ops_destroy(bops); - for (i = 0; i < drm_res->count_connectors; i++) - drmModeFreeConnector(drm_connectors[i]); - - drmModeFreeResources(drm_res); close(drm_fd); } -- 2.26.2 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup @ 2022-08-02 6:53 Nidhi Gupta 2022-08-02 6:53 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 0 siblings, 1 reply; 23+ messages in thread From: Nidhi Gupta @ 2022-08-02 6:53 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta Convert all possible subtests to dynamic and replace drm function call with existing library functions. Nidhi Gupta (2): tests/i915/kms_draw_crc: Convert tests to dynamic tests/i915/kms_draw_crc: Test Cleanup tests/i915/kms_draw_crc.c | 74 ++++++++++++++------------------------- 1 file changed, 26 insertions(+), 48 deletions(-) -- 2.26.2 ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-02 6:53 [igt-dev] [PATCH 0/2] " Nidhi Gupta @ 2022-08-02 6:53 ` Nidhi Gupta 2022-08-02 9:56 ` Modem, Bhanuprakash 0 siblings, 1 reply; 23+ messages in thread From: Nidhi Gupta @ 2022-08-02 6:53 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta v2: -Replace drm function call with existing library functions (Bhanu) Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> --- tests/i915/kms_draw_crc.c | 60 ++++++++++++--------------------------- 1 file changed, 18 insertions(+), 42 deletions(-) diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c index 5c9feac9..eaa200b9 100644 --- a/tests/i915/kms_draw_crc.c +++ b/tests/i915/kms_draw_crc.c @@ -31,12 +31,12 @@ struct modeset_params { uint32_t crtc_id; - uint32_t connector_id; drmModeModeInfoPtr mode; }; int drm_fd; -drmModeResPtr drm_res; +igt_display_t display; +igt_output_t *output; drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; struct buf_ops *bops; igt_pipe_crc_t *pipe_crc; @@ -64,27 +64,21 @@ struct modeset_params ms; static void find_modeset_params(void) { - int i; uint32_t crtc_id; - drmModeConnectorPtr connector = NULL; - drmModeModeInfoPtr mode = NULL; + drmModeModeInfo *mode; - for (i = 0; i < drm_res->count_connectors; i++) { - drmModeConnectorPtr c = drm_connectors[i]; + igt_display_reset(&display); + igt_display_commit(&display); - if (c->count_modes) { - connector = c; - mode = &c->modes[0]; - break; - } - } - igt_require(connector); - - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, - 0); + output = igt_get_single_output_for_pipe(&display, PIPE_A); + igt_require(output); + igt_output_set_pipe(output, PIPE_A); + + mode = igt_output_get_mode(output); igt_assert(mode); - ms.connector_id = connector->connector_id; + crtc_id = display.pipes[PIPE_A].crtc_id; + ms.crtc_id = crtc_id; ms.mode = mode; @@ -144,8 +138,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, get_color(drm_format, 0, 1, 1)); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -212,8 +205,7 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) igt_draw_fill_fb(drm_fd, &fb, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, crc); @@ -236,8 +228,7 @@ static void fill_fb_subtest(void) IGT_DRAW_MMAP_WC, 0, 0, fb.width, fb.height, 0xFF); - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, - &ms.connector_id, 1, ms.mode); + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_assert_eq(rc, 0); igt_pipe_crc_collect_crc(pipe_crc, &base_crc); @@ -260,40 +251,25 @@ static void fill_fb_subtest(void) static void setup_environment(void) { - int i; - drm_fd = drm_open_driver_master(DRIVER_INTEL); igt_require(drm_fd >= 0); - - drm_res = drmModeGetResources(drm_fd); - igt_require(drm_res); - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); - - for (i = 0; i < drm_res->count_connectors; i++) - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, - drm_res->connectors[i]); + igt_display_require(&display, drm_fd); + igt_display_require_output(&display); kmstest_set_vt_graphics_mode(); bops = buf_ops_create(drm_fd); find_modeset_params(); - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), - INTEL_PIPE_CRC_SOURCE_AUTO); + pipe_crc = igt_pipe_crc_new(drm_fd, PIPE_A, INTEL_PIPE_CRC_SOURCE_AUTO); } static void teardown_environment(void) { - int i; - igt_pipe_crc_free(pipe_crc); buf_ops_destroy(bops); - for (i = 0; i < drm_res->count_connectors; i++) - drmModeFreeConnector(drm_connectors[i]); - - drmModeFreeResources(drm_res); close(drm_fd); } -- 2.26.2 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-08-02 6:53 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta @ 2022-08-02 9:56 ` Modem, Bhanuprakash 0 siblings, 0 replies; 23+ messages in thread From: Modem, Bhanuprakash @ 2022-08-02 9:56 UTC (permalink / raw) To: Nidhi Gupta, igt-dev Hi Nidhi, Overall, this change looks good to me. Please address some minor comments inline. On Tue-02-08-2022 12:23 pm, Nidhi Gupta wrote: > v2: -Replace drm function call with existing library functions > (Bhanu) > > Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> > --- > tests/i915/kms_draw_crc.c | 60 ++++++++++++--------------------------- > 1 file changed, 18 insertions(+), 42 deletions(-) > > diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c > index 5c9feac9..eaa200b9 100644 > --- a/tests/i915/kms_draw_crc.c > +++ b/tests/i915/kms_draw_crc.c > @@ -31,12 +31,12 @@ > > struct modeset_params { > uint32_t crtc_id; > - uint32_t connector_id; > drmModeModeInfoPtr mode; > }; > > int drm_fd; > -drmModeResPtr drm_res; > +igt_display_t display; > +igt_output_t *output; > drmModeConnectorPtr drm_connectors[MAX_CONNECTORS]; > struct buf_ops *bops; > igt_pipe_crc_t *pipe_crc; > @@ -64,27 +64,21 @@ struct modeset_params ms; > > static void find_modeset_params(void) > { > - int i; > uint32_t crtc_id; > - drmModeConnectorPtr connector = NULL; > - drmModeModeInfoPtr mode = NULL; > + drmModeModeInfo *mode; > > - for (i = 0; i < drm_res->count_connectors; i++) { > - drmModeConnectorPtr c = drm_connectors[i]; > + igt_display_reset(&display); > + igt_display_commit(&display); > > - if (c->count_modes) { > - connector = c; > - mode = &c->modes[0]; > - break; > - } > - } > - igt_require(connector); > - > - crtc_id = kmstest_find_crtc_for_connector(drm_fd, drm_res, connector, > - 0); > + output = igt_get_single_output_for_pipe(&display, PIPE_A); If PIPE_A is not available or fused, then? Please find a compatible pipe/output combo to proceed. - Bhanu > + igt_require(output); > + igt_output_set_pipe(output, PIPE_A); > + > + mode = igt_output_get_mode(output); > igt_assert(mode); > > - ms.connector_id = connector->connector_id; > + crtc_id = display.pipes[PIPE_A].crtc_id; > + > ms.crtc_id = crtc_id; > ms.mode = mode; > > @@ -144,8 +138,7 @@ static void get_method_crc(enum igt_draw_method method, uint32_t drm_format, > igt_draw_rect_fb(drm_fd, bops, 0, &fb, method, 1, 1, 15, 15, > get_color(drm_format, 0, 1, 1)); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); > @@ -212,8 +205,7 @@ static void get_fill_crc(uint64_t modifier, igt_crc_t *crc) > > igt_draw_fill_fb(drm_fd, &fb, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, crc); > @@ -236,8 +228,7 @@ static void fill_fb_subtest(void) > IGT_DRAW_MMAP_WC, > 0, 0, fb.width, fb.height, 0xFF); > > - rc = drmModeSetCrtc(drm_fd, ms.crtc_id, fb.fb_id, 0, 0, > - &ms.connector_id, 1, ms.mode); > + rc = igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > igt_assert_eq(rc, 0); > > igt_pipe_crc_collect_crc(pipe_crc, &base_crc); > @@ -260,40 +251,25 @@ static void fill_fb_subtest(void) > > static void setup_environment(void) > { > - int i; > - > drm_fd = drm_open_driver_master(DRIVER_INTEL); > igt_require(drm_fd >= 0); > - > - drm_res = drmModeGetResources(drm_fd); > - igt_require(drm_res); > - igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); > - > - for (i = 0; i < drm_res->count_connectors; i++) > - drm_connectors[i] = drmModeGetConnectorCurrent(drm_fd, > - drm_res->connectors[i]); > + igt_display_require(&display, drm_fd); > + igt_display_require_output(&display); > > kmstest_set_vt_graphics_mode(); > > bops = buf_ops_create(drm_fd); > > find_modeset_params(); > - pipe_crc = igt_pipe_crc_new(drm_fd, kmstest_get_crtc_idx(drm_res, ms.crtc_id), > - INTEL_PIPE_CRC_SOURCE_AUTO); > + pipe_crc = igt_pipe_crc_new(drm_fd, PIPE_A, INTEL_PIPE_CRC_SOURCE_AUTO); > } > > static void teardown_environment(void) > { > - int i; > - > igt_pipe_crc_free(pipe_crc); > > buf_ops_destroy(bops); > > - for (i = 0; i < drm_res->count_connectors; i++) > - drmModeFreeConnector(drm_connectors[i]); > - > - drmModeFreeResources(drm_res); > close(drm_fd); > } > ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 0/2] tests/kms: IGT test cleanup @ 2022-06-10 4:31 Nidhi Gupta 2022-06-10 4:31 ` [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup Nidhi Gupta 0 siblings, 1 reply; 23+ messages in thread From: Nidhi Gupta @ 2022-06-10 4:31 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta In below test, convert all possible subtests to dynamic and sanitize the system state before starting/exiting the subtest. Nidhi Gupta (2): tests/i915/kms_draw_crc.c: Convert test to dynamic tests/i915/kms_draw_crc: Test Cleanup tests/i915/kms_draw_crc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.26.2 ^ permalink raw reply [flat|nested] 23+ messages in thread
* [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup 2022-06-10 4:31 [igt-dev] [PATCH 0/2] tests/kms: IGT test cleanup Nidhi Gupta @ 2022-06-10 4:31 ` Nidhi Gupta 0 siblings, 0 replies; 23+ messages in thread From: Nidhi Gupta @ 2022-06-10 4:31 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta Sanitize the system state before starting the subtest. Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> --- tests/i915/kms_draw_crc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c index 3e68479e..1c87e523 100644 --- a/tests/i915/kms_draw_crc.c +++ b/tests/i915/kms_draw_crc.c @@ -265,6 +265,7 @@ static void setup_environment(void) drm_fd = drm_open_driver_master(DRIVER_INTEL); igt_require(drm_fd >= 0); + igt_display_reset(display); drm_res = drmModeGetResources(drm_fd); igt_require(drm_res); igt_assert(drm_res->count_connectors <= MAX_CONNECTORS); -- 2.26.2 ^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2022-09-05 11:29 UTC | newest] Thread overview: 23+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-08-03 4:20 [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup Nidhi Gupta 2022-08-03 4:20 ` [igt-dev] [PATCH 1/2] tests/i915/kms_draw_crc: Convert tests to dynamic Nidhi Gupta 2022-08-03 7:04 ` Modem, Bhanuprakash 2022-08-03 4:20 ` [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup Nidhi Gupta 2022-08-03 7:40 ` Modem, Bhanuprakash 2022-08-03 5:01 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/i915/kms_draw_crc: Test Cleanup (rev3) Patchwork 2022-08-03 10:54 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork -- strict thread matches above, loose matches on Subject: below -- 2022-09-05 11:24 [igt-dev] [PATCH 0/2] tests/i915/kms_draw_crc: Test Cleanup Nidhi Gupta 2022-09-05 11:24 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 2022-08-26 5:44 [igt-dev] [PATCH 0/2] " Nidhi Gupta 2022-08-26 5:44 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 2022-08-22 9:20 [igt-dev] [PATCH 0/2] " Nidhi Gupta 2022-08-22 9:20 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 2022-08-04 3:40 [igt-dev] [PATCH 0/2] " Nidhi Gupta 2022-08-04 3:40 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 2022-08-08 11:16 ` Gupta, Nidhi1 2022-08-08 14:02 ` Modem, Bhanuprakash 2022-08-09 8:00 ` Modem, Bhanuprakash 2022-08-09 9:08 ` Modem, Bhanuprakash 2022-08-09 12:53 ` Juha-Pekka Heikkila 2022-08-10 10:11 ` Nidhi Gupta 2022-08-10 13:27 ` Nidhi Gupta 2022-08-12 10:37 ` Modem, Bhanuprakash 2022-08-03 4:15 [igt-dev] [PATCH 0/2] " Nidhi Gupta 2022-08-03 4:15 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 2022-08-02 6:53 [igt-dev] [PATCH 0/2] " Nidhi Gupta 2022-08-02 6:53 ` [igt-dev] [PATCH 2/2] " Nidhi Gupta 2022-08-02 9:56 ` Modem, Bhanuprakash 2022-06-10 4:31 [igt-dev] [PATCH 0/2] tests/kms: IGT test cleanup Nidhi Gupta 2022-06-10 4:31 ` [igt-dev] [PATCH 2/2] tests/i915/kms_draw_crc: Test Cleanup Nidhi Gupta
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox