From ec4b76872d232faa7846e7c201e7fcfc98c682a9 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Thu, 13 Aug 2015 13:12:06 -0700 Subject: tests/kms_addfb: mark simple fb creation tests as basic v2 We should always be able to create simple and tiled objects. v2: make the whole test basic (Daniel) add to .gitignore Reviewed-by: Daniel Vetter Signed-off-by: Jesse Barnes --- tests/.gitignore | 2 +- tests/Makefile.sources | 2 +- tests/kms_addfb.c | 427 ------------------------------------------------ tests/kms_addfb_basic.c | 427 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 429 insertions(+), 429 deletions(-) delete mode 100644 tests/kms_addfb.c create mode 100644 tests/kms_addfb_basic.c (limited to 'tests') diff --git a/tests/.gitignore b/tests/.gitignore index 25363c0d..d6d05ff1 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -128,7 +128,7 @@ gen3_render_tiledx_blits gen3_render_tiledy_blits gen7_forcewake_mt kms_3d -kms_addfb +kms_addfb_basic kms_crtc_background_color kms_cursor_crc kms_draw_crc diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 4296829a..ef69299f 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -62,7 +62,7 @@ TESTS_progs_M = \ gem_tiled_partial_pwrite_pread \ gem_userptr_blits \ gem_write_read_ring_switch \ - kms_addfb \ + kms_addfb_basic \ kms_cursor_crc \ kms_draw_crc \ kms_fbc_crc \ diff --git a/tests/kms_addfb.c b/tests/kms_addfb.c deleted file mode 100644 index 42ee6328..00000000 --- a/tests/kms_addfb.c +++ /dev/null @@ -1,427 +0,0 @@ -/* - * Copyright © 2013 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. - * - * Authors: - * Daniel Vetter - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "drm.h" -#include "ioctl_wrappers.h" -#include "drmtest.h" -#include "drm_fourcc.h" -#include "intel_chipset.h" - -uint32_t gem_bo; -uint32_t gem_bo_small; - -static void invalid_tests(int fd) -{ - struct local_drm_mode_fb_cmd2 f = {}; - - f.width = 512; - f.height = 512; - f.pixel_format = DRM_FORMAT_XRGB8888; - f.pitches[0] = 512*4; - - igt_fixture { - gem_bo = gem_create(fd, 1024*1024*4); - igt_assert(gem_bo); - gem_bo_small = gem_create(fd, 1024*1024*4 - 4096); - igt_assert(gem_bo_small); - - f.handles[0] = gem_bo; - - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); - f.fb_id = 0; - } - - igt_subtest("unused-handle") { - f.handles[1] = gem_bo_small; - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && - errno == EINVAL); - f.handles[1] = 0; - } - - igt_subtest("unused-pitches") { - f.pitches[1] = 512; - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && - errno == EINVAL); - f.pitches[1] = 0; - } - - igt_subtest("unused-offsets") { - f.offsets[1] = 512; - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && - errno == EINVAL); - f.offsets[1] = 0; - } - - igt_subtest("unused-modifier") { - f.modifier[1] = LOCAL_I915_FORMAT_MOD_X_TILED; - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && - errno == EINVAL); - f.modifier[1] = 0; - } - - igt_fixture { - gem_close(fd, gem_bo); - gem_close(fd, gem_bo_small); - } -} - -static void pitch_tests(int fd) -{ - struct drm_mode_fb_cmd2 f = {}; - int bad_pitches[] = { 0, 32, 63, 128, 256, 256*4, 999, 64*1024 }; - int i; - - f.width = 512; - f.height = 512; - f.pixel_format = DRM_FORMAT_XRGB8888; - f.pitches[0] = 1024*4; - - igt_fixture { - gem_bo = gem_create(fd, 1024*1024*4); - igt_assert(gem_bo); - } - - igt_subtest("no-handle") { - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && - errno == EINVAL); - } - - f.handles[0] = gem_bo; - igt_subtest("normal") { - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); - f.fb_id = 0; - } - - for (i = 0; i < ARRAY_SIZE(bad_pitches); i++) { - igt_subtest_f("bad-pitch-%i", bad_pitches[i]) { - f.pitches[0] = bad_pitches[i]; - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && - errno == EINVAL); - } - } - - igt_fixture - gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); - f.pitches[0] = 1024*4; - - igt_subtest("X-tiled") { - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); - f.fb_id = 0; - } - - igt_subtest("framebuffer-vs-set-tiling") { - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); - igt_assert(__gem_set_tiling(fd, gem_bo, I915_TILING_X, 512*4) == -EBUSY); - igt_assert(__gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4) == -EBUSY); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); - f.fb_id = 0; - } - - f.pitches[0] = 512*4; - igt_subtest("tile-pitch-mismatch") { - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && - errno == EINVAL); - } - - igt_fixture - gem_set_tiling(fd, gem_bo, I915_TILING_Y, 1024*4); - f.pitches[0] = 1024*4; - igt_subtest("Y-tiled") { - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && - errno == EINVAL); - } - - igt_fixture - gem_close(fd, gem_bo); -} - -static void size_tests(int fd) -{ - struct drm_mode_fb_cmd2 f = {}; - struct drm_mode_fb_cmd2 f_16 = {}; - struct drm_mode_fb_cmd2 f_8 = {}; - - f.width = 1024; - f.height = 1024; - f.pixel_format = DRM_FORMAT_XRGB8888; - f.pitches[0] = 1024*4; - - f_16.width = 1024; - f_16.height = 1024*2; - f_16.pixel_format = DRM_FORMAT_RGB565; - f_16.pitches[0] = 1024*2; - - f_8.width = 1024*2; - f_8.height = 1024*2; - f_8.pixel_format = DRM_FORMAT_C8; - f_8.pitches[0] = 1024*2; - - igt_fixture { - gem_bo = gem_create(fd, 1024*1024*4); - igt_assert(gem_bo); - gem_bo_small = gem_create(fd, 1024*1024*4 - 4096); - igt_assert(gem_bo_small); - } - - f.handles[0] = gem_bo; - f_16.handles[0] = gem_bo; - f_8.handles[0] = gem_bo; - - igt_subtest("size-max") { - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); - f.fb_id = 0; - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f_16) == 0); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f_16.fb_id) == 0); - f.fb_id = 0; - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f_8) == 0); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f_8.fb_id) == 0); - f.fb_id = 0; - } - - f.width++; - f_16.width++; - f_8.width++; - igt_subtest("too-wide") { - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && - errno == EINVAL); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f_16) == -1 && - errno == EINVAL); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f_8) == -1 && - errno == EINVAL); - } - f.width--; - f_16.width--; - f_8.width--; - f.height++; - f_16.height++; - f_8.height++; - igt_subtest("too-high") { - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && - errno == EINVAL); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f_16) == -1 && - errno == EINVAL); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f_8) == -1 && - errno == EINVAL); - } - - f.handles[0] = gem_bo_small; - igt_subtest("bo-too-small") { - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && - errno == EINVAL); - } - - /* Just to check that the parameters would work. */ - f.height = 1020; - igt_subtest("small-bo") { - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); - f.fb_id = 0; - } - - igt_fixture - gem_set_tiling(fd, gem_bo_small, I915_TILING_X, 1024*4); - - igt_subtest("bo-too-small-due-to-tiling") { - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && - errno == EINVAL); - } - - - igt_fixture { - gem_close(fd, gem_bo); - gem_close(fd, gem_bo_small); - } -} - -static void addfb25_tests(int fd) -{ - struct local_drm_mode_fb_cmd2 f = {}; - - igt_fixture { - gem_bo = gem_create(fd, 1024*1024*4); - igt_assert(gem_bo); - - memset(&f, 0, sizeof(f)); - - f.width = 1024; - f.height = 1024; - f.pixel_format = DRM_FORMAT_XRGB8888; - f.pitches[0] = 1024*4; - f.modifier[0] = LOCAL_DRM_FORMAT_MOD_NONE; - - f.handles[0] = gem_bo; - } - - igt_subtest("addfb25-modifier-no-flag") { - igt_require_fb_modifiers(fd); - - f.modifier[0] = LOCAL_I915_FORMAT_MOD_X_TILED; - igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) < 0 && errno == EINVAL); - } - - igt_fixture - f.flags = LOCAL_DRM_MODE_FB_MODIFIERS; - - igt_subtest("addfb25-bad-modifier") { - igt_require_fb_modifiers(fd); - - f.modifier[0] = ~0; - igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) < 0 && errno == EINVAL); - } - - igt_fixture - gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); - - igt_subtest("addfb25-X-tiled-mismatch") { - igt_require_fb_modifiers(fd); - - f.modifier[0] = LOCAL_DRM_FORMAT_MOD_NONE; - igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) < 0 && errno == EINVAL); - } - - igt_subtest("addfb25-X-tiled") { - igt_require_fb_modifiers(fd); - - f.modifier[0] = LOCAL_I915_FORMAT_MOD_X_TILED; - igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) == 0); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); - f.fb_id = 0; - } - - igt_subtest("addfb25-framebuffer-vs-set-tiling") { - igt_require_fb_modifiers(fd); - - f.modifier[0] = LOCAL_I915_FORMAT_MOD_X_TILED; - igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) == 0); - igt_assert(__gem_set_tiling(fd, gem_bo, I915_TILING_X, 512*4) == -EBUSY); - igt_assert(__gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4) == -EBUSY); - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); - f.fb_id = 0; - } - - igt_fixture - gem_close(fd, gem_bo); -} - -static void addfb25_ytile(int fd, int gen) -{ - struct local_drm_mode_fb_cmd2 f = {}; - int shouldret; - - igt_fixture { - gem_bo = gem_create(fd, 1024*1024*4); - igt_assert(gem_bo); - gem_bo_small = gem_create(fd, 1024*1023*4); - igt_assert(gem_bo_small); - - shouldret = gen >= 9 ? 0 : -1; - - memset(&f, 0, sizeof(f)); - - f.width = 1024; - f.height = 1024; - f.pixel_format = DRM_FORMAT_XRGB8888; - f.pitches[0] = 1024*4; - f.flags = LOCAL_DRM_MODE_FB_MODIFIERS; - f.modifier[0] = LOCAL_DRM_FORMAT_MOD_NONE; - - f.handles[0] = gem_bo; - } - - igt_subtest("addfb25-Y-tiled") { - igt_require_fb_modifiers(fd); - - f.modifier[0] = LOCAL_I915_FORMAT_MOD_Y_TILED; - igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) == shouldret); - if (!shouldret) - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); - f.fb_id = 0; - } - - igt_subtest("addfb25-Yf-tiled") { - igt_require_fb_modifiers(fd); - - f.modifier[0] = LOCAL_I915_FORMAT_MOD_Yf_TILED; - igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) == shouldret); - if (!shouldret) - igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); - f.fb_id = 0; - } - - igt_subtest("addfb25-Y-tiled-small") { - igt_require_fb_modifiers(fd); - igt_require(gen >= 9); - - f.modifier[0] = LOCAL_I915_FORMAT_MOD_Y_TILED; - f.height = 1023; - f.handles[0] = gem_bo_small; - igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) < 0 && errno == EINVAL); - f.fb_id = 0; - } - - igt_fixture { - gem_close(fd, gem_bo); - gem_close(fd, gem_bo_small); - } -} - -int fd; -int gen; - -igt_main -{ - igt_fixture { - fd = drm_open_any_master(); - gen = intel_gen(intel_get_drm_devid(fd)); - } - - invalid_tests(fd); - - pitch_tests(fd); - - size_tests(fd); - - addfb25_tests(fd); - - addfb25_ytile(fd, gen); - - igt_fixture - close(fd); -} diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c new file mode 100644 index 00000000..f10e12bc --- /dev/null +++ b/tests/kms_addfb_basic.c @@ -0,0 +1,427 @@ +/* + * Copyright © 2013 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. + * + * Authors: + * Daniel Vetter + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "drm.h" +#include "ioctl_wrappers.h" +#include "drmtest.h" +#include "drm_fourcc.h" +#include "intel_chipset.h" + +uint32_t gem_bo; +uint32_t gem_bo_small; + +static void invalid_tests(int fd) +{ + struct local_drm_mode_fb_cmd2 f = {}; + + f.width = 512; + f.height = 512; + f.pixel_format = DRM_FORMAT_XRGB8888; + f.pitches[0] = 512*4; + + igt_fixture { + gem_bo = gem_create(fd, 1024*1024*4); + igt_assert(gem_bo); + gem_bo_small = gem_create(fd, 1024*1024*4 - 4096); + igt_assert(gem_bo_small); + + f.handles[0] = gem_bo; + + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); + f.fb_id = 0; + } + + igt_subtest("unused-handle") { + f.handles[1] = gem_bo_small; + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && + errno == EINVAL); + f.handles[1] = 0; + } + + igt_subtest("unused-pitches") { + f.pitches[1] = 512; + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && + errno == EINVAL); + f.pitches[1] = 0; + } + + igt_subtest("unused-offsets") { + f.offsets[1] = 512; + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && + errno == EINVAL); + f.offsets[1] = 0; + } + + igt_subtest("unused-modifier") { + f.modifier[1] = LOCAL_I915_FORMAT_MOD_X_TILED; + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && + errno == EINVAL); + f.modifier[1] = 0; + } + + igt_fixture { + gem_close(fd, gem_bo); + gem_close(fd, gem_bo_small); + } +} + +static void pitch_tests(int fd) +{ + struct drm_mode_fb_cmd2 f = {}; + int bad_pitches[] = { 0, 32, 63, 128, 256, 256*4, 999, 64*1024 }; + int i; + + f.width = 512; + f.height = 512; + f.pixel_format = DRM_FORMAT_XRGB8888; + f.pitches[0] = 1024*4; + + igt_fixture { + gem_bo = gem_create(fd, 1024*1024*4); + igt_assert(gem_bo); + } + + igt_subtest("no-handle") { + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && + errno == EINVAL); + } + + f.handles[0] = gem_bo; + igt_subtest("basic") { + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); + f.fb_id = 0; + } + + for (i = 0; i < ARRAY_SIZE(bad_pitches); i++) { + igt_subtest_f("bad-pitch-%i", bad_pitches[i]) { + f.pitches[0] = bad_pitches[i]; + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && + errno == EINVAL); + } + } + + igt_fixture + gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); + f.pitches[0] = 1024*4; + + igt_subtest("basic-X-tiled") { + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); + f.fb_id = 0; + } + + igt_subtest("framebuffer-vs-set-tiling") { + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); + igt_assert(__gem_set_tiling(fd, gem_bo, I915_TILING_X, 512*4) == -EBUSY); + igt_assert(__gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4) == -EBUSY); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); + f.fb_id = 0; + } + + f.pitches[0] = 512*4; + igt_subtest("tile-pitch-mismatch") { + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && + errno == EINVAL); + } + + igt_fixture + gem_set_tiling(fd, gem_bo, I915_TILING_Y, 1024*4); + f.pitches[0] = 1024*4; + igt_subtest("basic-Y-tiled") { + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && + errno == EINVAL); + } + + igt_fixture + gem_close(fd, gem_bo); +} + +static void size_tests(int fd) +{ + struct drm_mode_fb_cmd2 f = {}; + struct drm_mode_fb_cmd2 f_16 = {}; + struct drm_mode_fb_cmd2 f_8 = {}; + + f.width = 1024; + f.height = 1024; + f.pixel_format = DRM_FORMAT_XRGB8888; + f.pitches[0] = 1024*4; + + f_16.width = 1024; + f_16.height = 1024*2; + f_16.pixel_format = DRM_FORMAT_RGB565; + f_16.pitches[0] = 1024*2; + + f_8.width = 1024*2; + f_8.height = 1024*2; + f_8.pixel_format = DRM_FORMAT_C8; + f_8.pitches[0] = 1024*2; + + igt_fixture { + gem_bo = gem_create(fd, 1024*1024*4); + igt_assert(gem_bo); + gem_bo_small = gem_create(fd, 1024*1024*4 - 4096); + igt_assert(gem_bo_small); + } + + f.handles[0] = gem_bo; + f_16.handles[0] = gem_bo; + f_8.handles[0] = gem_bo; + + igt_subtest("size-max") { + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); + f.fb_id = 0; + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f_16) == 0); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f_16.fb_id) == 0); + f.fb_id = 0; + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f_8) == 0); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f_8.fb_id) == 0); + f.fb_id = 0; + } + + f.width++; + f_16.width++; + f_8.width++; + igt_subtest("too-wide") { + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && + errno == EINVAL); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f_16) == -1 && + errno == EINVAL); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f_8) == -1 && + errno == EINVAL); + } + f.width--; + f_16.width--; + f_8.width--; + f.height++; + f_16.height++; + f_8.height++; + igt_subtest("too-high") { + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && + errno == EINVAL); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f_16) == -1 && + errno == EINVAL); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f_8) == -1 && + errno == EINVAL); + } + + f.handles[0] = gem_bo_small; + igt_subtest("bo-too-small") { + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && + errno == EINVAL); + } + + /* Just to check that the parameters would work. */ + f.height = 1020; + igt_subtest("small-bo") { + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); + f.fb_id = 0; + } + + igt_fixture + gem_set_tiling(fd, gem_bo_small, I915_TILING_X, 1024*4); + + igt_subtest("bo-too-small-due-to-tiling") { + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && + errno == EINVAL); + } + + + igt_fixture { + gem_close(fd, gem_bo); + gem_close(fd, gem_bo_small); + } +} + +static void addfb25_tests(int fd) +{ + struct local_drm_mode_fb_cmd2 f = {}; + + igt_fixture { + gem_bo = gem_create(fd, 1024*1024*4); + igt_assert(gem_bo); + + memset(&f, 0, sizeof(f)); + + f.width = 1024; + f.height = 1024; + f.pixel_format = DRM_FORMAT_XRGB8888; + f.pitches[0] = 1024*4; + f.modifier[0] = LOCAL_DRM_FORMAT_MOD_NONE; + + f.handles[0] = gem_bo; + } + + igt_subtest("addfb25-modifier-no-flag") { + igt_require_fb_modifiers(fd); + + f.modifier[0] = LOCAL_I915_FORMAT_MOD_X_TILED; + igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) < 0 && errno == EINVAL); + } + + igt_fixture + f.flags = LOCAL_DRM_MODE_FB_MODIFIERS; + + igt_subtest("addfb25-bad-modifier") { + igt_require_fb_modifiers(fd); + + f.modifier[0] = ~0; + igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) < 0 && errno == EINVAL); + } + + igt_fixture + gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); + + igt_subtest("addfb25-X-tiled-mismatch") { + igt_require_fb_modifiers(fd); + + f.modifier[0] = LOCAL_DRM_FORMAT_MOD_NONE; + igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) < 0 && errno == EINVAL); + } + + igt_subtest("addfb25-X-tiled") { + igt_require_fb_modifiers(fd); + + f.modifier[0] = LOCAL_I915_FORMAT_MOD_X_TILED; + igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) == 0); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); + f.fb_id = 0; + } + + igt_subtest("addfb25-framebuffer-vs-set-tiling") { + igt_require_fb_modifiers(fd); + + f.modifier[0] = LOCAL_I915_FORMAT_MOD_X_TILED; + igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) == 0); + igt_assert(__gem_set_tiling(fd, gem_bo, I915_TILING_X, 512*4) == -EBUSY); + igt_assert(__gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4) == -EBUSY); + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); + f.fb_id = 0; + } + + igt_fixture + gem_close(fd, gem_bo); +} + +static void addfb25_ytile(int fd, int gen) +{ + struct local_drm_mode_fb_cmd2 f = {}; + int shouldret; + + igt_fixture { + gem_bo = gem_create(fd, 1024*1024*4); + igt_assert(gem_bo); + gem_bo_small = gem_create(fd, 1024*1023*4); + igt_assert(gem_bo_small); + + shouldret = gen >= 9 ? 0 : -1; + + memset(&f, 0, sizeof(f)); + + f.width = 1024; + f.height = 1024; + f.pixel_format = DRM_FORMAT_XRGB8888; + f.pitches[0] = 1024*4; + f.flags = LOCAL_DRM_MODE_FB_MODIFIERS; + f.modifier[0] = LOCAL_DRM_FORMAT_MOD_NONE; + + f.handles[0] = gem_bo; + } + + igt_subtest("addfb25-Y-tiled") { + igt_require_fb_modifiers(fd); + + f.modifier[0] = LOCAL_I915_FORMAT_MOD_Y_TILED; + igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) == shouldret); + if (!shouldret) + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); + f.fb_id = 0; + } + + igt_subtest("addfb25-Yf-tiled") { + igt_require_fb_modifiers(fd); + + f.modifier[0] = LOCAL_I915_FORMAT_MOD_Yf_TILED; + igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) == shouldret); + if (!shouldret) + igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); + f.fb_id = 0; + } + + igt_subtest("addfb25-Y-tiled-small") { + igt_require_fb_modifiers(fd); + igt_require(gen >= 9); + + f.modifier[0] = LOCAL_I915_FORMAT_MOD_Y_TILED; + f.height = 1023; + f.handles[0] = gem_bo_small; + igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) < 0 && errno == EINVAL); + f.fb_id = 0; + } + + igt_fixture { + gem_close(fd, gem_bo); + gem_close(fd, gem_bo_small); + } +} + +int fd; +int gen; + +igt_main +{ + igt_fixture { + fd = drm_open_any_master(); + gen = intel_gen(intel_get_drm_devid(fd)); + } + + invalid_tests(fd); + + pitch_tests(fd); + + size_tests(fd); + + addfb25_tests(fd); + + addfb25_ytile(fd, gen); + + igt_fixture + close(fd); +} -- cgit v1.2.3