* [igt-dev] [CI 1/3] lib/igt_fb: Switch to using is_ccs_modifier() wrapper
@ 2019-03-20 21:15 Dhinakaran Pandiyan
2019-03-20 21:15 ` [igt-dev] [CI 2/3] tests/kms_ccs: Refactor code to add CCS modifiers Dhinakaran Pandiyan
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Dhinakaran Pandiyan @ 2019-03-20 21:15 UTC (permalink / raw)
To: igt-dev
A linear mapping setup for Y, Yf tiled and CCS modifiers. Instead of
checking against each CCS modifier, let's make use of this wrapper.
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
lib/igt_fb.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 6a9a9341..bad1d1fb 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -2519,8 +2519,7 @@ static void create_cairo_surface__convert(int fd, struct igt_fb *fb)
if (fb->modifier == LOCAL_I915_FORMAT_MOD_Y_TILED ||
fb->modifier == LOCAL_I915_FORMAT_MOD_Yf_TILED ||
- fb->modifier == LOCAL_I915_FORMAT_MOD_Y_TILED_CCS ||
- fb->modifier == LOCAL_I915_FORMAT_MOD_Yf_TILED_CCS) {
+ is_ccs_modifier(fb->modifier)) {
setup_linear_mapping(&blit->base);
} else {
blit->base.linear.fb = *fb;
--
2.17.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread* [igt-dev] [CI 2/3] tests/kms_ccs: Refactor code to add CCS modifiers. 2019-03-20 21:15 [igt-dev] [CI 1/3] lib/igt_fb: Switch to using is_ccs_modifier() wrapper Dhinakaran Pandiyan @ 2019-03-20 21:15 ` Dhinakaran Pandiyan 2019-03-20 21:16 ` [igt-dev] [CI 3/3] tests/kms_ccs: Test Yf CCS modifier too Dhinakaran Pandiyan ` (2 subsequent siblings) 3 siblings, 0 replies; 5+ messages in thread From: Dhinakaran Pandiyan @ 2019-03-20 21:15 UTC (permalink / raw) To: igt-dev Currently only Y tiled CCS modifier is tested, rewrite the functions so that we can add support for other CCS modifiers. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- tests/kms_ccs.c | 52 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/tests/kms_ccs.c b/tests/kms_ccs.c index a74bd706..f780a01c 100644 --- a/tests/kms_ccs.c +++ b/tests/kms_ccs.c @@ -58,6 +58,7 @@ typedef struct { enum test_flags flags; igt_plane_t *plane; igt_pipe_crc_t *pipe_crc; + uint64_t ccs_modifier; } data_t; static const struct { @@ -69,6 +70,10 @@ static const struct { {0.0, 1.0, 0.0} }; +static const uint64_t ccs_modifiers[] = { + LOCAL_I915_FORMAT_MOD_Y_TILED_CCS +}; + /* * Limit maximum used sprite plane width so this test will not mistakenly * fail on hardware limitations which are not interesting to this test. @@ -140,7 +145,8 @@ modifiers_ptr(struct local_drm_format_modifier_blob *blob) return (struct local_drm_format_modifier *)(((char *)blob) + blob->modifiers_offset); } -static bool plane_has_format_with_ccs(data_t *data, igt_plane_t *plane, uint32_t format) +static bool plane_has_format_with_ccs(data_t *data, igt_plane_t *plane, + uint32_t format) { drmModePropertyBlobPtr blob; struct local_drm_format_modifier_blob *blob_data; @@ -178,7 +184,7 @@ static bool plane_has_format_with_ccs(data_t *data, igt_plane_t *plane, uint32_t last_mod = &modifiers[blob_data->count_modifiers]; igt_assert_lte(((char *) last_mod - (char *) blob_data), blob->length); for (int i = 0; i < blob_data->count_modifiers; i++) { - if (modifiers[i].modifier != LOCAL_I915_FORMAT_MOD_Y_TILED_CCS) + if (modifiers[i].modifier != data->ccs_modifier) continue; if (modifiers[i].offset > fmt_idx || @@ -226,7 +232,7 @@ static void generate_fb(data_t *data, struct igt_fb *fb, * available FIFO configurations. */ if (fb_flags & FB_COMPRESSED) - modifier = LOCAL_I915_FORMAT_MOD_Y_TILED_CCS; + modifier = data->ccs_modifier; else if (!(fb_flags & FB_HAS_PLANE)) modifier = LOCAL_I915_FORMAT_MOD_Y_TILED; else @@ -313,6 +319,7 @@ static bool try_config(data_t *data, enum test_fb_flags fb_flags, if (data->plane && fb_flags & FB_COMPRESSED) { if (!plane_has_format_with_ccs(data, data->plane, DRM_FORMAT_XRGB8888)) return false; + generate_fb(data, &fb, min(MAX_SPRITE_PLANE_WIDTH, drm_mode->hdisplay), drm_mode->vdisplay, (fb_flags & ~FB_COMPRESSED) | FB_HAS_PLANE); @@ -369,21 +376,10 @@ static bool try_config(data_t *data, enum test_fb_flags fb_flags, return true; } -static int test_output(data_t *data) -{ - igt_display_t *display = &data->display; +static int test_ccs(data_t *data) +{ int valid_tests = 0; igt_crc_t crc, ref_crc; enum test_fb_flags fb_flags = 0; - int valid_tests = 0; - - igt_display_require_output_on_pipe(display, data->pipe); - - /* Sets data->output with a valid output. */ - for_each_valid_output_on_pipe(display, data->pipe, data->output) { - break; - } - - igt_output_set_pipe(data->output, data->pipe); if (data->flags & TEST_CRC) { data->pipe_crc = igt_pipe_crc_new(data->drm_fd, data->pipe, INTEL_PIPE_CRC_SOURCE_AUTO); @@ -411,7 +407,29 @@ static int test_output(data_t *data) valid_tests += try_config(data, fb_flags | FB_COMPRESSED | FB_ZERO_AUX_STRIDE , NULL); } - igt_output_set_pipe(data->output, PIPE_ANY); + return valid_tests; +} + +static int test_output(data_t *data) +{ + igt_display_t *display = &data->display; + int i, valid_tests = 0; + + igt_display_require_output_on_pipe(display, data->pipe); + + /* Sets data->output with a valid output. */ + for_each_valid_output_on_pipe(display, data->pipe, data->output) { + break; + } + + igt_output_set_pipe(data->output, data->pipe); + + for (i = 0; i < ARRAY_SIZE(ccs_modifiers); i++) { + data->ccs_modifier = ccs_modifiers[i]; + valid_tests += test_ccs(data); + } + + igt_output_set_pipe(data->output, PIPE_NONE); igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); return valid_tests; -- 2.17.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] [CI 3/3] tests/kms_ccs: Test Yf CCS modifier too. 2019-03-20 21:15 [igt-dev] [CI 1/3] lib/igt_fb: Switch to using is_ccs_modifier() wrapper Dhinakaran Pandiyan 2019-03-20 21:15 ` [igt-dev] [CI 2/3] tests/kms_ccs: Refactor code to add CCS modifiers Dhinakaran Pandiyan @ 2019-03-20 21:16 ` Dhinakaran Pandiyan 2019-03-20 22:09 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [CI,1/3] lib/igt_fb: Switch to using is_ccs_modifier() wrapper Patchwork 2019-03-21 5:19 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork 3 siblings, 0 replies; 5+ messages in thread From: Dhinakaran Pandiyan @ 2019-03-20 21:16 UTC (permalink / raw) To: igt-dev Extend the test to Yf tiled CCS, no reason not to. v2: Add a comma after the last modifier (Ville) Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- tests/kms_ccs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/kms_ccs.c b/tests/kms_ccs.c index f780a01c..084f78f7 100644 --- a/tests/kms_ccs.c +++ b/tests/kms_ccs.c @@ -71,7 +71,8 @@ static const struct { }; static const uint64_t ccs_modifiers[] = { - LOCAL_I915_FORMAT_MOD_Y_TILED_CCS + LOCAL_I915_FORMAT_MOD_Y_TILED_CCS, + LOCAL_I915_FORMAT_MOD_Yf_TILED_CCS, }; /* -- 2.17.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for series starting with [CI,1/3] lib/igt_fb: Switch to using is_ccs_modifier() wrapper 2019-03-20 21:15 [igt-dev] [CI 1/3] lib/igt_fb: Switch to using is_ccs_modifier() wrapper Dhinakaran Pandiyan 2019-03-20 21:15 ` [igt-dev] [CI 2/3] tests/kms_ccs: Refactor code to add CCS modifiers Dhinakaran Pandiyan 2019-03-20 21:16 ` [igt-dev] [CI 3/3] tests/kms_ccs: Test Yf CCS modifier too Dhinakaran Pandiyan @ 2019-03-20 22:09 ` Patchwork 2019-03-21 5:19 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork 3 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2019-03-20 22:09 UTC (permalink / raw) To: Dhinakaran Pandiyan; +Cc: igt-dev == Series Details == Series: series starting with [CI,1/3] lib/igt_fb: Switch to using is_ccs_modifier() wrapper URL : https://patchwork.freedesktop.org/series/58296/ State : success == Summary == CI Bug Log - changes from CI_DRM_5784 -> IGTPW_2673 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://patchwork.freedesktop.org/api/1.0/series/58296/revisions/1/mbox/ Known issues ------------ Here are the changes found in IGTPW_2673 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_ctx_create@basic-files: - fi-gdg-551: NOTRUN -> SKIP [fdo#109271] +106 * igt@i915_pm_rpm@basic-pci-d3-state: - fi-hsw-4770: PASS -> SKIP [fdo#109271] +2 * igt@i915_selftest@live_evict: - fi-bsw-kefka: PASS -> DMESG-WARN [fdo#107709] * igt@kms_busy@basic-flip-a: - fi-gdg-551: NOTRUN -> FAIL [fdo#103182] * igt@kms_busy@basic-flip-c: - fi-gdg-551: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] * igt@kms_chamelium@hdmi-edid-read: - fi-hsw-peppy: NOTRUN -> SKIP [fdo#109271] +46 * igt@kms_frontbuffer_tracking@basic: - fi-hsw-peppy: NOTRUN -> DMESG-FAIL [fdo#102614] / [fdo#107814] - fi-byt-clapper: PASS -> FAIL [fdo#103167] * igt@kms_pipe_crc_basic@hang-read-crc-pipe-b: - fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362] * igt@kms_pipe_crc_basic@read-crc-pipe-a: - fi-byt-clapper: PASS -> FAIL [fdo#107362] * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b: - fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718] * igt@runner@aborted: - fi-bsw-kefka: NOTRUN -> FAIL [fdo#107709] #### Possible fixes #### * igt@i915_selftest@live_execlists: - fi-apl-guc: INCOMPLETE [fdo#103927] / [fdo#109720] -> PASS * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a: - fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS +1 {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614 [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182 [fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191 [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927 [fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362 [fdo#107709]: https://bugs.freedesktop.org/show_bug.cgi?id=107709 [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718 [fdo#107814]: https://bugs.freedesktop.org/show_bug.cgi?id=107814 [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278 [fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720 Participating hosts (46 -> 35) ------------------------------ Additional (2): fi-hsw-peppy fi-gdg-551 Missing (13): fi-kbl-soraka fi-ilk-m540 fi-bxt-dsi fi-hsw-4200u fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-snb-2520m fi-ctg-p8600 fi-kbl-x1275 fi-skl-lmem fi-byt-n2820 fi-bdw-samus Build changes ------------- * IGT: IGT_4894 -> IGTPW_2673 CI_DRM_5784: 7f9065d7aaa6abe9bc07e3694a8f3e2d5a91eebe @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_2673: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2673/ IGT_4894: fedd92f4022837e2c20e472b65bd7d0849f484a3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2673/ _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for series starting with [CI,1/3] lib/igt_fb: Switch to using is_ccs_modifier() wrapper 2019-03-20 21:15 [igt-dev] [CI 1/3] lib/igt_fb: Switch to using is_ccs_modifier() wrapper Dhinakaran Pandiyan ` (2 preceding siblings ...) 2019-03-20 22:09 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [CI,1/3] lib/igt_fb: Switch to using is_ccs_modifier() wrapper Patchwork @ 2019-03-21 5:19 ` Patchwork 3 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2019-03-21 5:19 UTC (permalink / raw) To: Dhinakaran Pandiyan; +Cc: igt-dev == Series Details == Series: series starting with [CI,1/3] lib/igt_fb: Switch to using is_ccs_modifier() wrapper URL : https://patchwork.freedesktop.org/series/58296/ State : success == Summary == CI Bug Log - changes from CI_DRM_5784_full -> IGTPW_2673_full ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://patchwork.freedesktop.org/api/1.0/series/58296/revisions/1/mbox/ Known issues ------------ Here are the changes found in IGTPW_2673_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@kms_atomic_transition@1x-modeset-transitions-nonblocking-fencing: - shard-apl: PASS -> FAIL [fdo#109660] - shard-kbl: PASS -> FAIL [fdo#109660] * igt@kms_atomic_transition@3x-modeset-transitions: - shard-glk: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b: - shard-snb: PASS -> DMESG-WARN [fdo#107956] +1 * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c: - shard-hsw: PASS -> DMESG-WARN [fdo#107956] +1 * igt@kms_busy@extended-pageflip-hang-newfb-render-b: - shard-glk: NOTRUN -> DMESG-WARN [fdo#107956] * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a: - shard-kbl: PASS -> DMESG-WARN [fdo#107956] +3 * igt@kms_concurrent@pipe-f: - shard-kbl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] - shard-apl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] * igt@kms_cursor_crc@cursor-128x128-suspend: - shard-snb: PASS -> INCOMPLETE [fdo#105411] - shard-kbl: PASS -> INCOMPLETE [fdo#103665] * igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy: - shard-hsw: PASS -> FAIL [fdo#105767] * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt: - shard-glk: PASS -> FAIL [fdo#103167] - shard-apl: PASS -> FAIL [fdo#103167] - shard-kbl: PASS -> FAIL [fdo#103167] * igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-pri-shrfb-draw-pwrite: - shard-glk: NOTRUN -> SKIP [fdo#109271] +15 * igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-spr-indfb-draw-mmap-gtt: - shard-apl: NOTRUN -> SKIP [fdo#109271] +5 * igt@kms_plane_scaling@pipe-a-scaler-with-clipping-clamping: - shard-glk: PASS -> SKIP [fdo#109271] / [fdo#109278] * igt@kms_rotation_crc@multiplane-rotation-cropping-top: - shard-kbl: PASS -> FAIL [fdo#109016] * igt@kms_vblank@pipe-a-ts-continuation-modeset-hang: - shard-kbl: PASS -> FAIL [fdo#104894] - shard-apl: PASS -> FAIL [fdo#104894] #### Possible fixes #### * igt@i915_pm_rps@waitboost: - shard-hsw: FAIL -> PASS * igt@kms_busy@extended-modeset-hang-newfb-render-a: - shard-hsw: DMESG-WARN [fdo#107956] -> PASS - shard-snb: DMESG-WARN [fdo#107956] -> PASS * igt@kms_rotation_crc@multiplane-rotation-cropping-bottom: - shard-kbl: FAIL [fdo#109016] -> PASS * igt@kms_setmode@basic: - shard-hsw: FAIL [fdo#99912] -> PASS #### Warnings #### * igt@kms_plane_scaling@pipe-c-scaler-with-rotation: - shard-glk: FAIL [fdo#110098] -> SKIP [fdo#109271] / [fdo#109278] +1 * igt@kms_rotation_crc@multiplane-rotation: - shard-kbl: DMESG-FAIL [fdo#105763] -> INCOMPLETE [fdo#103665] {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665 [fdo#104894]: https://bugs.freedesktop.org/show_bug.cgi?id=104894 [fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411 [fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763 [fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767 [fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956 [fdo#109016]: https://bugs.freedesktop.org/show_bug.cgi?id=109016 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278 [fdo#109660]: https://bugs.freedesktop.org/show_bug.cgi?id=109660 [fdo#110098]: https://bugs.freedesktop.org/show_bug.cgi?id=110098 [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912 Participating hosts (10 -> 5) ------------------------------ Missing (5): shard-skl pig-hsw-4770r pig-glk-j5005 shard-iclb pig-skl-6260u Build changes ------------- * IGT: IGT_4894 -> IGTPW_2673 * Piglit: piglit_4509 -> None CI_DRM_5784: 7f9065d7aaa6abe9bc07e3694a8f3e2d5a91eebe @ git://anongit.freedesktop.org/gfx-ci/linux IGTPW_2673: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2673/ IGT_4894: fedd92f4022837e2c20e472b65bd7d0849f484a3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2673/ _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-03-21 5:19 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-03-20 21:15 [igt-dev] [CI 1/3] lib/igt_fb: Switch to using is_ccs_modifier() wrapper Dhinakaran Pandiyan 2019-03-20 21:15 ` [igt-dev] [CI 2/3] tests/kms_ccs: Refactor code to add CCS modifiers Dhinakaran Pandiyan 2019-03-20 21:16 ` [igt-dev] [CI 3/3] tests/kms_ccs: Test Yf CCS modifier too Dhinakaran Pandiyan 2019-03-20 22:09 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [CI,1/3] lib/igt_fb: Switch to using is_ccs_modifier() wrapper Patchwork 2019-03-21 5:19 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.