* [igt-dev] [PATCH i-g-t] tests: Make a fb-tiling subtest to check for invalid tiling changes.
@ 2018-10-30 17:17 Maarten Lankhorst
2018-10-30 17:27 ` Chris Wilson
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Maarten Lankhorst @ 2018-10-30 17:17 UTC (permalink / raw)
To: igt-dev
In 2013 we prevented changing the tiling of an active framebuffer:
commit 80075d492f8773209e26d11d6bb13ba624ef95a4
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed Oct 9 21:23:52 2013 +0200
drm/i915: prevent tiling changes on framebuffer backing storage
After this we no longer have any use for the bad-tiling subtest, and
only have to make sure changing tiling on a fb is not allowed.
Remove the original bad-tiling subtest, and add a i915_fb_tiling
subtest for this case.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
tests/Makefile.sources | 3 +++
tests/i915/fb_tiling.c | 46 ++++++++++++++++++++++++++++++++++++++++++
tests/kms_flip.c | 35 ++------------------------------
tests/meson.build | 1 +
4 files changed, 52 insertions(+), 33 deletions(-)
create mode 100644 tests/i915/fb_tiling.c
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index bdf49d5d5b98..b1aa6a02a03f 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -479,6 +479,9 @@ gen3_render_tiledx_blits_SOURCES = i915/gen3_render_tiledx_blits.c
TESTS_progs += gen3_render_tiledy_blits
gen3_render_tiledy_blits_SOURCES = i915/gen3_render_tiledy_blits.c
+TESTS_progs += fb_tiling
+i915_fb_tiling_SOURCES = i915/fb_tiling.c
+
TESTS_progs += i915_query
i915_query_SOURCES = i915/query.c
diff --git a/tests/i915/fb_tiling.c b/tests/i915/fb_tiling.c
new file mode 100644
index 000000000000..7d5c3f1fafe6
--- /dev/null
+++ b/tests/i915/fb_tiling.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2018 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#include "igt.h"
+
+IGT_TEST_DESCRIPTION("Object tiling must be fixed after framebuffer creation.");
+
+igt_simple_main
+{
+ int drm_fd = drm_open_driver_master(DRIVER_INTEL);
+ struct igt_fb fb;
+ int ret;
+
+ igt_create_fb(drm_fd, 512, 512, DRM_FORMAT_XRGB8888,
+ LOCAL_I915_FORMAT_MOD_X_TILED, &fb);
+
+ ret = __gem_set_tiling(drm_fd, fb.gem_handle, I915_TILING_X, fb.strides[0]);
+ igt_assert_eq(ret, 0);
+
+ ret = __gem_set_tiling(drm_fd, fb.gem_handle, I915_TILING_NONE, fb.strides[0]);
+ igt_assert_eq(ret, -EBUSY);
+
+ igt_remove_fb(drm_fd, &fb);
+ close(drm_fd);
+}
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index f28272dd1e3f..dc70ee23dc0a 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -60,7 +60,7 @@
#define TEST_RMFB (1 << 14)
#define TEST_HANG (1 << 15)
#define TEST_NOEVENT (1 << 16)
-#define TEST_FB_BAD_TILING (1 << 17)
+
#define TEST_SINGLE_BUFFER (1 << 18)
#define TEST_DPMS_OFF (1 << 19)
#define TEST_NO_2X_OUTPUT (1 << 20)
@@ -603,20 +603,6 @@ static void recreate_fb(struct test_output *o)
o->fb_info[o->current_fb_id].fb_id = new_fb_id;
}
-static void set_y_tiling(struct test_output *o, int fb_idx)
-{
- drmModeFBPtr r;
- struct igt_fb *fb_info = &o->fb_info[fb_idx];
-
- /* Call rmfb/getfb/addfb to ensure those don't introduce stalls */
- r = drmModeGetFB(drm_fd, fb_info->fb_id);
- igt_assert(r);
- /* Newer kernels don't allow such shenagians any more, so skip the test. */
- igt_require(__gem_set_tiling(drm_fd, r->handle, I915_TILING_Y, fb_info->strides[0]) == 0);
- gem_close(drm_fd, r->handle);
- drmFree(r);
-}
-
static igt_hang_t hang_gpu(int fd)
{
return igt_hang_ring(fd, I915_EXEC_DEFAULT);
@@ -695,9 +681,6 @@ static unsigned int run_test_step(struct test_output *o)
recreate_fb(o);
new_fb_id = o->fb_ids[o->current_fb_id];
- if (o->flags & TEST_FB_BAD_TILING)
- new_fb_id = o->fb_ids[2];
-
if ((o->flags & TEST_VBLANK_EXPIRED_SEQ) &&
!(o->pending_events & EVENT_VBLANK) && o->flip_state.count > 0) {
struct vblank_reply reply;
@@ -723,9 +706,6 @@ static unsigned int run_test_step(struct test_output *o)
if (do_flip && (o->flags & TEST_EINVAL) && o->flip_state.count > 0)
igt_assert(do_page_flip(o, new_fb_id, true) == expected_einval);
- if (o->flags & TEST_FB_BAD_TILING)
- new_fb_id = o->fb_ids[o->current_fb_id];
-
if (do_vblank && (o->flags & TEST_EINVAL) && o->vblank_state.count > 0)
igt_assert(do_wait_for_vblank(o, o->pipe, target_seq, &vbl_reply)
== -EINVAL);
@@ -840,7 +820,7 @@ static unsigned int run_test_step(struct test_output *o)
igt_assert(do_wait_for_vblank(o, o->pipe, target_seq, &vbl_reply)
== -EINVAL);
- if (do_flip && (o->flags & TEST_EINVAL) && !(o->flags & TEST_FB_BAD_TILING))
+ if (do_flip && (o->flags & TEST_EINVAL))
igt_assert(do_page_flip(o, new_fb_id, true) == expected_einval);
unhang_gpu(drm_fd, hang);
@@ -1265,22 +1245,12 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
igt_assert(o->fb_ids[0]);
igt_assert(o->fb_ids[1]);
- if (o->flags & TEST_FB_BAD_TILING) {
- o->fb_ids[2] = igt_create_fb(drm_fd, o->fb_width, o->fb_height,
- igt_bpp_depth_to_drm_format(o->bpp, o->depth),
- LOCAL_I915_FORMAT_MOD_X_TILED, &o->fb_info[2]);
- igt_require(o->fb_ids[2]);
- }
-
paint_flip_mode(&o->fb_info[0], false);
if (!(o->flags & TEST_BO_TOOBIG))
paint_flip_mode(&o->fb_info[1], true);
if (o->fb_ids[2])
paint_flip_mode(&o->fb_info[2], true);
- if (o->flags & TEST_FB_BAD_TILING)
- set_y_tiling(o, 2);
-
for (i = 0; i < o->count; i++)
kmstest_dump_mode(&o->kmode[i]);
@@ -1556,7 +1526,6 @@ int main(int argc, char **argv)
TEST_CHECK_TS, "flip-vs-blocking-wf-vblank" },
{ 30, TEST_FLIP | TEST_MODESET | TEST_HANG | TEST_NOEVENT, "flip-vs-modeset-vs-hang" },
{ 30, TEST_FLIP | TEST_PAN | TEST_HANG, "flip-vs-panning-vs-hang" },
- { 1, TEST_FLIP | TEST_EINVAL | TEST_FB_BAD_TILING, "flip-vs-bad-tiling" },
{ 1, TEST_DPMS_OFF | TEST_MODESET | TEST_FLIP,
"flip-vs-dpms-off-vs-modeset" },
diff --git a/tests/meson.build b/tests/meson.build
index b23d34ce7a95..878c4a0c7465 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -98,6 +98,7 @@ test_progs = [
]
i915_progs = [
+ 'fb_tiling',
'query',
]
--
2.19.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] tests: Make a fb-tiling subtest to check for invalid tiling changes.
2018-10-30 17:17 [igt-dev] [PATCH i-g-t] tests: Make a fb-tiling subtest to check for invalid tiling changes Maarten Lankhorst
@ 2018-10-30 17:27 ` Chris Wilson
2018-10-30 18:58 ` Maarten Lankhorst
2018-10-30 18:13 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Chris Wilson @ 2018-10-30 17:27 UTC (permalink / raw)
To: Maarten Lankhorst, igt-dev
Quoting Maarten Lankhorst (2018-10-30 17:17:38)
> In 2013 we prevented changing the tiling of an active framebuffer:
>
> commit 80075d492f8773209e26d11d6bb13ba624ef95a4
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date: Wed Oct 9 21:23:52 2013 +0200
>
> drm/i915: prevent tiling changes on framebuffer backing storage
>
> After this we no longer have any use for the bad-tiling subtest, and
> only have to make sure changing tiling on a fb is not allowed.
>
> Remove the original bad-tiling subtest, and add a i915_fb_tiling
> subtest for this case.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> tests/Makefile.sources | 3 +++
> tests/i915/fb_tiling.c | 46 ++++++++++++++++++++++++++++++++++++++++++
> tests/kms_flip.c | 35 ++------------------------------
> tests/meson.build | 1 +
> 4 files changed, 52 insertions(+), 33 deletions(-)
> create mode 100644 tests/i915/fb_tiling.c
>
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index bdf49d5d5b98..b1aa6a02a03f 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -479,6 +479,9 @@ gen3_render_tiledx_blits_SOURCES = i915/gen3_render_tiledx_blits.c
> TESTS_progs += gen3_render_tiledy_blits
> gen3_render_tiledy_blits_SOURCES = i915/gen3_render_tiledy_blits.c
>
> +TESTS_progs += fb_tiling
> +i915_fb_tiling_SOURCES = i915/fb_tiling.c
> +
> TESTS_progs += i915_query
> i915_query_SOURCES = i915/query.c
>
> diff --git a/tests/i915/fb_tiling.c b/tests/i915/fb_tiling.c
> new file mode 100644
> index 000000000000..7d5c3f1fafe6
> --- /dev/null
> +++ b/tests/i915/fb_tiling.c
> @@ -0,0 +1,46 @@
> +/*
> + * Copyright © 2018 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + *
> + */
> +
> +#include "igt.h"
> +
> +IGT_TEST_DESCRIPTION("Object tiling must be fixed after framebuffer creation.");
> +
> +igt_simple_main
> +{
> + int drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + struct igt_fb fb;
> + int ret;
> +
> + igt_create_fb(drm_fd, 512, 512, DRM_FORMAT_XRGB8888,
> + LOCAL_I915_FORMAT_MOD_X_TILED, &fb);
> +
> + ret = __gem_set_tiling(drm_fd, fb.gem_handle, I915_TILING_X, fb.strides[0]);
> + igt_assert_eq(ret, 0);
> +
> + ret = __gem_set_tiling(drm_fd, fb.gem_handle, I915_TILING_NONE, fb.strides[0]);
> + igt_assert_eq(ret, -EBUSY);
We could just fix it so that the fb has a fixed modifier and protected
vma (i.e. store the fence information on the vma not obj).
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for tests: Make a fb-tiling subtest to check for invalid tiling changes.
2018-10-30 17:17 [igt-dev] [PATCH i-g-t] tests: Make a fb-tiling subtest to check for invalid tiling changes Maarten Lankhorst
2018-10-30 17:27 ` Chris Wilson
@ 2018-10-30 18:13 ` Patchwork
2018-10-30 23:15 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-01-23 14:14 ` [igt-dev] [PATCH i-g-t] " Juha-Pekka Heikkila
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2018-10-30 18:13 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: igt-dev
== Series Details ==
Series: tests: Make a fb-tiling subtest to check for invalid tiling changes.
URL : https://patchwork.freedesktop.org/series/51773/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5056 -> IGTPW_2021 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/51773/revisions/1/mbox/
== Known issues ==
Here are the changes found in IGTPW_2021 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@debugfs_test@read_all_entries:
fi-icl-u2: NOTRUN -> DMESG-WARN (fdo#108070)
igt@drv_selftest@live_contexts:
fi-icl-u2: NOTRUN -> DMESG-FAIL (fdo#108569)
igt@gem_ctx_switch@basic-default:
fi-icl-u: PASS -> INCOMPLETE (fdo#108535, fdo#108315)
igt@gem_exec_suspend@basic-s3:
fi-cfl-8109u: PASS -> INCOMPLETE (fdo#107187, fdo#108126)
fi-icl-u2: NOTRUN -> DMESG-WARN (fdo#106612)
igt@kms_chamelium@hdmi-hpd-fast:
fi-icl-u2: NOTRUN -> FAIL (fdo#108559) +3
igt@kms_frontbuffer_tracking@basic:
fi-byt-clapper: PASS -> FAIL (fdo#103167)
==== Possible fixes ====
igt@drv_selftest@live_hangcheck:
fi-skl-guc: DMESG-FAIL (fdo#108593) -> PASS
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#106612 https://bugs.freedesktop.org/show_bug.cgi?id=106612
fdo#107187 https://bugs.freedesktop.org/show_bug.cgi?id=107187
fdo#108070 https://bugs.freedesktop.org/show_bug.cgi?id=108070
fdo#108126 https://bugs.freedesktop.org/show_bug.cgi?id=108126
fdo#108315 https://bugs.freedesktop.org/show_bug.cgi?id=108315
fdo#108535 https://bugs.freedesktop.org/show_bug.cgi?id=108535
fdo#108559 https://bugs.freedesktop.org/show_bug.cgi?id=108559
fdo#108569 https://bugs.freedesktop.org/show_bug.cgi?id=108569
fdo#108593 https://bugs.freedesktop.org/show_bug.cgi?id=108593
== Participating hosts (47 -> 42) ==
Additional (2): fi-icl-u2 fi-gdg-551
Missing (7): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-pnv-d510
== Build changes ==
* IGT: IGT_4700 -> IGTPW_2021
CI_DRM_5056: 66042a8951a617f682937b574a1addee7e80ff21 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2021: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2021/
IGT_4700: b517f6533671552166c11748ee48019093ebd069 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Testlist changes ==
+igt@i915_fb_tiling
-igt@kms_flip@2x-flip-vs-bad-tiling
-igt@kms_flip@2x-flip-vs-bad-tiling-interruptible
-igt@kms_flip@flip-vs-bad-tiling
-igt@kms_flip@flip-vs-bad-tiling-interruptible
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2021/issues.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] tests: Make a fb-tiling subtest to check for invalid tiling changes.
2018-10-30 17:27 ` Chris Wilson
@ 2018-10-30 18:58 ` Maarten Lankhorst
0 siblings, 0 replies; 7+ messages in thread
From: Maarten Lankhorst @ 2018-10-30 18:58 UTC (permalink / raw)
To: Chris Wilson, igt-dev
Op 30-10-18 om 18:27 schreef Chris Wilson:
> Quoting Maarten Lankhorst (2018-10-30 17:17:38)
>> In 2013 we prevented changing the tiling of an active framebuffer:
>>
>> commit 80075d492f8773209e26d11d6bb13ba624ef95a4
>> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
>> Date: Wed Oct 9 21:23:52 2013 +0200
>>
>> drm/i915: prevent tiling changes on framebuffer backing storage
>>
>> After this we no longer have any use for the bad-tiling subtest, and
>> only have to make sure changing tiling on a fb is not allowed.
>>
>> Remove the original bad-tiling subtest, and add a i915_fb_tiling
>> subtest for this case.
>>
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> ---
>> tests/Makefile.sources | 3 +++
>> tests/i915/fb_tiling.c | 46 ++++++++++++++++++++++++++++++++++++++++++
>> tests/kms_flip.c | 35 ++------------------------------
>> tests/meson.build | 1 +
>> 4 files changed, 52 insertions(+), 33 deletions(-)
>> create mode 100644 tests/i915/fb_tiling.c
>>
>> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
>> index bdf49d5d5b98..b1aa6a02a03f 100644
>> --- a/tests/Makefile.sources
>> +++ b/tests/Makefile.sources
>> @@ -479,6 +479,9 @@ gen3_render_tiledx_blits_SOURCES = i915/gen3_render_tiledx_blits.c
>> TESTS_progs += gen3_render_tiledy_blits
>> gen3_render_tiledy_blits_SOURCES = i915/gen3_render_tiledy_blits.c
>>
>> +TESTS_progs += fb_tiling
>> +i915_fb_tiling_SOURCES = i915/fb_tiling.c
>> +
>> TESTS_progs += i915_query
>> i915_query_SOURCES = i915/query.c
>>
>> diff --git a/tests/i915/fb_tiling.c b/tests/i915/fb_tiling.c
>> new file mode 100644
>> index 000000000000..7d5c3f1fafe6
>> --- /dev/null
>> +++ b/tests/i915/fb_tiling.c
>> @@ -0,0 +1,46 @@
>> +/*
>> + * Copyright © 2018 Intel Corporation
>> + *
>> + * Permission is hereby granted, free of charge, to any person obtaining a
>> + * copy of this software and associated documentation files (the "Software"),
>> + * to deal in the Software without restriction, including without limitation
>> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
>> + * and/or sell copies of the Software, and to permit persons to whom the
>> + * Software is furnished to do so, subject to the following conditions:
>> + *
>> + * The above copyright notice and this permission notice (including the next
>> + * paragraph) shall be included in all copies or substantial portions of the
>> + * Software.
>> + *
>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
>> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
>> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
>> + * IN THE SOFTWARE.
>> + *
>> + */
>> +
>> +#include "igt.h"
>> +
>> +IGT_TEST_DESCRIPTION("Object tiling must be fixed after framebuffer creation.");
>> +
>> +igt_simple_main
>> +{
>> + int drm_fd = drm_open_driver_master(DRIVER_INTEL);
>> + struct igt_fb fb;
>> + int ret;
>> +
>> + igt_create_fb(drm_fd, 512, 512, DRM_FORMAT_XRGB8888,
>> + LOCAL_I915_FORMAT_MOD_X_TILED, &fb);
>> +
>> + ret = __gem_set_tiling(drm_fd, fb.gem_handle, I915_TILING_X, fb.strides[0]);
>> + igt_assert_eq(ret, 0);
>> +
>> + ret = __gem_set_tiling(drm_fd, fb.gem_handle, I915_TILING_NONE, fb.strides[0]);
>> + igt_assert_eq(ret, -EBUSY);
> We could just fix it so that the fb has a fixed modifier and protected
> vma (i.e. store the fence information on the vma not obj).
> -Chris
Still, this test is testing current kernel behavior. I think having separate tiling
modes for the obj and fb is not something that would have a valid usecase. :)
`Maarten
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for tests: Make a fb-tiling subtest to check for invalid tiling changes.
2018-10-30 17:17 [igt-dev] [PATCH i-g-t] tests: Make a fb-tiling subtest to check for invalid tiling changes Maarten Lankhorst
2018-10-30 17:27 ` Chris Wilson
2018-10-30 18:13 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-10-30 23:15 ` Patchwork
2019-01-23 14:14 ` [igt-dev] [PATCH i-g-t] " Juha-Pekka Heikkila
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2018-10-30 23:15 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: igt-dev
== Series Details ==
Series: tests: Make a fb-tiling subtest to check for invalid tiling changes.
URL : https://patchwork.freedesktop.org/series/51773/
State : success
== Summary ==
= CI Bug Log - changes from IGT_4700_full -> IGTPW_2021_full =
== Summary - WARNING ==
Minor unknown changes coming with IGTPW_2021_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_2021_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://patchwork.freedesktop.org/api/1.0/series/51773/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in IGTPW_2021_full:
=== IGT changes ===
==== Warnings ====
igt@perf_pmu@rc6:
shard-kbl: SKIP -> PASS
igt@pm_rc6_residency@rc6-accuracy:
shard-snb: SKIP -> PASS
== Known issues ==
Here are the changes found in IGTPW_2021_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_pwrite@stolen-display:
shard-snb: SKIP -> INCOMPLETE (fdo#105411)
igt@gem_softpin@noreloc-s3:
shard-kbl: PASS -> INCOMPLETE (fdo#103665) +1
igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
shard-kbl: PASS -> DMESG-WARN (fdo#107956)
igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
shard-kbl: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_color@pipe-c-ctm-max:
shard-apl: PASS -> FAIL (fdo#108147)
igt@kms_cursor_crc@cursor-128x42-random:
shard-glk: PASS -> FAIL (fdo#103232) +1
shard-apl: PASS -> FAIL (fdo#103232)
igt@kms_cursor_legacy@cursorb-vs-flipb-toggle:
shard-glk: PASS -> DMESG-WARN (fdo#106538, fdo#105763) +2
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
shard-apl: PASS -> FAIL (fdo#103167) +1
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen:
shard-kbl: PASS -> FAIL (fdo#103167) +1
igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
shard-glk: PASS -> FAIL (fdo#103167) +9
igt@kms_plane@plane-position-covered-pipe-a-planes:
shard-glk: PASS -> FAIL (fdo#103166) +4
igt@kms_plane@plane-position-covered-pipe-b-planes:
shard-kbl: PASS -> FAIL (fdo#103166)
shard-apl: PASS -> FAIL (fdo#103166)
igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
shard-kbl: NOTRUN -> FAIL (fdo#108145)
igt@kms_plane_alpha_blend@pipe-c-alpha-opaque-fb:
shard-kbl: PASS -> FAIL (fdo#108145) +1
shard-apl: PASS -> FAIL (fdo#108145) +1
igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
shard-glk: PASS -> FAIL (fdo#108145) +3
igt@kms_setmode@basic:
shard-apl: PASS -> FAIL (fdo#99912)
shard-kbl: PASS -> FAIL (fdo#99912)
==== Possible fixes ====
igt@gem_ctx_isolation@vecs0-s3:
shard-kbl: INCOMPLETE (fdo#103665) -> PASS
igt@kms_atomic_interruptible@universal-setplane-cursor:
shard-kbl: DMESG-WARN (fdo#105345) -> PASS
igt@kms_available_modes_crc@available_mode_test_crc:
shard-snb: FAIL (fdo#106641) -> PASS
igt@kms_color@pipe-c-degamma:
shard-apl: FAIL (fdo#104782) -> PASS
igt@kms_cursor_crc@cursor-128x128-suspend:
shard-glk: FAIL (fdo#103232) -> PASS +3
shard-apl: FAIL (fdo#103232, fdo#103191) -> PASS
shard-kbl: FAIL (fdo#103232, fdo#103191) -> PASS
igt@kms_cursor_crc@cursor-256x85-random:
shard-apl: FAIL (fdo#103232) -> PASS +7
igt@kms_cursor_crc@cursor-256x85-sliding:
shard-kbl: FAIL (fdo#103232) -> PASS +1
igt@kms_flip@flip-vs-expired-vblank:
shard-glk: FAIL (fdo#105363) -> PASS
igt@kms_flip@flip-vs-modeset-interruptible:
shard-kbl: DMESG-WARN (fdo#105345, fdo#103313) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-onoff:
shard-glk: FAIL (fdo#103167) -> PASS
igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
shard-apl: FAIL (fdo#103166) -> PASS
shard-kbl: FAIL (fdo#103166) -> PASS
fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
fdo#103313 https://bugs.freedesktop.org/show_bug.cgi?id=103313
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#104782 https://bugs.freedesktop.org/show_bug.cgi?id=104782
fdo#105345 https://bugs.freedesktop.org/show_bug.cgi?id=105345
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
fdo#106641 https://bugs.freedesktop.org/show_bug.cgi?id=106641
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
fdo#108147 https://bugs.freedesktop.org/show_bug.cgi?id=108147
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (6 -> 5) ==
Missing (1): shard-skl
== Build changes ==
* IGT: IGT_4700 -> IGTPW_2021
* Linux: CI_DRM_5054 -> CI_DRM_5056
CI_DRM_5054: dfa9e5c2b4b958e77c1109477b94c5c8615e25cc @ git://anongit.freedesktop.org/gfx-ci/linux
CI_DRM_5056: 66042a8951a617f682937b574a1addee7e80ff21 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2021: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2021/
IGT_4700: b517f6533671552166c11748ee48019093ebd069 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2021/shards.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] tests: Make a fb-tiling subtest to check for invalid tiling changes.
2018-10-30 17:17 [igt-dev] [PATCH i-g-t] tests: Make a fb-tiling subtest to check for invalid tiling changes Maarten Lankhorst
` (2 preceding siblings ...)
2018-10-30 23:15 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
@ 2019-01-23 14:14 ` Juha-Pekka Heikkila
2019-01-28 12:04 ` Maarten Lankhorst
3 siblings, 1 reply; 7+ messages in thread
From: Juha-Pekka Heikkila @ 2019-01-23 14:14 UTC (permalink / raw)
To: Maarten Lankhorst, igt-dev
Look good to me. Those autotools and meson file changes I think you'll
need to rebase but with that
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
/Juha-Pekka
On 30.10.2018 19.17, Maarten Lankhorst wrote:
> In 2013 we prevented changing the tiling of an active framebuffer:
>
> commit 80075d492f8773209e26d11d6bb13ba624ef95a4
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date: Wed Oct 9 21:23:52 2013 +0200
>
> drm/i915: prevent tiling changes on framebuffer backing storage
>
> After this we no longer have any use for the bad-tiling subtest, and
> only have to make sure changing tiling on a fb is not allowed.
>
> Remove the original bad-tiling subtest, and add a i915_fb_tiling
> subtest for this case.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> tests/Makefile.sources | 3 +++
> tests/i915/fb_tiling.c | 46 ++++++++++++++++++++++++++++++++++++++++++
> tests/kms_flip.c | 35 ++------------------------------
> tests/meson.build | 1 +
> 4 files changed, 52 insertions(+), 33 deletions(-)
> create mode 100644 tests/i915/fb_tiling.c
>
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index bdf49d5d5b98..b1aa6a02a03f 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -479,6 +479,9 @@ gen3_render_tiledx_blits_SOURCES = i915/gen3_render_tiledx_blits.c
> TESTS_progs += gen3_render_tiledy_blits
> gen3_render_tiledy_blits_SOURCES = i915/gen3_render_tiledy_blits.c
>
> +TESTS_progs += fb_tiling
> +i915_fb_tiling_SOURCES = i915/fb_tiling.c
> +
> TESTS_progs += i915_query
> i915_query_SOURCES = i915/query.c
>
> diff --git a/tests/i915/fb_tiling.c b/tests/i915/fb_tiling.c
> new file mode 100644
> index 000000000000..7d5c3f1fafe6
> --- /dev/null
> +++ b/tests/i915/fb_tiling.c
> @@ -0,0 +1,46 @@
> +/*
> + * Copyright © 2018 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + *
> + */
> +
> +#include "igt.h"
> +
> +IGT_TEST_DESCRIPTION("Object tiling must be fixed after framebuffer creation.");
> +
> +igt_simple_main
> +{
> + int drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + struct igt_fb fb;
> + int ret;
> +
> + igt_create_fb(drm_fd, 512, 512, DRM_FORMAT_XRGB8888,
> + LOCAL_I915_FORMAT_MOD_X_TILED, &fb);
> +
> + ret = __gem_set_tiling(drm_fd, fb.gem_handle, I915_TILING_X, fb.strides[0]);
> + igt_assert_eq(ret, 0);
> +
> + ret = __gem_set_tiling(drm_fd, fb.gem_handle, I915_TILING_NONE, fb.strides[0]);
> + igt_assert_eq(ret, -EBUSY);
> +
> + igt_remove_fb(drm_fd, &fb);
> + close(drm_fd);
> +}
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> index f28272dd1e3f..dc70ee23dc0a 100644
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -60,7 +60,7 @@
> #define TEST_RMFB (1 << 14)
> #define TEST_HANG (1 << 15)
> #define TEST_NOEVENT (1 << 16)
> -#define TEST_FB_BAD_TILING (1 << 17)
> +
> #define TEST_SINGLE_BUFFER (1 << 18)
> #define TEST_DPMS_OFF (1 << 19)
> #define TEST_NO_2X_OUTPUT (1 << 20)
> @@ -603,20 +603,6 @@ static void recreate_fb(struct test_output *o)
> o->fb_info[o->current_fb_id].fb_id = new_fb_id;
> }
>
> -static void set_y_tiling(struct test_output *o, int fb_idx)
> -{
> - drmModeFBPtr r;
> - struct igt_fb *fb_info = &o->fb_info[fb_idx];
> -
> - /* Call rmfb/getfb/addfb to ensure those don't introduce stalls */
> - r = drmModeGetFB(drm_fd, fb_info->fb_id);
> - igt_assert(r);
> - /* Newer kernels don't allow such shenagians any more, so skip the test. */
> - igt_require(__gem_set_tiling(drm_fd, r->handle, I915_TILING_Y, fb_info->strides[0]) == 0);
> - gem_close(drm_fd, r->handle);
> - drmFree(r);
> -}
> -
> static igt_hang_t hang_gpu(int fd)
> {
> return igt_hang_ring(fd, I915_EXEC_DEFAULT);
> @@ -695,9 +681,6 @@ static unsigned int run_test_step(struct test_output *o)
> recreate_fb(o);
> new_fb_id = o->fb_ids[o->current_fb_id];
>
> - if (o->flags & TEST_FB_BAD_TILING)
> - new_fb_id = o->fb_ids[2];
> -
> if ((o->flags & TEST_VBLANK_EXPIRED_SEQ) &&
> !(o->pending_events & EVENT_VBLANK) && o->flip_state.count > 0) {
> struct vblank_reply reply;
> @@ -723,9 +706,6 @@ static unsigned int run_test_step(struct test_output *o)
> if (do_flip && (o->flags & TEST_EINVAL) && o->flip_state.count > 0)
> igt_assert(do_page_flip(o, new_fb_id, true) == expected_einval);
>
> - if (o->flags & TEST_FB_BAD_TILING)
> - new_fb_id = o->fb_ids[o->current_fb_id];
> -
> if (do_vblank && (o->flags & TEST_EINVAL) && o->vblank_state.count > 0)
> igt_assert(do_wait_for_vblank(o, o->pipe, target_seq, &vbl_reply)
> == -EINVAL);
> @@ -840,7 +820,7 @@ static unsigned int run_test_step(struct test_output *o)
> igt_assert(do_wait_for_vblank(o, o->pipe, target_seq, &vbl_reply)
> == -EINVAL);
>
> - if (do_flip && (o->flags & TEST_EINVAL) && !(o->flags & TEST_FB_BAD_TILING))
> + if (do_flip && (o->flags & TEST_EINVAL))
> igt_assert(do_page_flip(o, new_fb_id, true) == expected_einval);
>
> unhang_gpu(drm_fd, hang);
> @@ -1265,22 +1245,12 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
> igt_assert(o->fb_ids[0]);
> igt_assert(o->fb_ids[1]);
>
> - if (o->flags & TEST_FB_BAD_TILING) {
> - o->fb_ids[2] = igt_create_fb(drm_fd, o->fb_width, o->fb_height,
> - igt_bpp_depth_to_drm_format(o->bpp, o->depth),
> - LOCAL_I915_FORMAT_MOD_X_TILED, &o->fb_info[2]);
> - igt_require(o->fb_ids[2]);
> - }
> -
> paint_flip_mode(&o->fb_info[0], false);
> if (!(o->flags & TEST_BO_TOOBIG))
> paint_flip_mode(&o->fb_info[1], true);
> if (o->fb_ids[2])
> paint_flip_mode(&o->fb_info[2], true);
>
> - if (o->flags & TEST_FB_BAD_TILING)
> - set_y_tiling(o, 2);
> -
> for (i = 0; i < o->count; i++)
> kmstest_dump_mode(&o->kmode[i]);
>
> @@ -1556,7 +1526,6 @@ int main(int argc, char **argv)
> TEST_CHECK_TS, "flip-vs-blocking-wf-vblank" },
> { 30, TEST_FLIP | TEST_MODESET | TEST_HANG | TEST_NOEVENT, "flip-vs-modeset-vs-hang" },
> { 30, TEST_FLIP | TEST_PAN | TEST_HANG, "flip-vs-panning-vs-hang" },
> - { 1, TEST_FLIP | TEST_EINVAL | TEST_FB_BAD_TILING, "flip-vs-bad-tiling" },
>
> { 1, TEST_DPMS_OFF | TEST_MODESET | TEST_FLIP,
> "flip-vs-dpms-off-vs-modeset" },
> diff --git a/tests/meson.build b/tests/meson.build
> index b23d34ce7a95..878c4a0c7465 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -98,6 +98,7 @@ test_progs = [
> ]
>
> i915_progs = [
> + 'fb_tiling',
> 'query',
> ]
>
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] tests: Make a fb-tiling subtest to check for invalid tiling changes.
2019-01-23 14:14 ` [igt-dev] [PATCH i-g-t] " Juha-Pekka Heikkila
@ 2019-01-28 12:04 ` Maarten Lankhorst
0 siblings, 0 replies; 7+ messages in thread
From: Maarten Lankhorst @ 2019-01-28 12:04 UTC (permalink / raw)
To: juhapekka.heikkila, igt-dev
Op 23-01-2019 om 15:14 schreef Juha-Pekka Heikkila:
> Look good to me. Those autotools and meson file changes I think you'll need to rebase but with that
>
> Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Yeah, fixed build system and pushed after confirming both still build correctly. :)
Thanks
Maarten
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-01-28 12:04 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-30 17:17 [igt-dev] [PATCH i-g-t] tests: Make a fb-tiling subtest to check for invalid tiling changes Maarten Lankhorst
2018-10-30 17:27 ` Chris Wilson
2018-10-30 18:58 ` Maarten Lankhorst
2018-10-30 18:13 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-10-30 23:15 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-01-23 14:14 ` [igt-dev] [PATCH i-g-t] " Juha-Pekka Heikkila
2019-01-28 12:04 ` Maarten Lankhorst
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.