summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMika Kuoppala <mika.kuoppala@linux.intel.com>2016-02-11 12:32:40 +0200
committerMika Kuoppala <mika.kuoppala@intel.com>2016-03-15 14:58:32 +0200
commit431f6c49189470763c34f82cc4f688a967310f52 (patch)
treed43a040d64fe892e9bab60e423064a8ceb91403e
parent0e2e880e04e344b62c76bc3d12a3f596ae0233cd (diff)
tests/gem_evict_alignment: use uint64_t in eviction memory parameters
With large apertures we need to use uint64_t for counts and sizes. commit 0e2071411a4d4e1488a821daf522dffde2809e03 paved way for this but forgot to change the subtest parameters. v2: Pass correctly to the copy() also (Chris) References: https://bugs.freedesktop.org/show_bug.cgi?id=93849 Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
-rw-r--r--tests/gem_evict_alignment.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/gem_evict_alignment.c b/tests/gem_evict_alignment.c
index 6fa70f0c..3ce1bea9 100644
--- a/tests/gem_evict_alignment.c
+++ b/tests/gem_evict_alignment.c
@@ -53,7 +53,8 @@ IGT_TEST_DESCRIPTION("Run a couple of big batches to force the unbind on"
#define WIDTH 1024
static void
-copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int alignment, int error)
+copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo,
+ uint64_t n_bo, uint64_t alignment, int error)
{
uint32_t batch[12];
struct drm_i915_gem_relocation_entry reloc[2];
@@ -129,10 +130,11 @@ copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int alignme
free(obj);
}
-static void minor_evictions(int fd, int size, int count)
+static void minor_evictions(int fd, uint64_t size, uint64_t count)
{
uint32_t *bo, *sel;
- int n, m, alignment, pass, fail;
+ uint64_t n, m, alignment;
+ int pass, fail;
intel_require_memory(2 * count, size, CHECK_RAM);
@@ -159,9 +161,10 @@ static void minor_evictions(int fd, int size, int count)
free(bo);
}
-static void major_evictions(int fd, int size, int count)
+static void major_evictions(int fd, uint64_t size, uint64_t count)
{
- int n, m, loop, alignment, max;
+ uint64_t n, m, alignment, max;
+ int loop;
uint32_t *bo;
intel_require_memory(count, size, CHECK_RAM);