[igt-dev] [PATCH i-g-t] igt: Remove incorrect get_aperture IOCTL arg

[igt-dev] [PATCH i-g-t] igt: Remove incorrect get_aperture IOCTL arg

[Antonio Argenziano]

The local implementation of struct drm_i915_gem_get_aperture is
inconsistent with what is defined in the driver and now made its way
into IGT's include folder. The correct structure also doesn't contain
fields that were being used is some require functions about stolen
size. Removed those functions and all tests that used the require, they
have been skipping for a while and if none complained they must not be
needed.

Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
 lib/ioctl_wrappers.c    |  65 ------
 lib/ioctl_wrappers.h    |  13 --
 tests/i915/gem_create.c |  24 ---
 tests/i915/gem_pread.c  |  85 --------
 tests/i915/gem_pwrite.c |  38 ----
 tests/i915/gem_stolen.c | 455 ----------------------------------------
 tests/meson.build       |   1 -
 7 files changed, 681 deletions(-)
 delete mode 100644 tests/i915/gem_stolen.c

diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 9f255508..f9f13830 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -468,26 +468,6 @@ void gem_sync(int fd, uint32_t handle)
 	errno = 0;
 }
 
-
-bool gem_create__has_stolen_support(int fd)
-{
-	static int has_stolen_support = -1;
-	struct drm_i915_getparam gp;
-	int val = -1;
-
-	if (has_stolen_support < 0) {
-		memset(&gp, 0, sizeof(gp));
-		gp.param = 38; /* CREATE_VERSION */
-		gp.value = &val;
-
-		/* Do we have the extended gem_create_ioctl? */
-		ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
-		has_stolen_support = val >= 2;
-	}
-
-	return has_stolen_support;
-}
-
 struct local_i915_gem_create_v2 {
 	uint64_t size;
 	uint32_t handle;
@@ -1191,51 +1171,6 @@ bool gem_has_bsd2(int fd)
 	return has_bsd2;
 }
 
-struct local_i915_gem_get_aperture {
-	__u64 aper_size;
-	__u64 aper_available_size;
-	__u64 version;
-	__u64 map_total_size;
-	__u64 stolen_total_size;
-};
-#define DRM_I915_GEM_GET_APERTURE	0x23
-#define LOCAL_IOCTL_I915_GEM_GET_APERTURE DRM_IOR  (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct local_i915_gem_get_aperture)
-/**
- * gem_total_mappable_size:
- * @fd: open i915 drm file descriptor
- *
- * Feature test macro to query the kernel for the total mappable size.
- *
- * Returns: Total mappable address space size.
- */
-uint64_t gem_total_mappable_size(int fd)
-{
-	struct local_i915_gem_get_aperture aperture;
-
-	memset(&aperture, 0, sizeof(aperture));
-	do_ioctl(fd, LOCAL_IOCTL_I915_GEM_GET_APERTURE, &aperture);
-
-	return aperture.map_total_size;
-}
-
-/**
- * gem_total_stolen_size:
- * @fd: open i915 drm file descriptor
- *
- * Feature test macro to query the kernel for the total stolen size.
- *
- * Returns: Total stolen memory.
- */
-uint64_t gem_total_stolen_size(int fd)
-{
-	struct local_i915_gem_get_aperture aperture;
-
-	memset(&aperture, 0, sizeof(aperture));
-	do_ioctl(fd, LOCAL_IOCTL_I915_GEM_GET_APERTURE, &aperture);
-
-	return aperture.stolen_total_size;
-}
-
 /**
  * gem_available_aperture_size:
  * @fd: open i915 drm file descriptor
diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
index b22b36b0..80198ce2 100644
--- a/lib/ioctl_wrappers.h
+++ b/lib/ioctl_wrappers.h
@@ -100,17 +100,6 @@ void *__gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, un
 
 int gem_munmap(void *ptr, uint64_t size);
 
-/**
- * gem_require_stolen_support:
- * @fd: open i915 drm file descriptor
- *
- * Test macro to query whether support for allocating objects from stolen
- * memory is available. Automatically skips through igt_require() if not.
- */
-#define gem_require_stolen_support(fd) \
-			igt_require(gem_create__has_stolen_support(fd) && \
-				    (gem_total_stolen_size(fd) > 0))
-
 /**
  * gem_require_mmap_wc:
  * @fd: open i915 drm file descriptor
@@ -153,8 +142,6 @@ int gem_gpu_reset_type(int fd);
 bool gem_gpu_reset_enabled(int fd);
 bool gem_engine_reset_enabled(int fd);
 int gem_available_fences(int fd);
-uint64_t gem_total_mappable_size(int fd);
-uint64_t gem_total_stolen_size(int fd);
 uint64_t gem_available_aperture_size(int fd);
 uint64_t gem_aperture_size(int fd);
 uint64_t gem_global_aperture_size(int fd);
diff --git a/tests/i915/gem_create.c b/tests/i915/gem_create.c
index 25c5e808..9b150635 100644
--- a/tests/i915/gem_create.c
+++ b/tests/i915/gem_create.c
@@ -72,27 +72,6 @@ struct local_i915_gem_create_v2 {
 	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)
 {
 	uint32_t handle;
@@ -151,9 +130,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);
 
diff --git a/tests/i915/gem_pread.c b/tests/i915/gem_pread.c
index 00379580..0a3b45a4 100644
--- a/tests/i915/gem_pread.c
+++ b/tests/i915/gem_pread.c
@@ -150,91 +150,6 @@ int main(int argc, char **argv)
 		}
 	}
 
-	igt_subtest("stolen-normal") {
-		gem_require_stolen_support(fd);
-		for (count = 1; count <= 1<<17; count <<= 1) {
-			struct timeval start, end;
-
-			gettimeofday(&start, NULL);
-			do_gem_read(fd, src_stolen, dst_user, object_size, count);
-			gettimeofday(&end, NULL);
-			usecs = elapsed(&start, &end, count);
-			bps = bytes_per_sec(buf, object_size/usecs*1e6);
-			igt_info("Time to pread %d bytes x %6d:	%7.3fµs, %s\n",
-				 object_size, count, usecs, bps);
-			fflush(stdout);
-		}
-	}
-	for (c = cache; c->level != -1; c++) {
-		igt_subtest_f("stolen-%s", c->name) {
-			gem_require_stolen_support(fd);
-			gem_set_caching(fd, src_stolen, c->level);
-
-			for (count = 1; count <= 1<<17; count <<= 1) {
-				struct timeval start, end;
-
-				gettimeofday(&start, NULL);
-				do_gem_read(fd, src_stolen, dst_user,
-					    object_size, count);
-				gettimeofday(&end, NULL);
-				usecs = elapsed(&start, &end, count);
-				bps = bytes_per_sec(buf, object_size/usecs*1e6);
-				igt_info("Time to stolen-%s pread %d bytes x %6d:      %7.3fµs, %s\n",
-					 c->name, object_size, count, usecs, bps);
-				fflush(stdout);
-			}
-		}
-	}
-
-	/* List the time taken in pread operation for stolen objects, with
-	 * and without the overhead of page fault handling on accessing the
-	 * user space buffer
-	 */
-	igt_subtest("pagefault-pread") {
-		gem_require_stolen_support(fd);
-		large_stolen = gem_create_stolen(fd, LARGE_OBJECT_SIZE);
-		stolen_nopf_user = (uint32_t *) mmap(NULL, LARGE_OBJECT_SIZE,
-						PROT_WRITE,
-						MAP_ANONYMOUS|MAP_PRIVATE,
-						-1, 0);
-		igt_assert(stolen_nopf_user);
-
-		for (count = 1; count <= 10; count ++) {
-			struct timeval start, end;
-			double t_elapsed = 0;
-
-			gettimeofday(&start, NULL);
-			do_gem_read(fd, large_stolen, stolen_nopf_user,
-				    LARGE_OBJECT_SIZE, 1);
-			gettimeofday(&end, NULL);
-			t_elapsed = elapsed(&start, &end, count);
-			bps = bytes_per_sec(buf, object_size/t_elapsed*1e6);
-			igt_info("Pagefault-N - Time to pread %d bytes: %7.3fµs, %s\n",
-				 LARGE_OBJECT_SIZE, t_elapsed, bps);
-
-			stolen_pf_user = (uint32_t *) mmap(NULL, LARGE_OBJECT_SIZE,
-						      PROT_WRITE,
-						      MAP_ANONYMOUS|MAP_PRIVATE,
-						      -1, 0);
-			igt_assert(stolen_pf_user);
-
-			gettimeofday(&start, NULL);
-			do_gem_read(fd, large_stolen, stolen_pf_user,
-				    LARGE_OBJECT_SIZE, 1);
-			gettimeofday(&end, NULL);
-			usecs = elapsed(&start, &end, count);
-			bps = bytes_per_sec(buf, object_size/usecs*1e6);
-			igt_info("Pagefault-Y - Time to pread %d bytes: %7.3fµs, %s%s%s\n",
-				 LARGE_OBJECT_SIZE, usecs,
-				 t_elapsed < usecs ? KGRN : KRED, bps, KNRM);
-			fflush(stdout);
-			munmap(stolen_pf_user, LARGE_OBJECT_SIZE);
-		}
-		munmap(stolen_nopf_user, LARGE_OBJECT_SIZE);
-		gem_close(fd, large_stolen);
-	}
-
-
 	igt_fixture {
 		free(src);
 		gem_close(fd, dst);
diff --git a/tests/i915/gem_pwrite.c b/tests/i915/gem_pwrite.c
index 696bd316..a99642c5 100644
--- a/tests/i915/gem_pwrite.c
+++ b/tests/i915/gem_pwrite.c
@@ -277,44 +277,6 @@ int main(int argc, char **argv)
 		}
 	}
 
-	igt_subtest("stolen-normal") {
-		gem_require_stolen_support(fd);
-		for (count = 1; count <= 1<<17; count <<= 1) {
-			struct timeval start, end;
-
-			gettimeofday(&start, NULL);
-			do_gem_write(fd, dst_stolen, src_user,
-				     object_size, count);
-			gettimeofday(&end, NULL);
-			usecs = elapsed(&start, &end, count);
-			bps = bytes_per_sec(buf, object_size/usecs*1e6);
-			igt_info("Time to pwrite %d bytes x %6d:        %7.3fµs, %s\n",
-				 object_size, count, usecs, bps);
-			fflush(stdout);
-		}
-	}
-
-	for (c = cache; c->level != -1; c++) {
-		igt_subtest_f("stolen-%s", c->name) {
-			gem_require_stolen_support(fd);
-			gem_set_caching(fd, dst, c->level);
-			for (count = 1; count <= 1<<17; count <<= 1) {
-				struct timeval start, end;
-
-				gettimeofday(&start, NULL);
-				do_gem_write(fd, dst_stolen, src_user,
-					     object_size, count);
-				gettimeofday(&end, NULL);
-				bps = bytes_per_sec(buf,
-						    object_size/usecs*1e6);
-				igt_info("Time to stolen-%s pwrite %d bytes x %6d:     %7.3fµs, %s\n",
-					 c->name, object_size, count,
-					 usecs, bps);
-				fflush(stdout);
-			}
-		}
-	}
-
 	igt_fixture {
 		free(src);
 		gem_close(fd, dst);
diff --git a/tests/i915/gem_stolen.c b/tests/i915/gem_stolen.c
deleted file mode 100644
index 1d489976..00000000
--- a/tests/i915/gem_stolen.c
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- * Copyright © 2015 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:
- *    Ankitprasad Sharma <ankitprasad.r.sharma at intel.com>
- *
- */
-
-/** @file gem_create_stolen.c
- *
- * This is a test for the extended gem_create ioctl, that includes allocation
- * of object from stolen memory.
- *
- * The goal is to simply ensure the basics work, and invalid input combinations
- * are rejected.
- */
-
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <getopt.h>
-
-#include <drm.h>
-
-#include "ioctl_wrappers.h"
-#include "intel_bufmgr.h"
-#include "intel_batchbuffer.h"
-#include "intel_io.h"
-#include "intel_chipset.h"
-#include "igt_aux.h"
-#include "drmtest.h"
-#include "drm.h"
-#include "i915_drm.h"
-
-IGT_TEST_DESCRIPTION("This test verifies the exetended gem_create ioctl,"
-		     " that includes allocation of obj from stolen region");
-#define CLEAR(s) memset(&s, 0, sizeof(s))
-#define SIZE 1024*1024
-#define DWORD_SIZE 4
-#define DATA 0xdead
-#define LARGE_SIZE 0xffffffff
-#define MAX_OBJECTS 100
-
-static drm_intel_bufmgr *bufmgr;
-static struct intel_batchbuffer *batch;
-
-static void verify_copy_op(drm_intel_bo *src, drm_intel_bo *dest)
-{
-	uint32_t *virt, i, ret;
-	/* Fill the src BO with dwords */
-	ret = drm_intel_gem_bo_map_gtt(src);
-	igt_assert(!ret);
-
-	virt = src->virtual;
-	for (i = 0; i < SIZE/DWORD_SIZE; i++)
-		virt[i] = i;
-
-	intel_copy_bo(batch, dest, src, SIZE);
-
-	ret = drm_intel_gem_bo_map_gtt(dest);
-	igt_assert(!ret);
-
-	virt = dest->virtual;
-	/* verify */
-	for (i = 0; i < SIZE/DWORD_SIZE; i++)
-		igt_assert_eq(virt[i], i);
-
-	drm_intel_bo_unmap(src);
-	drm_intel_bo_unmap(dest);
-}
-
-static void stolen_pwrite(int fd)
-{
-	drm_intel_bo *bo;
-	uint32_t buf[SIZE/DWORD_SIZE];
-	uint32_t handle = 0;
-	uint32_t *virt;
-	int i, ret = 0;
-
-	for (i = 0; i < SIZE/DWORD_SIZE; i++)
-		buf[i] = DATA;
-
-	gem_require_stolen_support(fd);
-
-	handle = gem_create_stolen(fd, SIZE);
-
-	gem_write(fd, handle, 0, buf, SIZE);
-	bo = gem_handle_to_libdrm_bo(bufmgr, fd, "bo", handle);
-
-	ret = drm_intel_gem_bo_map_gtt(bo);
-	igt_assert(!ret);
-
-	virt = bo->virtual;
-
-	for (i = 0; i < SIZE/DWORD_SIZE; i++)
-		igt_assert_eq(virt[i], DATA);
-
-	drm_intel_bo_unmap(bo);
-	drm_intel_bo_unreference(bo);
-	gem_close(fd, handle);
-}
-
-static void stolen_pread(int fd)
-{
-	drm_intel_bo *bo;
-	uint32_t buf[SIZE/DWORD_SIZE];
-	uint32_t handle = 0;
-	uint32_t *virt;
-	int i, ret = 0;
-
-	CLEAR(buf);
-
-	gem_require_stolen_support(fd);
-
-	handle = gem_create_stolen(fd, SIZE);
-
-	bo = gem_handle_to_libdrm_bo(bufmgr, fd, "bo", handle);
-
-	ret = drm_intel_gem_bo_map_gtt(bo);
-	igt_assert(!ret);
-
-	virt = bo->virtual;
-
-	for (i = 0; i < SIZE/DWORD_SIZE; i++)
-		virt[i] = DATA;
-
-	drm_intel_bo_unmap(bo);
-	drm_intel_bo_unreference(bo);
-
-	gem_read(fd, handle, 0, buf, SIZE);
-
-	for (i = 0; i < SIZE/DWORD_SIZE; i++)
-		igt_assert_eq(buf[i], DATA);
-
-	gem_close(fd, handle);
-}
-
-static void copy_test(int fd)
-{
-	drm_intel_bo *src, *dest;
-	uint32_t src_handle = 0, dest_handle = 0;
-
-	gem_require_stolen_support(fd);
-
-	src_handle = gem_create_stolen(fd, SIZE);
-	dest_handle = gem_create_stolen(fd, SIZE);
-
-	src = gem_handle_to_libdrm_bo(bufmgr, fd, "src_bo", src_handle);
-	dest = gem_handle_to_libdrm_bo(bufmgr, fd, "dst_bo", dest_handle);
-
-	igt_assert(src != NULL);
-	igt_assert(dest != NULL);
-
-	verify_copy_op(src, dest);
-
-	drm_intel_bo_unreference(src);
-	drm_intel_bo_unreference(dest);
-	gem_close(fd, src_handle);
-	gem_close(fd, dest_handle);
-}
-
-static void verify_object_clear(int fd)
-{
-	drm_intel_bo *bo;
-	uint32_t handle = 0;
-	uint32_t *virt;
-	int i, ret;
-
-	gem_require_stolen_support(fd);
-
-	handle = gem_create_stolen(fd, SIZE);
-
-	bo = gem_handle_to_libdrm_bo(bufmgr, fd, "verify_bo", handle);
-	igt_assert(bo != NULL);
-
-	ret = drm_intel_gem_bo_map_gtt(bo);
-	igt_assert(!ret);
-
-	/* Verify if the BO is zeroed */
-	virt = bo->virtual;
-	for (i = 0; i < SIZE / DWORD_SIZE; i++)
-		igt_assert(!virt[i]);
-
-	drm_intel_bo_unmap(bo);
-	drm_intel_bo_unreference(bo);
-	gem_close(fd, handle);
-}
-
-static void stolen_large_obj_alloc(int fd)
-{
-	uint32_t handle = 0;
-
-	gem_require_stolen_support(fd);
-	handle = __gem_create_stolen(fd, (unsigned long long) LARGE_SIZE + 4096);
-	igt_assert(!handle);
-}
-
-static void stolen_fill_purge_test(int fd)
-{
-	drm_intel_bo *bo;
-	int obj_count = 0, i = 0;
-	int _ret = 0, j = 0;
-	uint32_t handle[MAX_OBJECTS];
-	uint32_t new_handle;
-	uint32_t *virt;
-	int retained;
-
-	gem_require_stolen_support(fd);
-
-	/* Exhaust Stolen space */
-	do {
-		handle[i] = __gem_create_stolen(fd, SIZE);
-		if (handle[i] != 0) {
-			bo = gem_handle_to_libdrm_bo(bufmgr, fd,
-						     "verify_bo", handle[i]);
-			igt_assert(bo != NULL);
-
-			_ret = drm_intel_gem_bo_map_gtt(bo);
-			igt_assert(!_ret);
-
-			virt = bo->virtual;
-			for (j = 0; j < SIZE/DWORD_SIZE; j++)
-				virt[j] = DATA;
-
-			drm_intel_bo_unmap(bo);
-			drm_intel_bo_unreference(bo);
-
-			obj_count++;
-		}
-
-		i++;
-	} while (handle[i-1] && i < MAX_OBJECTS);
-
-	igt_assert(obj_count > 0);
-
-	/* Mark all stolen objects purgeable */
-	for (i = 0; i < obj_count; i++)
-		retained = gem_madvise(fd, handle[i], I915_MADV_DONTNEED);
-
-	/* Try to allocate one more object */
-	new_handle = gem_create_stolen(fd, SIZE);
-
-	/* Check if the retained object's memory contents are intact */
-	for (i = 0; i < obj_count; i++) {
-		retained = gem_madvise(fd, handle[i], I915_MADV_WILLNEED);
-		if (retained) {
-			bo = gem_handle_to_libdrm_bo(bufmgr, fd,
-						     "verify_bo", handle[i]);
-			igt_assert(bo != NULL);
-
-			_ret = drm_intel_gem_bo_map_gtt(bo);
-			igt_assert(!_ret);
-
-			virt = bo->virtual;
-			for (j = 0; j < SIZE/DWORD_SIZE; j++)
-				igt_assert_eq(virt[j], DATA);
-
-			drm_intel_bo_unmap(bo);
-			drm_intel_bo_unreference(bo);
-		}
-	}
-
-	gem_close(fd, new_handle);
-	for (i = 0; i < obj_count; i++)
-		gem_close(fd, handle[i]);
-}
-
-static void stolen_hibernate(int fd)
-{
-	drm_intel_bo *bo;
-	drm_intel_bo *src, *dest;
-	int obj_count = 0, i = 0;
-	int ret, j;
-	uint32_t handle[MAX_OBJECTS], src_handle;
-	uint32_t *virt;
-
-	gem_require_stolen_support(fd);
-
-	src_handle = gem_create(fd, SIZE);
-	src = gem_handle_to_libdrm_bo(bufmgr, fd,
-				     "bo", src_handle);
-	igt_assert(src != NULL);
-
-	ret = drm_intel_gem_bo_map_gtt(src);
-	igt_assert_eq(ret, 0);
-
-	virt = src->virtual;
-	for (j = 0; j < SIZE/DWORD_SIZE; j++) {
-		igt_assert_eq(virt[j], 0);
-		virt[j] = j;
-	}
-
-	drm_intel_bo_unmap(src);
-	/* Exhaust Stolen space */
-	for (i = 0; i < MAX_OBJECTS; i++) {
-		handle[i] = __gem_create_stolen(fd, SIZE);
-		if (!handle[i])
-			break;
-
-		bo = gem_handle_to_libdrm_bo(bufmgr, fd,
-					     "verify_bo", handle[i]);
-		igt_assert(bo != NULL);
-		ret = drm_intel_gem_bo_map_gtt(bo);
-		igt_assert_eq(ret, 0);
-
-		virt = bo->virtual;
-		for (j = 0; j < SIZE/DWORD_SIZE; j++)
-			igt_assert_eq(virt[j], 0);
-
-		drm_intel_bo_unmap(bo);
-		drm_intel_bo_unreference(bo);
-
-		obj_count++;
-	}
-
-	/* Assert if atleast one object is allocated from stolen, that
-	 * is good enough to verify the content preservation across
-	 * hibernation.
-	 */
-	igt_assert(obj_count > 0);
-
-	/* Copy data to all stolen backed objects */
-	for (i = 0; i < obj_count; i++) {
-		dest = gem_handle_to_libdrm_bo(bufmgr, fd,
-					       "dst_bo", handle[i]);
-		igt_assert(dest != NULL);
-		/* Copy contents to stolen backed objects via blt and
-		 * verify post-hibernation, this also helps in identifying
-		 * that the operation was completed before going to
-		 * hibernation.
-		 */
-		intel_copy_bo(batch, dest, src, SIZE);
-	}
-
-	drm_intel_bo_unreference(src);
-
-	igt_system_suspend_autoresume(SUSPEND_STATE_DISK, SUSPEND_TEST_NONE);
-	/* Check if the object's memory contents are intact
-	 * across hibernation.
-	 */
-	for (i = 0; i < obj_count; i++) {
-		bo = gem_handle_to_libdrm_bo(bufmgr, fd,
-					     "verify_bo", handle[i]);
-		igt_assert(bo != NULL);
-		ret = drm_intel_gem_bo_map_gtt(bo);
-		igt_assert_eq(ret, 0);
-		virt = bo->virtual;
-		for (j = 0; j < SIZE/DWORD_SIZE; j++)
-			igt_assert_eq(virt[j], j);
-
-		drm_intel_bo_unmap(bo);
-		drm_intel_bo_unreference(bo);
-	}
-
-	gem_close(fd, src_handle);
-	for (i = 0; i < obj_count; i++)
-		gem_close(fd, handle[i]);
-}
-
-static void
-stolen_no_mmap(int fd)
-{
-	void *addr;
-	uint32_t handle = 0;
-
-	gem_require_stolen_support(fd);
-
-	handle = gem_create_stolen(fd, SIZE);
-
-	addr = __gem_mmap__cpu(fd, handle, 0, SIZE, PROT_READ | PROT_WRITE);
-	igt_assert(addr == NULL);
-
-	gem_close(fd, handle);
-}
-
-igt_main
-{
-	int fd;
-	uint32_t devid;
-
-	igt_skip_on_simulation();
-
-	igt_fixture {
-		fd = drm_open_driver(DRIVER_INTEL);
-		devid = intel_get_drm_devid(fd);
-
-		bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
-		batch = intel_batchbuffer_alloc(bufmgr, devid);
-	}
-
-	igt_subtest("stolen-clear")
-		verify_object_clear(fd);
-
-	/*
-	 * stolen mem special cases - checking for non cpu mappable
-	 */
-	igt_subtest("stolen-no-mmap")
-		stolen_no_mmap(fd);
-
-	/* checking for pread/pwrite interfaces */
-	igt_subtest("stolen-pwrite")
-		stolen_pwrite(fd);
-
-	igt_subtest("stolen-pread")
-		stolen_pread(fd);
-
-	/* Functional Test - blt copy */
-	igt_subtest("stolen-copy")
-		copy_test(fd);
-
-	igt_subtest("large-object-alloc")
-		stolen_large_obj_alloc(fd);
-
-	/* Filling stolen completely and marking all the objects
-	 * purgeable. Then trying to add one more object, to verify
-	 * the purging logic.
-	 * Again marking all objects WILLNEED and verifying the
-	 * contents of the retained objects.
-	 */
-	igt_subtest("stolen-fill-purge")
-		stolen_fill_purge_test(fd);
-
-	igt_subtest("stolen-hibernate")
-		stolen_hibernate(fd);
-
-	igt_fixture {
-		intel_batchbuffer_free(batch);
-		drm_intel_bufmgr_destroy(bufmgr);
-	}
-}
diff --git a/tests/meson.build b/tests/meson.build
index b8a6e61b..33c773ce 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -199,7 +199,6 @@ gem_progs = [
 	'gem_shrink',
 	'gem_softpin',
 	'gem_spin_batch',
-	'gem_stolen',
 	'gem_storedw_batches_loop',
 	'gem_storedw_loop',
 	'gem_streaming_writes',
-- 
2.19.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t] igt: Remove incorrect get_aperture IOCTL arg

[Chris Wilson]

Quoting Antonio Argenziano (2018-12-06 21:17:04)
> The local implementation of struct drm_i915_gem_get_aperture is
> inconsistent with what is defined in the driver and now made its way
> into IGT's include folder. The correct structure also doesn't contain
> fields that were being used is some require functions about stolen
> size. Removed those functions and all tests that used the require, they
> have been skipping for a while and if none complained they must not be
> needed.

Or they are for future implementations...
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t] igt: Remove incorrect get_aperture IOCTL arg

[Antonio Argenziano]

On 06/12/18 13:22, Chris Wilson wrote:
> Quoting Antonio Argenziano (2018-12-06 21:17:04)
>> The local implementation of struct drm_i915_gem_get_aperture is
>> inconsistent with what is defined in the driver and now made its way
>> into IGT's include folder. The correct structure also doesn't contain
>> fields that were being used is some require functions about stolen
>> size. Removed those functions and all tests that used the require, they
>> have been skipping for a while and if none complained they must not be
>> needed.
> 
> Or they are for future implementations...

I assumed they were for a proposed implementation that didn't land since 
gem_stolen has been there ~3yrs :)

Do you want to keep them? I'm OK with it but maybe we should add a 
comment saying there is a plan for extending the IOCTL.

Antonio

> -Chris
> 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✗ Fi.CI.BAT: failure for igt: Remove incorrect get_aperture IOCTL arg

[Patchwork]

== Series Details ==

Series: igt: Remove incorrect get_aperture IOCTL arg
URL   : https://patchwork.freedesktop.org/series/53697/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_5278 -> IGTPW_2130
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with IGTPW_2130 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in IGTPW_2130, 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/53697/revisions/1/mbox/

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in IGTPW_2130:

### IGT changes ###

#### Possible regressions ####

  * igt@amdgpu/amd_basic@userptr:
    - fi-kbl-8809g:       PASS -> DMESG-WARN

  
Known issues
------------

  Here are the changes found in IGTPW_2130 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@kms_frontbuffer_tracking@basic:
    - {fi-icl-u3}:        PASS -> FAIL [fdo#103167]

  
#### Possible fixes ####

  * igt@gem_exec_suspend@basic-s3:
    - fi-blb-e6850:       INCOMPLETE [fdo#107718] -> PASS

  
  {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#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718


Participating hosts (47 -> 42)
------------------------------

  Missing    (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y 


Build changes
-------------

    * IGT: IGT_4743 -> IGTPW_2130

  CI_DRM_5278: 9055053e0f1a599ddfde1ff9699cdb35bcc1dd2f @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_2130: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2130/
  IGT_4743: edb2db2cf2b6665d7ba3fa9117263302f6307a4f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools



== Testlist changes ==

-igt@gem_create@stolen-invalid-flag
-igt@gem_pread@pagefault-pread
-igt@gem_pread@stolen-display
-igt@gem_pread@stolen-normal
-igt@gem_pread@stolen-snoop
-igt@gem_pread@stolen-uncached
-igt@gem_pwrite@stolen-display
-igt@gem_pwrite@stolen-normal
-igt@gem_pwrite@stolen-snoop
-igt@gem_pwrite@stolen-uncached
-igt@gem_stolen@large-object-alloc
-igt@gem_stolen@stolen-clear
-igt@gem_stolen@stolen-copy
-igt@gem_stolen@stolen-fill-purge
-igt@gem_stolen@stolen-hibernate
-igt@gem_stolen@stolen-no-mmap
-igt@gem_stolen@stolen-pread
-igt@gem_stolen@stolen-pwrite

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2130/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev