@@ -27,8 +27,7 @@
/** @file gem_create.c
*
- * This is a test for the extended and old gem_create ioctl, that
- * includes allocation of object from stolen memory and shmem.
+ * This is a test for the gem_create ioctl.
*
* The goal is to simply ensure that basics work and invalid input
* combinations are rejected.
@@ -57,42 +56,13 @@
#include "drm.h"
#include "i915_drm.h"
-IGT_TEST_DESCRIPTION("This is a test for the extended & old gem_create ioctl,"
- " that includes allocation of object from stolen memory"
- " and shmem.");
+IGT_TEST_DESCRIPTION("This is a test for the gem_create ioctl");
#define CLEAR(s) memset(&s, 0, sizeof(s))
#define PAGE_SIZE 4096
-struct local_i915_gem_create_v2 {
- uint64_t size;
- uint32_t handle;
- uint32_t pad;
-#define I915_CREATE_PLACEMENT_STOLEN (1<<0)
- uint32_t flags;
-} create;
-
#define LOCAL_IOCTL_I915_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_CREATE, struct local_i915_gem_create_v2)
-static void invalid_flag_test(int fd)
-{
- int ret;
-
- gem_require_stolen_support(fd);
-
- create.handle = 0;
- create.size = PAGE_SIZE;
- create.flags = ~I915_CREATE_PLACEMENT_STOLEN;
- ret = drmIoctl(fd, LOCAL_IOCTL_I915_GEM_CREATE, &create);
-
- igt_assert(ret <= 0);
-
- create.flags = ~0;
- ret = drmIoctl(fd, LOCAL_IOCTL_I915_GEM_CREATE, &create);
-
- igt_assert(ret <= 0);
-}
-
static void invalid_size_test(int fd)
{
int handle;
@@ -152,9 +122,6 @@ igt_main
fd = drm_open_driver(DRIVER_INTEL);
}
- igt_subtest("stolen-invalid-flag")
- invalid_flag_test(fd);
-
igt_subtest("create-invalid-size")
invalid_size_test(fd);
The feature was never merged and there has been no progress in the last year. The subtest is currently skipping on all platforms by checking a field in the get_aperture ioctl structure that doesn't exist in the kernel version of the struct. Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> --- tests/gem_create.c | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-)