[igt-dev] [PATCH i-g-t] tests: Make a fb-tiling subtest to check for invalid tiling changes.

Chris Wilson chris at chris-wilson.co.uk
Tue Oct 30 17:27:13 UTC 2018


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 at 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 at 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


More information about the igt-dev mailing list