* [Intel-gfx] [PATCH i-g-t] tests/i915: Treat gen as unsigned for forward compatibility
@ 2020-08-06 15:28 ` Chris Wilson
0 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2020-08-06 15:28 UTC (permalink / raw)
To: intel-gfx; +Cc: igt-dev, Chris Wilson
We want to recognise future devices (gen = -1u) and treat them as an
extension of the latest known device, which is typically true.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
tests/i915/gem_bad_reloc.c | 2 +-
tests/i915/gem_ctx_create.c | 2 +-
tests/i915/gem_ctx_engines.c | 2 +-
tests/i915/gem_ctx_isolation.c | 2 +-
tests/i915/gem_ctx_shared.c | 4 ++--
tests/i915/gem_ctx_thrash.c | 2 +-
tests/i915/gem_exec_async.c | 2 +-
tests/i915/gem_exec_await.c | 2 +-
tests/i915/gem_exec_capture.c | 4 ++--
tests/i915/gem_exec_fence.c | 10 +++++-----
tests/i915/gem_exec_flush.c | 4 ++--
tests/i915/gem_exec_gttfill.c | 2 +-
tests/i915/gem_exec_latency.c | 4 ++--
tests/i915/gem_exec_nop.c | 4 ++--
tests/i915/gem_exec_parallel.c | 2 +-
tests/i915/gem_exec_params.c | 2 +-
tests/i915/gem_exec_reloc.c | 8 ++++----
tests/i915/gem_exec_schedule.c | 8 ++++----
tests/i915/gem_exec_store.c | 6 +++---
tests/i915/gem_exec_suspend.c | 2 +-
tests/i915/gem_exec_whisper.c | 2 +-
tests/i915/gem_render_copy.c | 6 +++---
tests/i915/gem_ringfill.c | 2 +-
tests/i915/gem_softpin.c | 4 ++--
tests/i915/gem_sync.c | 8 ++++----
tests/i915/gem_tiled_fence_blits.c | 2 +-
tests/i915/gem_userptr_blits.c | 4 ++--
tests/i915/gem_vm_create.c | 2 +-
tests/i915/i915_module_load.c | 4 ++--
tests/i915/i915_pm_rc6_residency.c | 4 ++--
tests/i915/sysfs_timeslice_duration.c | 2 +-
31 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/tests/i915/gem_bad_reloc.c b/tests/i915/gem_bad_reloc.c
index 7eb7fa538..6acc1724f 100644
--- a/tests/i915/gem_bad_reloc.c
+++ b/tests/i915/gem_bad_reloc.c
@@ -113,7 +113,7 @@ static void negative_reloc(int fd, unsigned flags)
static void negative_reloc_blt(int fd)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 obj[1024][2];
struct drm_i915_gem_relocation_entry reloc;
diff --git a/tests/i915/gem_ctx_create.c b/tests/i915/gem_ctx_create.c
index 39305f026..c7295f705 100644
--- a/tests/i915/gem_ctx_create.c
+++ b/tests/i915/gem_ctx_create.c
@@ -419,7 +419,7 @@ static void basic_ext_param(int i915)
static void check_single_timeline(int i915, uint32_t ctx, int num_engines)
{
#define RCS_TIMESTAMP (0x2000 + 0x358)
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
const int has_64bit_reloc = gen >= 8;
struct drm_i915_gem_exec_object2 results = { .handle = gem_create(i915, 4096) };
const uint32_t bbe = MI_BATCH_BUFFER_END;
diff --git a/tests/i915/gem_ctx_engines.c b/tests/i915/gem_ctx_engines.c
index e6def511b..7d4abdb5c 100644
--- a/tests/i915/gem_ctx_engines.c
+++ b/tests/i915/gem_ctx_engines.c
@@ -482,7 +482,7 @@ static uint32_t read_result(int timeline, uint32_t *map, int idx)
static void independent(int i915)
{
#define RCS_TIMESTAMP (0x2000 + 0x358)
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
const int has_64bit_reloc = gen >= 8;
I915_DEFINE_CONTEXT_PARAM_ENGINES(engines , I915_EXEC_RING_MASK + 1);
struct drm_i915_gem_context_param param = {
diff --git a/tests/i915/gem_ctx_isolation.c b/tests/i915/gem_ctx_isolation.c
index 9fdf78bb8..58a35b487 100644
--- a/tests/i915/gem_ctx_isolation.c
+++ b/tests/i915/gem_ctx_isolation.c
@@ -501,7 +501,7 @@ static void dump_regs(int fd,
const struct intel_execution_engine2 *e,
unsigned int regs)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const unsigned int gen_bit = 1 << gen;
const unsigned int engine_bit = ENGINE(e->class, e->instance);
const uint32_t mmio_base = gem_engine_mmio_base(fd, e->name);
diff --git a/tests/i915/gem_ctx_shared.c b/tests/i915/gem_ctx_shared.c
index 55678d96f..616462d79 100644
--- a/tests/i915/gem_ctx_shared.c
+++ b/tests/i915/gem_ctx_shared.c
@@ -186,7 +186,7 @@ static void exhaust_shared_gtt(int i915, unsigned int flags)
static void exec_shared_gtt(int i915, unsigned int ring)
{
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_exec_object2 obj = {};
struct drm_i915_gem_execbuffer2 execbuf = {
@@ -436,7 +436,7 @@ static void store_dword(int i915, uint32_t ctx, unsigned ring,
uint32_t target, uint32_t offset, uint32_t value,
uint32_t cork, unsigned write_domain)
{
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
diff --git a/tests/i915/gem_ctx_thrash.c b/tests/i915/gem_ctx_thrash.c
index dc7259c18..d32619d5d 100644
--- a/tests/i915/gem_ctx_thrash.c
+++ b/tests/i915/gem_ctx_thrash.c
@@ -46,7 +46,7 @@ static void xchg_int(void *array, unsigned i, unsigned j)
static unsigned context_size(int fd)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
switch (gen) {
case 0:
diff --git a/tests/i915/gem_exec_async.c b/tests/i915/gem_exec_async.c
index 035e78377..9f2c80f05 100644
--- a/tests/i915/gem_exec_async.c
+++ b/tests/i915/gem_exec_async.c
@@ -29,7 +29,7 @@ IGT_TEST_DESCRIPTION("Check that we can issue concurrent writes across the engin
static void store_dword(int fd, unsigned ring,
uint32_t target, uint32_t offset, uint32_t value)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
diff --git a/tests/i915/gem_exec_await.c b/tests/i915/gem_exec_await.c
index 6bc624e4a..70fda968e 100644
--- a/tests/i915/gem_exec_await.c
+++ b/tests/i915/gem_exec_await.c
@@ -59,7 +59,7 @@ static void wide(int fd, int ring_size, int timeout, unsigned int flags)
{
const struct intel_execution_engine2 *engine;
const uint32_t bbe = MI_BATCH_BUFFER_END;
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct {
struct drm_i915_gem_exec_object2 *obj;
struct drm_i915_gem_exec_object2 exec[2];
diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c
index 1a53d2fb7..d250c8166 100644
--- a/tests/i915/gem_exec_capture.c
+++ b/tests/i915/gem_exec_capture.c
@@ -61,7 +61,7 @@ static void check_error_state(int dir, struct drm_i915_gem_exec_object2 *obj)
static void __capture1(int fd, int dir, unsigned ring, uint32_t target)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[4];
#define SCRATCH 0
#define CAPTURE 1
@@ -196,7 +196,7 @@ static struct offset {
unsigned int flags)
#define INCREMENTAL 0x1
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 *obj;
struct drm_i915_gem_relocation_entry reloc[2];
struct drm_i915_gem_execbuffer2 execbuf;
diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c
index c9b95fe64..0992314d3 100644
--- a/tests/i915/gem_exec_fence.c
+++ b/tests/i915/gem_exec_fence.c
@@ -61,7 +61,7 @@ static void store(int fd, const struct intel_execution_engine2 *e,
{
const int SCRATCH = 0;
const int BATCH = 1;
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -122,7 +122,7 @@ static bool fence_busy(int fence)
static void test_fence_busy(int fd, const struct intel_execution_engine2 *e,
unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj;
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -218,7 +218,7 @@ static void test_fence_busy(int fd, const struct intel_execution_engine2 *e,
static void test_fence_busy_all(int fd, unsigned flags)
{
const struct intel_execution_engine2 *e;
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj;
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -598,7 +598,7 @@ static int __execbuf(int fd, struct drm_i915_gem_execbuffer2 *execbuf)
static void test_parallel(int i915, const struct intel_execution_engine2 *e)
{
const struct intel_execution_engine2 *e2;
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
uint32_t scratch = gem_create(i915, 4096);
uint32_t *out = gem_mmap__wc(i915, scratch, 0, 4096, PROT_READ);
uint32_t handle[I915_EXEC_RING_MASK];
@@ -704,7 +704,7 @@ static void test_parallel(int i915, const struct intel_execution_engine2 *e)
static void test_concurrent(int i915, const struct intel_execution_engine2 *e)
{
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
struct drm_i915_gem_relocation_entry reloc = {
.target_handle = gem_create(i915, 4096),
.write_domain = I915_GEM_DOMAIN_RENDER,
diff --git a/tests/i915/gem_exec_flush.c b/tests/i915/gem_exec_flush.c
index 7d9fcbfcb..403e498bd 100644
--- a/tests/i915/gem_exec_flush.c
+++ b/tests/i915/gem_exec_flush.c
@@ -78,7 +78,7 @@ static uint32_t movnt(uint32_t *map, int i)
static void run(int fd, unsigned ring, int nchild, int timeout,
unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
/* The crux of this testing is whether writes by the GPU are coherent
* from the CPU.
@@ -355,7 +355,7 @@ enum batch_mode {
static void batch(int fd, unsigned ring, int nchild, int timeout,
enum batch_mode mode, unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
if (mode == BATCH_GTT)
gem_require_mappable_ggtt(fd);
diff --git a/tests/i915/gem_exec_gttfill.c b/tests/i915/gem_exec_gttfill.c
index 7a6d7c0fb..8f2336a30 100644
--- a/tests/i915/gem_exec_gttfill.c
+++ b/tests/i915/gem_exec_gttfill.c
@@ -107,7 +107,7 @@ static void submit(int fd, int gen,
static void fillgtt(int fd, unsigned ring, int timeout)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_relocation_entry reloc[2];
volatile uint64_t *shared;
diff --git a/tests/i915/gem_exec_latency.c b/tests/i915/gem_exec_latency.c
index 198e54fd2..568d727f2 100644
--- a/tests/i915/gem_exec_latency.c
+++ b/tests/i915/gem_exec_latency.c
@@ -109,7 +109,7 @@ static void latency_on_ring(int fd,
unsigned ring, const char *name,
unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const int has_64bit_reloc = gen >= 8;
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc;
@@ -258,7 +258,7 @@ static void latency_from_ring(int fd,
unsigned ring, const char *name,
unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const int has_64bit_reloc = gen >= 8;
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc;
diff --git a/tests/i915/gem_exec_nop.c b/tests/i915/gem_exec_nop.c
index 21a937c83..62554ecb2 100644
--- a/tests/i915/gem_exec_nop.c
+++ b/tests/i915/gem_exec_nop.c
@@ -104,7 +104,7 @@ static double nop_on_ring(int fd, uint32_t handle,
static void poll_ring(int fd, const struct intel_execution_engine2 *e,
int timeout)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const uint32_t MI_ARB_CHK = 0x5 << 23;
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 obj;
@@ -214,7 +214,7 @@ static void poll_ring(int fd, const struct intel_execution_engine2 *e,
static void poll_sequential(int fd, const char *name, int timeout)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const struct intel_execution_engine2 *e;
const uint32_t MI_ARB_CHK = 0x5 << 23;
struct drm_i915_gem_execbuffer2 execbuf;
diff --git a/tests/i915/gem_exec_parallel.c b/tests/i915/gem_exec_parallel.c
index bf94b93d4..cb8488f3b 100644
--- a/tests/i915/gem_exec_parallel.c
+++ b/tests/i915/gem_exec_parallel.c
@@ -166,7 +166,7 @@ static void check_bo(int fd, uint32_t handle, int pass, struct thread *threads)
static void all(int fd, struct intel_execution_engine2 *engine, unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
pthread_mutex_t mutex;
pthread_cond_t cond;
struct thread *threads;
diff --git a/tests/i915/gem_exec_params.c b/tests/i915/gem_exec_params.c
index f8a940740..e0bbea94b 100644
--- a/tests/i915/gem_exec_params.c
+++ b/tests/i915/gem_exec_params.c
@@ -91,7 +91,7 @@ static bool has_resource_streamer(int fd)
static void test_batch_first(int fd)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc[2];
diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c
index d50a8b694..a86d22029 100644
--- a/tests/i915/gem_exec_reloc.c
+++ b/tests/i915/gem_exec_reloc.c
@@ -64,7 +64,7 @@ static void write_dword(int fd,
uint64_t target_offset,
uint32_t value)
{
- int gen = intel_gen(intel_get_drm_devid(fd));
+ unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
@@ -266,7 +266,7 @@ static void check_bo(int fd, uint32_t handle)
static void active(int fd, unsigned engine)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_execbuffer2 execbuf;
@@ -1081,7 +1081,7 @@ static void parallel(int i915)
static uint64_t concurrent_relocs(int i915, int idx, int count)
{
struct drm_i915_gem_relocation_entry *reloc;
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
unsigned long sz;
int offset;
@@ -1180,7 +1180,7 @@ static void concurrent_child(int i915,
static uint32_t create_concurrent_batch(int i915, unsigned int count)
{
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
size_t sz = ALIGN(4 * (1 + 4 * count), 4096);
uint32_t handle = gem_create(i915, sz);
uint32_t *map, *cs;
diff --git a/tests/i915/gem_exec_schedule.c b/tests/i915/gem_exec_schedule.c
index 488d93511..72277e57f 100644
--- a/tests/i915/gem_exec_schedule.c
+++ b/tests/i915/gem_exec_schedule.c
@@ -94,7 +94,7 @@ static uint32_t __store_dword(int fd, uint32_t ctx, unsigned ring,
uint32_t target, uint32_t offset, uint32_t value,
uint32_t cork, int fence, unsigned write_domain)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -1062,7 +1062,7 @@ static void semaphore_resolve(int i915)
static void semaphore_noskip(int i915)
{
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
const struct intel_execution_engine2 *outer, *inner;
uint32_t ctx;
@@ -1695,7 +1695,7 @@ static void deep(int fd, unsigned ring)
/* Create a deep dependency chain, with a few branches */
for (n = 0; n < nreq && igt_seconds_elapsed(&tv) < 2; n++) {
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 eb = {
@@ -1848,7 +1848,7 @@ static void wide(int fd, unsigned ring)
static void reorder_wide(int fd, unsigned ring)
{
const unsigned int ring_size = gem_submission_measure(fd, ring);
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const int priorities[] = { MIN_PRIO, MAX_PRIO };
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_exec_object2 obj[2];
diff --git a/tests/i915/gem_exec_store.c b/tests/i915/gem_exec_store.c
index 272ab9cd8..771ee1690 100644
--- a/tests/i915/gem_exec_store.c
+++ b/tests/i915/gem_exec_store.c
@@ -38,7 +38,7 @@
static void store_dword(int fd, const struct intel_execution_engine2 *e)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -96,7 +96,7 @@ static void store_dword(int fd, const struct intel_execution_engine2 *e)
static void store_cachelines(int fd, const struct intel_execution_engine2 *e,
unsigned int flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 *obj;
struct drm_i915_gem_relocation_entry *reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -172,7 +172,7 @@ static void store_cachelines(int fd, const struct intel_execution_engine2 *e,
static void store_all(int fd)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct intel_execution_engine2 *engine;
struct drm_i915_gem_relocation_entry *reloc;
diff --git a/tests/i915/gem_exec_suspend.c b/tests/i915/gem_exec_suspend.c
index d768db911..6886bccd4 100644
--- a/tests/i915/gem_exec_suspend.c
+++ b/tests/i915/gem_exec_suspend.c
@@ -89,7 +89,7 @@ static bool has_semaphores(int fd)
static void run_test(int fd, unsigned engine, unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
diff --git a/tests/i915/gem_exec_whisper.c b/tests/i915/gem_exec_whisper.c
index 1fded7618..9acf6c306 100644
--- a/tests/i915/gem_exec_whisper.c
+++ b/tests/i915/gem_exec_whisper.c
@@ -168,7 +168,7 @@ static void ctx_set_random_priority(int fd, uint32_t ctx)
static void whisper(int fd, unsigned engine, unsigned flags)
{
const uint32_t bbe = MI_BATCH_BUFFER_END;
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 batches[QLEN];
struct drm_i915_gem_relocation_entry inter[QLEN];
struct drm_i915_gem_relocation_entry reloc;
diff --git a/tests/i915/gem_render_copy.c b/tests/i915/gem_render_copy.c
index 1e1e79b95..2da9837aa 100644
--- a/tests/i915/gem_render_copy.c
+++ b/tests/i915/gem_render_copy.c
@@ -131,7 +131,7 @@ static void scratch_buf_write_to_png(data_t *data, struct igt_buf *buf,
static void *linear_copy_ccs(data_t *data, struct igt_buf *buf)
{
void *ccs_data, *linear;
- int gen = intel_gen(data->devid);
+ unsigned int gen = intel_gen(data->devid);
int ccs_size = igt_buf_intel_ccs_width(gen, buf) *
igt_buf_intel_ccs_height(gen, buf);
@@ -154,7 +154,7 @@ static void scratch_buf_ccs_write_to_png(data_t *data,
cairo_surface_t *surface;
cairo_status_t ret;
void *linear;
- int gen = intel_gen(data->devid);
+ unsigned int gen = intel_gen(data->devid);
unsigned int ccs_width = igt_buf_intel_ccs_width(gen, buf);
unsigned int ccs_height = igt_buf_intel_ccs_height(gen, buf);
@@ -348,7 +348,7 @@ scratch_buf_check_all(data_t *data,
static void scratch_buf_ccs_check(data_t *data,
struct igt_buf *buf)
{
- int gen = intel_gen(data->devid);
+ unsigned int gen = intel_gen(data->devid);
int ccs_size = igt_buf_intel_ccs_width(gen, buf) *
igt_buf_intel_ccs_height(gen, buf);
uint8_t *linear;
diff --git a/tests/i915/gem_ringfill.c b/tests/i915/gem_ringfill.c
index 3e24ccf18..c499cb0dd 100644
--- a/tests/i915/gem_ringfill.c
+++ b/tests/i915/gem_ringfill.c
@@ -99,7 +99,7 @@ static void setup_execbuf(int fd,
struct drm_i915_gem_relocation_entry *reloc,
unsigned int ring)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const uint32_t bbe = MI_BATCH_BUFFER_END;
uint32_t *batch, *b;
int i;
diff --git a/tests/i915/gem_softpin.c b/tests/i915/gem_softpin.c
index 202abdd88..fcaf8ef30 100644
--- a/tests/i915/gem_softpin.c
+++ b/tests/i915/gem_softpin.c
@@ -265,7 +265,7 @@ static void test_reverse(int i915)
static uint64_t busy_batch(int fd)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ unsigned const int gen = intel_gen(intel_get_drm_devid(fd));
const int has_64bit_reloc = gen >= 8;
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 object[2];
@@ -452,7 +452,7 @@ static void xchg_offset(void *array, unsigned i, unsigned j)
enum sleep { NOSLEEP, SUSPEND, HIBERNATE };
static void test_noreloc(int fd, enum sleep sleep, unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ unsigned const int gen = intel_gen(intel_get_drm_devid(fd));
const uint32_t size = 4096;
const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_execbuffer2 execbuf;
diff --git a/tests/i915/gem_sync.c b/tests/i915/gem_sync.c
index b317a3927..a82bda924 100644
--- a/tests/i915/gem_sync.c
+++ b/tests/i915/gem_sync.c
@@ -491,7 +491,7 @@ active_wakeup_ring(int fd, unsigned ring, int timeout, int wlen)
static void
store_ring(int fd, unsigned ring, int num_children, int timeout)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct intel_engine_data ied;
ied = list_store_engines(fd, ring);
@@ -587,7 +587,7 @@ store_ring(int fd, unsigned ring, int num_children, int timeout)
static void
switch_ring(int fd, unsigned ring, int num_children, int timeout)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct intel_engine_data ied;
gem_require_contexts(fd);
@@ -766,7 +766,7 @@ static void *waiter(void *arg)
static void
__store_many(int fd, unsigned ring, int timeout, unsigned long *cycles)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_exec_object2 object[2];
struct drm_i915_gem_execbuffer2 execbuf;
@@ -971,7 +971,7 @@ sync_all(int fd, int num_children, int timeout)
static void
store_all(int fd, int num_children, int timeout)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct intel_engine_data ied;
ied = list_store_engines(fd, ALL_ENGINES);
diff --git a/tests/i915/gem_tiled_fence_blits.c b/tests/i915/gem_tiled_fence_blits.c
index 99ec78f9b..0a633d91b 100644
--- a/tests/i915/gem_tiled_fence_blits.c
+++ b/tests/i915/gem_tiled_fence_blits.c
@@ -88,7 +88,7 @@ static void check_bo(int fd, uint32_t handle, uint32_t start_val)
static uint32_t
create_batch(int fd, struct drm_i915_gem_relocation_entry *reloc)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const bool has_64b_reloc = gen >= 8;
uint32_t *batch;
uint32_t handle;
diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c
index 268423dcd..3ae022016 100644
--- a/tests/i915/gem_userptr_blits.c
+++ b/tests/i915/gem_userptr_blits.c
@@ -300,7 +300,7 @@ blit(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo)
static void store_dword(int fd, uint32_t target,
uint32_t offset, uint32_t value)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -1125,7 +1125,7 @@ static void store_dword_rand(int i915, unsigned int engine,
uint32_t target, uint64_t sz,
int count)
{
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
struct drm_i915_gem_relocation_entry *reloc;
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_execbuffer2 exec;
diff --git a/tests/i915/gem_vm_create.c b/tests/i915/gem_vm_create.c
index e8af68f19..8843b1b3b 100644
--- a/tests/i915/gem_vm_create.c
+++ b/tests/i915/gem_vm_create.c
@@ -250,7 +250,7 @@ static void execbuf(int i915)
static void
write_to_address(int fd, uint32_t ctx, uint64_t addr, uint32_t value)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 batch = {
.handle = gem_create(fd, 4096)
};
diff --git a/tests/i915/i915_module_load.c b/tests/i915/i915_module_load.c
index 77aaac5c6..aa998b992 100644
--- a/tests/i915/i915_module_load.c
+++ b/tests/i915/i915_module_load.c
@@ -40,7 +40,7 @@
static void store_dword(int fd, unsigned ring)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -102,7 +102,7 @@ static void store_dword(int fd, unsigned ring)
static void store_all(int fd)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc[32];
struct drm_i915_gem_execbuffer2 execbuf;
diff --git a/tests/i915/i915_pm_rc6_residency.c b/tests/i915/i915_pm_rc6_residency.c
index 6fdc607e3..d484121e7 100644
--- a/tests/i915/i915_pm_rc6_residency.c
+++ b/tests/i915/i915_pm_rc6_residency.c
@@ -361,7 +361,7 @@ static void rc6_idle(int i915)
{
const int64_t duration_ns = SLEEP_DURATION * (int64_t)NSEC_PER_SEC;
const int tolerance = 20; /* Some RC6 is better than none! */
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
struct {
const char *name;
unsigned int flags;
@@ -452,7 +452,7 @@ static void rc6_fence(int i915)
{
const int64_t duration_ns = SLEEP_DURATION * (int64_t)NSEC_PER_SEC;
const int tolerance = 20; /* Some RC6 is better than none! */
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
const struct intel_execution_engine2 *e;
struct power_sample sample[2];
unsigned long slept;
diff --git a/tests/i915/sysfs_timeslice_duration.c b/tests/i915/sysfs_timeslice_duration.c
index 2b1e52c80..b5b6ded78 100644
--- a/tests/i915/sysfs_timeslice_duration.c
+++ b/tests/i915/sysfs_timeslice_duration.c
@@ -186,7 +186,7 @@ static uint64_t __test_duration(int i915, int engine, unsigned int timeout)
.buffer_count = ARRAY_SIZE(obj),
.buffers_ptr = to_user_pointer(obj),
};
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
double duration = clockrate(i915);
unsigned int class, inst, mmio;
uint32_t *cs, *map;
--
2.28.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [igt-dev] [PATCH i-g-t] tests/i915: Treat gen as unsigned for forward compatibility
@ 2020-08-06 15:28 ` Chris Wilson
0 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2020-08-06 15:28 UTC (permalink / raw)
To: intel-gfx; +Cc: igt-dev, Chris Wilson
We want to recognise future devices (gen = -1u) and treat them as an
extension of the latest known device, which is typically true.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
tests/i915/gem_bad_reloc.c | 2 +-
tests/i915/gem_ctx_create.c | 2 +-
tests/i915/gem_ctx_engines.c | 2 +-
tests/i915/gem_ctx_isolation.c | 2 +-
tests/i915/gem_ctx_shared.c | 4 ++--
tests/i915/gem_ctx_thrash.c | 2 +-
tests/i915/gem_exec_async.c | 2 +-
tests/i915/gem_exec_await.c | 2 +-
tests/i915/gem_exec_capture.c | 4 ++--
tests/i915/gem_exec_fence.c | 10 +++++-----
tests/i915/gem_exec_flush.c | 4 ++--
tests/i915/gem_exec_gttfill.c | 2 +-
tests/i915/gem_exec_latency.c | 4 ++--
tests/i915/gem_exec_nop.c | 4 ++--
tests/i915/gem_exec_parallel.c | 2 +-
tests/i915/gem_exec_params.c | 2 +-
tests/i915/gem_exec_reloc.c | 8 ++++----
tests/i915/gem_exec_schedule.c | 8 ++++----
tests/i915/gem_exec_store.c | 6 +++---
tests/i915/gem_exec_suspend.c | 2 +-
tests/i915/gem_exec_whisper.c | 2 +-
tests/i915/gem_render_copy.c | 6 +++---
tests/i915/gem_ringfill.c | 2 +-
tests/i915/gem_softpin.c | 4 ++--
tests/i915/gem_sync.c | 8 ++++----
tests/i915/gem_tiled_fence_blits.c | 2 +-
tests/i915/gem_userptr_blits.c | 4 ++--
tests/i915/gem_vm_create.c | 2 +-
tests/i915/i915_module_load.c | 4 ++--
tests/i915/i915_pm_rc6_residency.c | 4 ++--
tests/i915/sysfs_timeslice_duration.c | 2 +-
31 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/tests/i915/gem_bad_reloc.c b/tests/i915/gem_bad_reloc.c
index 7eb7fa538..6acc1724f 100644
--- a/tests/i915/gem_bad_reloc.c
+++ b/tests/i915/gem_bad_reloc.c
@@ -113,7 +113,7 @@ static void negative_reloc(int fd, unsigned flags)
static void negative_reloc_blt(int fd)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 obj[1024][2];
struct drm_i915_gem_relocation_entry reloc;
diff --git a/tests/i915/gem_ctx_create.c b/tests/i915/gem_ctx_create.c
index 39305f026..c7295f705 100644
--- a/tests/i915/gem_ctx_create.c
+++ b/tests/i915/gem_ctx_create.c
@@ -419,7 +419,7 @@ static void basic_ext_param(int i915)
static void check_single_timeline(int i915, uint32_t ctx, int num_engines)
{
#define RCS_TIMESTAMP (0x2000 + 0x358)
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
const int has_64bit_reloc = gen >= 8;
struct drm_i915_gem_exec_object2 results = { .handle = gem_create(i915, 4096) };
const uint32_t bbe = MI_BATCH_BUFFER_END;
diff --git a/tests/i915/gem_ctx_engines.c b/tests/i915/gem_ctx_engines.c
index e6def511b..7d4abdb5c 100644
--- a/tests/i915/gem_ctx_engines.c
+++ b/tests/i915/gem_ctx_engines.c
@@ -482,7 +482,7 @@ static uint32_t read_result(int timeline, uint32_t *map, int idx)
static void independent(int i915)
{
#define RCS_TIMESTAMP (0x2000 + 0x358)
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
const int has_64bit_reloc = gen >= 8;
I915_DEFINE_CONTEXT_PARAM_ENGINES(engines , I915_EXEC_RING_MASK + 1);
struct drm_i915_gem_context_param param = {
diff --git a/tests/i915/gem_ctx_isolation.c b/tests/i915/gem_ctx_isolation.c
index 9fdf78bb8..58a35b487 100644
--- a/tests/i915/gem_ctx_isolation.c
+++ b/tests/i915/gem_ctx_isolation.c
@@ -501,7 +501,7 @@ static void dump_regs(int fd,
const struct intel_execution_engine2 *e,
unsigned int regs)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const unsigned int gen_bit = 1 << gen;
const unsigned int engine_bit = ENGINE(e->class, e->instance);
const uint32_t mmio_base = gem_engine_mmio_base(fd, e->name);
diff --git a/tests/i915/gem_ctx_shared.c b/tests/i915/gem_ctx_shared.c
index 55678d96f..616462d79 100644
--- a/tests/i915/gem_ctx_shared.c
+++ b/tests/i915/gem_ctx_shared.c
@@ -186,7 +186,7 @@ static void exhaust_shared_gtt(int i915, unsigned int flags)
static void exec_shared_gtt(int i915, unsigned int ring)
{
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_exec_object2 obj = {};
struct drm_i915_gem_execbuffer2 execbuf = {
@@ -436,7 +436,7 @@ static void store_dword(int i915, uint32_t ctx, unsigned ring,
uint32_t target, uint32_t offset, uint32_t value,
uint32_t cork, unsigned write_domain)
{
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
diff --git a/tests/i915/gem_ctx_thrash.c b/tests/i915/gem_ctx_thrash.c
index dc7259c18..d32619d5d 100644
--- a/tests/i915/gem_ctx_thrash.c
+++ b/tests/i915/gem_ctx_thrash.c
@@ -46,7 +46,7 @@ static void xchg_int(void *array, unsigned i, unsigned j)
static unsigned context_size(int fd)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
switch (gen) {
case 0:
diff --git a/tests/i915/gem_exec_async.c b/tests/i915/gem_exec_async.c
index 035e78377..9f2c80f05 100644
--- a/tests/i915/gem_exec_async.c
+++ b/tests/i915/gem_exec_async.c
@@ -29,7 +29,7 @@ IGT_TEST_DESCRIPTION("Check that we can issue concurrent writes across the engin
static void store_dword(int fd, unsigned ring,
uint32_t target, uint32_t offset, uint32_t value)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
diff --git a/tests/i915/gem_exec_await.c b/tests/i915/gem_exec_await.c
index 6bc624e4a..70fda968e 100644
--- a/tests/i915/gem_exec_await.c
+++ b/tests/i915/gem_exec_await.c
@@ -59,7 +59,7 @@ static void wide(int fd, int ring_size, int timeout, unsigned int flags)
{
const struct intel_execution_engine2 *engine;
const uint32_t bbe = MI_BATCH_BUFFER_END;
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct {
struct drm_i915_gem_exec_object2 *obj;
struct drm_i915_gem_exec_object2 exec[2];
diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c
index 1a53d2fb7..d250c8166 100644
--- a/tests/i915/gem_exec_capture.c
+++ b/tests/i915/gem_exec_capture.c
@@ -61,7 +61,7 @@ static void check_error_state(int dir, struct drm_i915_gem_exec_object2 *obj)
static void __capture1(int fd, int dir, unsigned ring, uint32_t target)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[4];
#define SCRATCH 0
#define CAPTURE 1
@@ -196,7 +196,7 @@ static struct offset {
unsigned int flags)
#define INCREMENTAL 0x1
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 *obj;
struct drm_i915_gem_relocation_entry reloc[2];
struct drm_i915_gem_execbuffer2 execbuf;
diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c
index c9b95fe64..0992314d3 100644
--- a/tests/i915/gem_exec_fence.c
+++ b/tests/i915/gem_exec_fence.c
@@ -61,7 +61,7 @@ static void store(int fd, const struct intel_execution_engine2 *e,
{
const int SCRATCH = 0;
const int BATCH = 1;
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -122,7 +122,7 @@ static bool fence_busy(int fence)
static void test_fence_busy(int fd, const struct intel_execution_engine2 *e,
unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj;
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -218,7 +218,7 @@ static void test_fence_busy(int fd, const struct intel_execution_engine2 *e,
static void test_fence_busy_all(int fd, unsigned flags)
{
const struct intel_execution_engine2 *e;
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj;
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -598,7 +598,7 @@ static int __execbuf(int fd, struct drm_i915_gem_execbuffer2 *execbuf)
static void test_parallel(int i915, const struct intel_execution_engine2 *e)
{
const struct intel_execution_engine2 *e2;
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
uint32_t scratch = gem_create(i915, 4096);
uint32_t *out = gem_mmap__wc(i915, scratch, 0, 4096, PROT_READ);
uint32_t handle[I915_EXEC_RING_MASK];
@@ -704,7 +704,7 @@ static void test_parallel(int i915, const struct intel_execution_engine2 *e)
static void test_concurrent(int i915, const struct intel_execution_engine2 *e)
{
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
struct drm_i915_gem_relocation_entry reloc = {
.target_handle = gem_create(i915, 4096),
.write_domain = I915_GEM_DOMAIN_RENDER,
diff --git a/tests/i915/gem_exec_flush.c b/tests/i915/gem_exec_flush.c
index 7d9fcbfcb..403e498bd 100644
--- a/tests/i915/gem_exec_flush.c
+++ b/tests/i915/gem_exec_flush.c
@@ -78,7 +78,7 @@ static uint32_t movnt(uint32_t *map, int i)
static void run(int fd, unsigned ring, int nchild, int timeout,
unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
/* The crux of this testing is whether writes by the GPU are coherent
* from the CPU.
@@ -355,7 +355,7 @@ enum batch_mode {
static void batch(int fd, unsigned ring, int nchild, int timeout,
enum batch_mode mode, unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
if (mode == BATCH_GTT)
gem_require_mappable_ggtt(fd);
diff --git a/tests/i915/gem_exec_gttfill.c b/tests/i915/gem_exec_gttfill.c
index 7a6d7c0fb..8f2336a30 100644
--- a/tests/i915/gem_exec_gttfill.c
+++ b/tests/i915/gem_exec_gttfill.c
@@ -107,7 +107,7 @@ static void submit(int fd, int gen,
static void fillgtt(int fd, unsigned ring, int timeout)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_relocation_entry reloc[2];
volatile uint64_t *shared;
diff --git a/tests/i915/gem_exec_latency.c b/tests/i915/gem_exec_latency.c
index 198e54fd2..568d727f2 100644
--- a/tests/i915/gem_exec_latency.c
+++ b/tests/i915/gem_exec_latency.c
@@ -109,7 +109,7 @@ static void latency_on_ring(int fd,
unsigned ring, const char *name,
unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const int has_64bit_reloc = gen >= 8;
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc;
@@ -258,7 +258,7 @@ static void latency_from_ring(int fd,
unsigned ring, const char *name,
unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const int has_64bit_reloc = gen >= 8;
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc;
diff --git a/tests/i915/gem_exec_nop.c b/tests/i915/gem_exec_nop.c
index 21a937c83..62554ecb2 100644
--- a/tests/i915/gem_exec_nop.c
+++ b/tests/i915/gem_exec_nop.c
@@ -104,7 +104,7 @@ static double nop_on_ring(int fd, uint32_t handle,
static void poll_ring(int fd, const struct intel_execution_engine2 *e,
int timeout)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const uint32_t MI_ARB_CHK = 0x5 << 23;
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 obj;
@@ -214,7 +214,7 @@ static void poll_ring(int fd, const struct intel_execution_engine2 *e,
static void poll_sequential(int fd, const char *name, int timeout)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const struct intel_execution_engine2 *e;
const uint32_t MI_ARB_CHK = 0x5 << 23;
struct drm_i915_gem_execbuffer2 execbuf;
diff --git a/tests/i915/gem_exec_parallel.c b/tests/i915/gem_exec_parallel.c
index bf94b93d4..cb8488f3b 100644
--- a/tests/i915/gem_exec_parallel.c
+++ b/tests/i915/gem_exec_parallel.c
@@ -166,7 +166,7 @@ static void check_bo(int fd, uint32_t handle, int pass, struct thread *threads)
static void all(int fd, struct intel_execution_engine2 *engine, unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
pthread_mutex_t mutex;
pthread_cond_t cond;
struct thread *threads;
diff --git a/tests/i915/gem_exec_params.c b/tests/i915/gem_exec_params.c
index f8a940740..e0bbea94b 100644
--- a/tests/i915/gem_exec_params.c
+++ b/tests/i915/gem_exec_params.c
@@ -91,7 +91,7 @@ static bool has_resource_streamer(int fd)
static void test_batch_first(int fd)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc[2];
diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c
index d50a8b694..a86d22029 100644
--- a/tests/i915/gem_exec_reloc.c
+++ b/tests/i915/gem_exec_reloc.c
@@ -64,7 +64,7 @@ static void write_dword(int fd,
uint64_t target_offset,
uint32_t value)
{
- int gen = intel_gen(intel_get_drm_devid(fd));
+ unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
@@ -266,7 +266,7 @@ static void check_bo(int fd, uint32_t handle)
static void active(int fd, unsigned engine)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_execbuffer2 execbuf;
@@ -1081,7 +1081,7 @@ static void parallel(int i915)
static uint64_t concurrent_relocs(int i915, int idx, int count)
{
struct drm_i915_gem_relocation_entry *reloc;
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
unsigned long sz;
int offset;
@@ -1180,7 +1180,7 @@ static void concurrent_child(int i915,
static uint32_t create_concurrent_batch(int i915, unsigned int count)
{
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
size_t sz = ALIGN(4 * (1 + 4 * count), 4096);
uint32_t handle = gem_create(i915, sz);
uint32_t *map, *cs;
diff --git a/tests/i915/gem_exec_schedule.c b/tests/i915/gem_exec_schedule.c
index 488d93511..72277e57f 100644
--- a/tests/i915/gem_exec_schedule.c
+++ b/tests/i915/gem_exec_schedule.c
@@ -94,7 +94,7 @@ static uint32_t __store_dword(int fd, uint32_t ctx, unsigned ring,
uint32_t target, uint32_t offset, uint32_t value,
uint32_t cork, int fence, unsigned write_domain)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -1062,7 +1062,7 @@ static void semaphore_resolve(int i915)
static void semaphore_noskip(int i915)
{
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
const struct intel_execution_engine2 *outer, *inner;
uint32_t ctx;
@@ -1695,7 +1695,7 @@ static void deep(int fd, unsigned ring)
/* Create a deep dependency chain, with a few branches */
for (n = 0; n < nreq && igt_seconds_elapsed(&tv) < 2; n++) {
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 eb = {
@@ -1848,7 +1848,7 @@ static void wide(int fd, unsigned ring)
static void reorder_wide(int fd, unsigned ring)
{
const unsigned int ring_size = gem_submission_measure(fd, ring);
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const int priorities[] = { MIN_PRIO, MAX_PRIO };
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_exec_object2 obj[2];
diff --git a/tests/i915/gem_exec_store.c b/tests/i915/gem_exec_store.c
index 272ab9cd8..771ee1690 100644
--- a/tests/i915/gem_exec_store.c
+++ b/tests/i915/gem_exec_store.c
@@ -38,7 +38,7 @@
static void store_dword(int fd, const struct intel_execution_engine2 *e)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -96,7 +96,7 @@ static void store_dword(int fd, const struct intel_execution_engine2 *e)
static void store_cachelines(int fd, const struct intel_execution_engine2 *e,
unsigned int flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 *obj;
struct drm_i915_gem_relocation_entry *reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -172,7 +172,7 @@ static void store_cachelines(int fd, const struct intel_execution_engine2 *e,
static void store_all(int fd)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct intel_execution_engine2 *engine;
struct drm_i915_gem_relocation_entry *reloc;
diff --git a/tests/i915/gem_exec_suspend.c b/tests/i915/gem_exec_suspend.c
index d768db911..6886bccd4 100644
--- a/tests/i915/gem_exec_suspend.c
+++ b/tests/i915/gem_exec_suspend.c
@@ -89,7 +89,7 @@ static bool has_semaphores(int fd)
static void run_test(int fd, unsigned engine, unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
diff --git a/tests/i915/gem_exec_whisper.c b/tests/i915/gem_exec_whisper.c
index 1fded7618..9acf6c306 100644
--- a/tests/i915/gem_exec_whisper.c
+++ b/tests/i915/gem_exec_whisper.c
@@ -168,7 +168,7 @@ static void ctx_set_random_priority(int fd, uint32_t ctx)
static void whisper(int fd, unsigned engine, unsigned flags)
{
const uint32_t bbe = MI_BATCH_BUFFER_END;
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 batches[QLEN];
struct drm_i915_gem_relocation_entry inter[QLEN];
struct drm_i915_gem_relocation_entry reloc;
diff --git a/tests/i915/gem_render_copy.c b/tests/i915/gem_render_copy.c
index 1e1e79b95..2da9837aa 100644
--- a/tests/i915/gem_render_copy.c
+++ b/tests/i915/gem_render_copy.c
@@ -131,7 +131,7 @@ static void scratch_buf_write_to_png(data_t *data, struct igt_buf *buf,
static void *linear_copy_ccs(data_t *data, struct igt_buf *buf)
{
void *ccs_data, *linear;
- int gen = intel_gen(data->devid);
+ unsigned int gen = intel_gen(data->devid);
int ccs_size = igt_buf_intel_ccs_width(gen, buf) *
igt_buf_intel_ccs_height(gen, buf);
@@ -154,7 +154,7 @@ static void scratch_buf_ccs_write_to_png(data_t *data,
cairo_surface_t *surface;
cairo_status_t ret;
void *linear;
- int gen = intel_gen(data->devid);
+ unsigned int gen = intel_gen(data->devid);
unsigned int ccs_width = igt_buf_intel_ccs_width(gen, buf);
unsigned int ccs_height = igt_buf_intel_ccs_height(gen, buf);
@@ -348,7 +348,7 @@ scratch_buf_check_all(data_t *data,
static void scratch_buf_ccs_check(data_t *data,
struct igt_buf *buf)
{
- int gen = intel_gen(data->devid);
+ unsigned int gen = intel_gen(data->devid);
int ccs_size = igt_buf_intel_ccs_width(gen, buf) *
igt_buf_intel_ccs_height(gen, buf);
uint8_t *linear;
diff --git a/tests/i915/gem_ringfill.c b/tests/i915/gem_ringfill.c
index 3e24ccf18..c499cb0dd 100644
--- a/tests/i915/gem_ringfill.c
+++ b/tests/i915/gem_ringfill.c
@@ -99,7 +99,7 @@ static void setup_execbuf(int fd,
struct drm_i915_gem_relocation_entry *reloc,
unsigned int ring)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const uint32_t bbe = MI_BATCH_BUFFER_END;
uint32_t *batch, *b;
int i;
diff --git a/tests/i915/gem_softpin.c b/tests/i915/gem_softpin.c
index 202abdd88..fcaf8ef30 100644
--- a/tests/i915/gem_softpin.c
+++ b/tests/i915/gem_softpin.c
@@ -265,7 +265,7 @@ static void test_reverse(int i915)
static uint64_t busy_batch(int fd)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ unsigned const int gen = intel_gen(intel_get_drm_devid(fd));
const int has_64bit_reloc = gen >= 8;
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 object[2];
@@ -452,7 +452,7 @@ static void xchg_offset(void *array, unsigned i, unsigned j)
enum sleep { NOSLEEP, SUSPEND, HIBERNATE };
static void test_noreloc(int fd, enum sleep sleep, unsigned flags)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ unsigned const int gen = intel_gen(intel_get_drm_devid(fd));
const uint32_t size = 4096;
const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_execbuffer2 execbuf;
diff --git a/tests/i915/gem_sync.c b/tests/i915/gem_sync.c
index b317a3927..a82bda924 100644
--- a/tests/i915/gem_sync.c
+++ b/tests/i915/gem_sync.c
@@ -491,7 +491,7 @@ active_wakeup_ring(int fd, unsigned ring, int timeout, int wlen)
static void
store_ring(int fd, unsigned ring, int num_children, int timeout)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct intel_engine_data ied;
ied = list_store_engines(fd, ring);
@@ -587,7 +587,7 @@ store_ring(int fd, unsigned ring, int num_children, int timeout)
static void
switch_ring(int fd, unsigned ring, int num_children, int timeout)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct intel_engine_data ied;
gem_require_contexts(fd);
@@ -766,7 +766,7 @@ static void *waiter(void *arg)
static void
__store_many(int fd, unsigned ring, int timeout, unsigned long *cycles)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_exec_object2 object[2];
struct drm_i915_gem_execbuffer2 execbuf;
@@ -971,7 +971,7 @@ sync_all(int fd, int num_children, int timeout)
static void
store_all(int fd, int num_children, int timeout)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct intel_engine_data ied;
ied = list_store_engines(fd, ALL_ENGINES);
diff --git a/tests/i915/gem_tiled_fence_blits.c b/tests/i915/gem_tiled_fence_blits.c
index 99ec78f9b..0a633d91b 100644
--- a/tests/i915/gem_tiled_fence_blits.c
+++ b/tests/i915/gem_tiled_fence_blits.c
@@ -88,7 +88,7 @@ static void check_bo(int fd, uint32_t handle, uint32_t start_val)
static uint32_t
create_batch(int fd, struct drm_i915_gem_relocation_entry *reloc)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
const bool has_64b_reloc = gen >= 8;
uint32_t *batch;
uint32_t handle;
diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c
index 268423dcd..3ae022016 100644
--- a/tests/i915/gem_userptr_blits.c
+++ b/tests/i915/gem_userptr_blits.c
@@ -300,7 +300,7 @@ blit(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo)
static void store_dword(int fd, uint32_t target,
uint32_t offset, uint32_t value)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -1125,7 +1125,7 @@ static void store_dword_rand(int i915, unsigned int engine,
uint32_t target, uint64_t sz,
int count)
{
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
struct drm_i915_gem_relocation_entry *reloc;
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_execbuffer2 exec;
diff --git a/tests/i915/gem_vm_create.c b/tests/i915/gem_vm_create.c
index e8af68f19..8843b1b3b 100644
--- a/tests/i915/gem_vm_create.c
+++ b/tests/i915/gem_vm_create.c
@@ -250,7 +250,7 @@ static void execbuf(int i915)
static void
write_to_address(int fd, uint32_t ctx, uint64_t addr, uint32_t value)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 batch = {
.handle = gem_create(fd, 4096)
};
diff --git a/tests/i915/i915_module_load.c b/tests/i915/i915_module_load.c
index 77aaac5c6..aa998b992 100644
--- a/tests/i915/i915_module_load.c
+++ b/tests/i915/i915_module_load.c
@@ -40,7 +40,7 @@
static void store_dword(int fd, unsigned ring)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -102,7 +102,7 @@ static void store_dword(int fd, unsigned ring)
static void store_all(int fd)
{
- const int gen = intel_gen(intel_get_drm_devid(fd));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_relocation_entry reloc[32];
struct drm_i915_gem_execbuffer2 execbuf;
diff --git a/tests/i915/i915_pm_rc6_residency.c b/tests/i915/i915_pm_rc6_residency.c
index 6fdc607e3..d484121e7 100644
--- a/tests/i915/i915_pm_rc6_residency.c
+++ b/tests/i915/i915_pm_rc6_residency.c
@@ -361,7 +361,7 @@ static void rc6_idle(int i915)
{
const int64_t duration_ns = SLEEP_DURATION * (int64_t)NSEC_PER_SEC;
const int tolerance = 20; /* Some RC6 is better than none! */
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
struct {
const char *name;
unsigned int flags;
@@ -452,7 +452,7 @@ static void rc6_fence(int i915)
{
const int64_t duration_ns = SLEEP_DURATION * (int64_t)NSEC_PER_SEC;
const int tolerance = 20; /* Some RC6 is better than none! */
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
const struct intel_execution_engine2 *e;
struct power_sample sample[2];
unsigned long slept;
diff --git a/tests/i915/sysfs_timeslice_duration.c b/tests/i915/sysfs_timeslice_duration.c
index 2b1e52c80..b5b6ded78 100644
--- a/tests/i915/sysfs_timeslice_duration.c
+++ b/tests/i915/sysfs_timeslice_duration.c
@@ -186,7 +186,7 @@ static uint64_t __test_duration(int i915, int engine, unsigned int timeout)
.buffer_count = ARRAY_SIZE(obj),
.buffers_ptr = to_user_pointer(obj),
};
- const int gen = intel_gen(intel_get_drm_devid(i915));
+ const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
double duration = clockrate(i915);
unsigned int class, inst, mmio;
uint32_t *cs, *map;
--
2.28.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for tests/i915: Treat gen as unsigned for forward compatibility
2020-08-06 15:28 ` [igt-dev] " Chris Wilson
(?)
@ 2020-08-06 16:58 ` Patchwork
-1 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2020-08-06 16:58 UTC (permalink / raw)
To: Chris Wilson; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 6847 bytes --]
== Series Details ==
Series: tests/i915: Treat gen as unsigned for forward compatibility
URL : https://patchwork.freedesktop.org/series/80353/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8849 -> IGTPW_4864
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/index.html
Known issues
------------
Here are the changes found in IGTPW_4864 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s0:
- fi-tgl-u2: [PASS][1] -> [FAIL][2] ([i915#1888])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/fi-tgl-u2/igt@gem_exec_suspend@basic-s0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/fi-tgl-u2/igt@gem_exec_suspend@basic-s0.html
* igt@i915_selftest@live@execlists:
- fi-tgl-y: [PASS][3] -> [INCOMPLETE][4] ([i915#2268])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/fi-tgl-y/igt@i915_selftest@live@execlists.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/fi-tgl-y/igt@i915_selftest@live@execlists.html
* igt@kms_flip@basic-flip-vs-wf_vblank@c-edp1:
- fi-icl-u2: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/fi-icl-u2/igt@kms_flip@basic-flip-vs-wf_vblank@c-edp1.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/fi-icl-u2/igt@kms_flip@basic-flip-vs-wf_vblank@c-edp1.html
* igt@kms_flip@basic-flip-vs-wf_vblank@c-hdmi-a2:
- fi-skl-guc: [PASS][7] -> [DMESG-WARN][8] ([i915#2203])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/fi-skl-guc/igt@kms_flip@basic-flip-vs-wf_vblank@c-hdmi-a2.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/fi-skl-guc/igt@kms_flip@basic-flip-vs-wf_vblank@c-hdmi-a2.html
* igt@vgem_basic@setversion:
- fi-tgl-y: [PASS][9] -> [DMESG-WARN][10] ([i915#402]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/fi-tgl-y/igt@vgem_basic@setversion.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/fi-tgl-y/igt@vgem_basic@setversion.html
#### Possible fixes ####
* igt@i915_selftest@live@execlists:
- fi-icl-y: [INCOMPLETE][11] ([i915#2276]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/fi-icl-y/igt@i915_selftest@live@execlists.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/fi-icl-y/igt@i915_selftest@live@execlists.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-byt-j1900: [DMESG-WARN][13] ([i915#1982]) -> [PASS][14] +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/fi-byt-j1900/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/fi-byt-j1900/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
- {fi-kbl-7560u}: [DMESG-WARN][15] ([i915#1982]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/fi-kbl-7560u/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/fi-kbl-7560u/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-icl-u2: [DMESG-WARN][17] ([i915#1982]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/fi-icl-u2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/fi-icl-u2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
* igt@prime_vgem@basic-write:
- fi-tgl-y: [DMESG-WARN][19] ([i915#402]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/fi-tgl-y/igt@prime_vgem@basic-write.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/fi-tgl-y/igt@prime_vgem@basic-write.html
#### Warnings ####
* igt@i915_pm_rpm@module-reload:
- fi-kbl-x1275: [DMESG-FAIL][21] ([i915#62]) -> [SKIP][22] ([fdo#109271])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/fi-kbl-x1275/igt@i915_pm_rpm@module-reload.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/fi-kbl-x1275/igt@i915_pm_rpm@module-reload.html
* igt@kms_cursor_legacy@basic-flip-after-cursor-legacy:
- fi-kbl-x1275: [DMESG-WARN][23] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][24] ([i915#62] / [i915#92]) +3 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/fi-kbl-x1275/igt@kms_cursor_legacy@basic-flip-after-cursor-legacy.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/fi-kbl-x1275/igt@kms_cursor_legacy@basic-flip-after-cursor-legacy.html
* igt@kms_force_connector_basic@force-edid:
- fi-kbl-x1275: [DMESG-WARN][25] ([i915#62] / [i915#92]) -> [DMESG-WARN][26] ([i915#62] / [i915#92] / [i915#95]) +7 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/fi-kbl-x1275/igt@kms_force_connector_basic@force-edid.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/fi-kbl-x1275/igt@kms_force_connector_basic@force-edid.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#2268]: https://gitlab.freedesktop.org/drm/intel/issues/2268
[i915#2276]: https://gitlab.freedesktop.org/drm/intel/issues/2276
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (45 -> 38)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5762 -> IGTPW_4864
CI-20190529: 20190529
CI_DRM_8849: e1ec6d30318d7f7daa23b8af8e92c8486d3f04d0 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4864: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/index.html
IGT_5762: ec3d9a843686a618612016de9249117dd8d862a8 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/index.html
[-- Attachment #1.2: Type: text/html, Size: 8548 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
* [igt-dev] ✗ Fi.CI.IGT: failure for tests/i915: Treat gen as unsigned for forward compatibility
2020-08-06 15:28 ` [igt-dev] " Chris Wilson
(?)
(?)
@ 2020-08-06 23:39 ` Patchwork
-1 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2020-08-06 23:39 UTC (permalink / raw)
To: Chris Wilson; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 22680 bytes --]
== Series Details ==
Series: tests/i915: Treat gen as unsigned for forward compatibility
URL : https://patchwork.freedesktop.org/series/80353/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8849_full -> IGTPW_4864_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_4864_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_4864_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_4864_full:
### IGT changes ###
#### Possible regressions ####
* igt@perf@polling-small-buf:
- shard-tglb: [PASS][1] -> [SKIP][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-tglb5/igt@perf@polling-small-buf.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-tglb5/igt@perf@polling-small-buf.html
- shard-iclb: [PASS][3] -> [SKIP][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-iclb1/igt@perf@polling-small-buf.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-iclb3/igt@perf@polling-small-buf.html
Known issues
------------
Here are the changes found in IGTPW_4864_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@drm_read@short-buffer-block:
- shard-hsw: [PASS][5] -> [TIMEOUT][6] ([i915#1958]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-hsw2/igt@drm_read@short-buffer-block.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-hsw4/igt@drm_read@short-buffer-block.html
- shard-snb: [PASS][7] -> [TIMEOUT][8] ([i915#1958])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-snb6/igt@drm_read@short-buffer-block.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-snb2/igt@drm_read@short-buffer-block.html
* igt@gem_mmap@basic-small-bo:
- shard-iclb: [PASS][9] -> [DMESG-WARN][10] ([i915#1982])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-iclb7/igt@gem_mmap@basic-small-bo.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-iclb2/igt@gem_mmap@basic-small-bo.html
* igt@gem_render_copy@yf-tiled-ccs-to-linear:
- shard-iclb: [PASS][11] -> [TIMEOUT][12] ([i915#1958]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-iclb4/igt@gem_render_copy@yf-tiled-ccs-to-linear.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-iclb7/igt@gem_render_copy@yf-tiled-ccs-to-linear.html
* igt@kms_big_fb@linear-64bpp-rotate-180:
- shard-glk: [PASS][13] -> [DMESG-FAIL][14] ([i915#118] / [i915#95])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-glk2/igt@kms_big_fb@linear-64bpp-rotate-180.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-glk8/igt@kms_big_fb@linear-64bpp-rotate-180.html
* igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible@ab-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][15] -> [DMESG-WARN][16] ([i915#1982])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-glk6/igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible@ab-hdmi-a1-hdmi-a2.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-glk4/igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible@ab-hdmi-a1-hdmi-a2.html
* igt@kms_flip@flip-vs-suspend@b-dp1:
- shard-kbl: [PASS][17] -> [DMESG-WARN][18] ([i915#180]) +2 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-kbl2/igt@kms_flip@flip-vs-suspend@b-dp1.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-kbl4/igt@kms_flip@flip-vs-suspend@b-dp1.html
* igt@kms_flip@plain-flip-ts-check-interruptible@a-dp1:
- shard-kbl: [PASS][19] -> [DMESG-WARN][20] ([i915#1982])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-kbl1/igt@kms_flip@plain-flip-ts-check-interruptible@a-dp1.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-kbl6/igt@kms_flip@plain-flip-ts-check-interruptible@a-dp1.html
* igt@kms_frontbuffer_tracking@fbc-2p-indfb-fliptrack:
- shard-glk: [PASS][21] -> [FAIL][22] ([i915#49])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-glk3/igt@kms_frontbuffer_tracking@fbc-2p-indfb-fliptrack.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-glk8/igt@kms_frontbuffer_tracking@fbc-2p-indfb-fliptrack.html
* igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-mmap-cpu:
- shard-tglb: [PASS][23] -> [DMESG-WARN][24] ([i915#1982]) +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-tglb5/igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-mmap-cpu.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-tglb7/igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-mmap-cpu.html
* igt@kms_psr2_su@page_flip:
- shard-tglb: [PASS][25] -> [SKIP][26] ([i915#1911])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-tglb8/igt@kms_psr2_su@page_flip.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-tglb7/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_sprite_render:
- shard-iclb: [PASS][27] -> [SKIP][28] ([fdo#109441])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-iclb2/igt@kms_psr@psr2_sprite_render.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-iclb5/igt@kms_psr@psr2_sprite_render.html
* igt@kms_vblank@pipe-b-query-forked-busy:
- shard-apl: [PASS][29] -> [DMESG-WARN][30] ([i915#1635] / [i915#1982]) +2 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-apl1/igt@kms_vblank@pipe-b-query-forked-busy.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-apl8/igt@kms_vblank@pipe-b-query-forked-busy.html
* igt@perf@polling-small-buf:
- shard-glk: [PASS][31] -> [SKIP][32] ([fdo#109271])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-glk9/igt@perf@polling-small-buf.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-glk2/igt@perf@polling-small-buf.html
- shard-apl: [PASS][33] -> [SKIP][34] ([fdo#109271] / [i915#1635])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-apl7/igt@perf@polling-small-buf.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-apl8/igt@perf@polling-small-buf.html
- shard-kbl: [PASS][35] -> [SKIP][36] ([fdo#109271])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-kbl6/igt@perf@polling-small-buf.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-kbl6/igt@perf@polling-small-buf.html
- shard-hsw: [PASS][37] -> [SKIP][38] ([fdo#109271])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-hsw4/igt@perf@polling-small-buf.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-hsw4/igt@perf@polling-small-buf.html
* igt@prime_busy@hang@bcs0:
- shard-hsw: [PASS][39] -> [FAIL][40] ([i915#2258]) +2 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-hsw1/igt@prime_busy@hang@bcs0.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-hsw1/igt@prime_busy@hang@bcs0.html
#### Possible fixes ####
* {igt@feature_discovery@psr2}:
- shard-iclb: [SKIP][41] ([i915#658]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-iclb8/igt@feature_discovery@psr2.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-iclb2/igt@feature_discovery@psr2.html
* igt@gem_ctx_shared@q-smoketest-all:
- shard-glk: [DMESG-WARN][43] ([i915#118] / [i915#95]) -> [PASS][44] +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-glk9/igt@gem_ctx_shared@q-smoketest-all.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-glk2/igt@gem_ctx_shared@q-smoketest-all.html
* igt@gem_partial_pwrite_pread@writes-after-reads-display:
- shard-apl: [FAIL][45] ([i915#1635]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-apl4/igt@gem_partial_pwrite_pread@writes-after-reads-display.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-apl4/igt@gem_partial_pwrite_pread@writes-after-reads-display.html
* igt@i915_pm_dc@dc5-psr:
- shard-iclb: [FAIL][47] ([i915#1899]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-iclb4/igt@i915_pm_dc@dc5-psr.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-iclb4/igt@i915_pm_dc@dc5-psr.html
- shard-tglb: [FAIL][49] ([i915#1899]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-tglb2/igt@i915_pm_dc@dc5-psr.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-tglb8/igt@i915_pm_dc@dc5-psr.html
* igt@i915_selftest@mock@contexts:
- shard-apl: [INCOMPLETE][51] ([i915#1635]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-apl7/igt@i915_selftest@mock@contexts.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-apl8/igt@i915_selftest@mock@contexts.html
* igt@kms_big_fb@yf-tiled-32bpp-rotate-270:
- shard-glk: [FAIL][53] ([i915#1119]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-glk6/igt@kms_big_fb@yf-tiled-32bpp-rotate-270.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-glk8/igt@kms_big_fb@yf-tiled-32bpp-rotate-270.html
* igt@kms_color@pipe-a-ctm-max:
- shard-kbl: [FAIL][55] ([i915#168]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-kbl6/igt@kms_color@pipe-a-ctm-max.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-kbl2/igt@kms_color@pipe-a-ctm-max.html
* igt@kms_flip@flip-vs-suspend@c-hdmi-a1:
- shard-hsw: [INCOMPLETE][57] ([i915#2055]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-hsw1/igt@kms_flip@flip-vs-suspend@c-hdmi-a1.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-hsw2/igt@kms_flip@flip-vs-suspend@c-hdmi-a1.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-pwrite:
- shard-glk: [FAIL][59] ([i915#49]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-glk3/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-pwrite.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-glk2/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbc-stridechange:
- shard-tglb: [DMESG-WARN][61] ([i915#1982]) -> [PASS][62] +5 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-tglb5/igt@kms_frontbuffer_tracking@fbc-stridechange.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-tglb3/igt@kms_frontbuffer_tracking@fbc-stridechange.html
- shard-glk: [DMESG-WARN][63] ([i915#1982]) -> [PASS][64] +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-glk1/igt@kms_frontbuffer_tracking@fbc-stridechange.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-glk7/igt@kms_frontbuffer_tracking@fbc-stridechange.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-cpu:
- shard-tglb: [INCOMPLETE][65] -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-tglb3/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-cpu.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-tglb2/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-cpu.html
* igt@kms_panel_fitting@atomic-fastset:
- shard-tglb: [FAIL][67] ([i915#83]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-tglb8/igt@kms_panel_fitting@atomic-fastset.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-tglb2/igt@kms_panel_fitting@atomic-fastset.html
- shard-iclb: [FAIL][69] ([i915#83]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-iclb3/igt@kms_panel_fitting@atomic-fastset.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-iclb8/igt@kms_panel_fitting@atomic-fastset.html
* igt@kms_properties@invalid-properties-atomic:
- shard-snb: [TIMEOUT][71] ([i915#1958]) -> [PASS][72] +1 similar issue
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-snb5/igt@kms_properties@invalid-properties-atomic.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-snb1/igt@kms_properties@invalid-properties-atomic.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][73] ([fdo#109441]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-iclb3/igt@kms_psr@psr2_primary_mmap_cpu.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@kms_setmode@basic:
- shard-kbl: [FAIL][75] ([i915#31]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-kbl6/igt@kms_setmode@basic.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-kbl6/igt@kms_setmode@basic.html
* igt@kms_universal_plane@universal-plane-pipe-c-functional:
- shard-hsw: [TIMEOUT][77] ([i915#1958]) -> [PASS][78] +2 similar issues
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-hsw1/igt@kms_universal_plane@universal-plane-pipe-c-functional.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-hsw6/igt@kms_universal_plane@universal-plane-pipe-c-functional.html
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-kbl: [DMESG-WARN][79] ([i915#180]) -> [PASS][80] +3 similar issues
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-kbl2/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-kbl2/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
* igt@perf@blocking-parameterized:
- shard-kbl: [FAIL][81] ([i915#1542]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-kbl2/igt@perf@blocking-parameterized.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-kbl4/igt@perf@blocking-parameterized.html
* igt@perf@polling:
- shard-iclb: [DMESG-WARN][83] ([i915#1982]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-iclb2/igt@perf@polling.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-iclb3/igt@perf@polling.html
* igt@perf@polling-parameterized:
- shard-iclb: [FAIL][85] ([i915#1542]) -> [PASS][86]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-iclb4/igt@perf@polling-parameterized.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-iclb8/igt@perf@polling-parameterized.html
* igt@prime_busy@after@vecs0:
- shard-hsw: [FAIL][87] ([i915#2258]) -> [PASS][88] +1 similar issue
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-hsw2/igt@prime_busy@after@vecs0.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-hsw1/igt@prime_busy@after@vecs0.html
#### Warnings ####
* igt@gem_exec_reloc@basic-concurrent16:
- shard-iclb: [INCOMPLETE][89] ([i915#1958]) -> [TIMEOUT][90] ([i915#1958])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-iclb6/igt@gem_exec_reloc@basic-concurrent16.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-iclb7/igt@gem_exec_reloc@basic-concurrent16.html
* igt@gem_render_copy@yf-tiled-ccs-to-linear:
- shard-hsw: [SKIP][91] ([fdo#109271]) -> [TIMEOUT][92] ([i915#1958]) +2 similar issues
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-hsw2/igt@gem_render_copy@yf-tiled-ccs-to-linear.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-hsw4/igt@gem_render_copy@yf-tiled-ccs-to-linear.html
* igt@kms_chamelium@common-hpd-after-suspend:
- shard-hsw: [TIMEOUT][93] ([i915#1958]) -> [SKIP][94] ([fdo#109271] / [fdo#111827])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-hsw1/igt@kms_chamelium@common-hpd-after-suspend.html
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-hsw6/igt@kms_chamelium@common-hpd-after-suspend.html
- shard-snb: [TIMEOUT][95] ([i915#1958]) -> [SKIP][96] ([fdo#109271] / [fdo#111827])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-snb5/igt@kms_chamelium@common-hpd-after-suspend.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-snb2/igt@kms_chamelium@common-hpd-after-suspend.html
* igt@kms_content_protection@lic:
- shard-kbl: [TIMEOUT][97] ([i915#1319] / [i915#1958]) -> [TIMEOUT][98] ([i915#1319])
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-kbl7/igt@kms_content_protection@lic.html
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-kbl1/igt@kms_content_protection@lic.html
* igt@kms_cursor_crc@pipe-a-cursor-512x170-onscreen:
- shard-snb: [SKIP][99] ([fdo#109271]) -> [TIMEOUT][100] ([i915#1958]) +3 similar issues
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-snb2/igt@kms_cursor_crc@pipe-a-cursor-512x170-onscreen.html
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-snb2/igt@kms_cursor_crc@pipe-a-cursor-512x170-onscreen.html
- shard-iclb: [SKIP][101] ([fdo#109278] / [fdo#109279]) -> [TIMEOUT][102] ([i915#1958])
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-iclb7/igt@kms_cursor_crc@pipe-a-cursor-512x170-onscreen.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-iclb7/igt@kms_cursor_crc@pipe-a-cursor-512x170-onscreen.html
* igt@kms_frontbuffer_tracking@psr-2p-primscrn-pri-shrfb-draw-pwrite:
- shard-snb: [TIMEOUT][103] ([i915#1958]) -> [SKIP][104] ([fdo#109271]) +1 similar issue
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-snb5/igt@kms_frontbuffer_tracking@psr-2p-primscrn-pri-shrfb-draw-pwrite.html
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-snb6/igt@kms_frontbuffer_tracking@psr-2p-primscrn-pri-shrfb-draw-pwrite.html
* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][105] ([fdo#109642] / [fdo#111068]) -> [SKIP][106] ([i915#1911])
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-iclb1/igt@kms_psr2_su@page_flip.html
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-iclb2/igt@kms_psr2_su@page_flip.html
* igt@runner@aborted:
- shard-apl: ([FAIL][107], [FAIL][108]) ([fdo#109271] / [i915#1635] / [i915#2110] / [i915#716]) -> [FAIL][109] ([fdo#109271] / [i915#1635] / [i915#716])
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-apl4/igt@runner@aborted.html
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8849/shard-apl7/igt@runner@aborted.html
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/shard-apl4/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1119]: https://gitlab.freedesktop.org/drm/intel/issues/1119
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#168]: https://gitlab.freedesktop.org/drm/intel/issues/168
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1899]: https://gitlab.freedesktop.org/drm/intel/issues/1899
[i915#1911]: https://gitlab.freedesktop.org/drm/intel/issues/1911
[i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2055]: https://gitlab.freedesktop.org/drm/intel/issues/2055
[i915#2110]: https://gitlab.freedesktop.org/drm/intel/issues/2110
[i915#2258]: https://gitlab.freedesktop.org/drm/intel/issues/2258
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#83]: https://gitlab.freedesktop.org/drm/intel/issues/83
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (11 -> 8)
------------------------------
Missing (3): pig-skl-6260u pig-glk-j5005 pig-icl-1065g7
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5762 -> IGTPW_4864
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_8849: e1ec6d30318d7f7daa23b8af8e92c8486d3f04d0 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4864: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/index.html
IGT_5762: ec3d9a843686a618612016de9249117dd8d862a8 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4864/index.html
[-- Attachment #1.2: Type: text/html, Size: 27753 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH i-g-t] tests/i915: Treat gen as unsigned for forward compatibility
2020-08-06 15:28 ` [igt-dev] " Chris Wilson
@ 2020-08-19 13:36 ` Lukasz Fiedorowicz
-1 siblings, 0 replies; 6+ messages in thread
From: Lukasz Fiedorowicz @ 2020-08-19 13:36 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: igt-dev, Chris Wilson
Chris Wilson <chris@chris-wilson.co.uk> writes:
> We want to recognise future devices (gen = -1u) and treat them as an
> extension of the latest known device, which is typically true.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
CI failures looked to be unrelated to those changes so
Acked-by: Lukasz Fiedorowicz <lukasz.fiedorowicz@intel.com>
> ---
> tests/i915/gem_bad_reloc.c | 2 +-
> tests/i915/gem_ctx_create.c | 2 +-
> tests/i915/gem_ctx_engines.c | 2 +-
> tests/i915/gem_ctx_isolation.c | 2 +-
> tests/i915/gem_ctx_shared.c | 4 ++--
> tests/i915/gem_ctx_thrash.c | 2 +-
> tests/i915/gem_exec_async.c | 2 +-
> tests/i915/gem_exec_await.c | 2 +-
> tests/i915/gem_exec_capture.c | 4 ++--
> tests/i915/gem_exec_fence.c | 10 +++++-----
> tests/i915/gem_exec_flush.c | 4 ++--
> tests/i915/gem_exec_gttfill.c | 2 +-
> tests/i915/gem_exec_latency.c | 4 ++--
> tests/i915/gem_exec_nop.c | 4 ++--
> tests/i915/gem_exec_parallel.c | 2 +-
> tests/i915/gem_exec_params.c | 2 +-
> tests/i915/gem_exec_reloc.c | 8 ++++----
> tests/i915/gem_exec_schedule.c | 8 ++++----
> tests/i915/gem_exec_store.c | 6 +++---
> tests/i915/gem_exec_suspend.c | 2 +-
> tests/i915/gem_exec_whisper.c | 2 +-
> tests/i915/gem_render_copy.c | 6 +++---
> tests/i915/gem_ringfill.c | 2 +-
> tests/i915/gem_softpin.c | 4 ++--
> tests/i915/gem_sync.c | 8 ++++----
> tests/i915/gem_tiled_fence_blits.c | 2 +-
> tests/i915/gem_userptr_blits.c | 4 ++--
> tests/i915/gem_vm_create.c | 2 +-
> tests/i915/i915_module_load.c | 4 ++--
> tests/i915/i915_pm_rc6_residency.c | 4 ++--
> tests/i915/sysfs_timeslice_duration.c | 2 +-
> 31 files changed, 57 insertions(+), 57 deletions(-)
>
> diff --git a/tests/i915/gem_bad_reloc.c b/tests/i915/gem_bad_reloc.c
> index 7eb7fa538..6acc1724f 100644
> --- a/tests/i915/gem_bad_reloc.c
> +++ b/tests/i915/gem_bad_reloc.c
> @@ -113,7 +113,7 @@ static void negative_reloc(int fd, unsigned flags)
>
> static void negative_reloc_blt(int fd)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_execbuffer2 execbuf;
> struct drm_i915_gem_exec_object2 obj[1024][2];
> struct drm_i915_gem_relocation_entry reloc;
> diff --git a/tests/i915/gem_ctx_create.c b/tests/i915/gem_ctx_create.c
> index 39305f026..c7295f705 100644
> --- a/tests/i915/gem_ctx_create.c
> +++ b/tests/i915/gem_ctx_create.c
> @@ -419,7 +419,7 @@ static void basic_ext_param(int i915)
> static void check_single_timeline(int i915, uint32_t ctx, int num_engines)
> {
> #define RCS_TIMESTAMP (0x2000 + 0x358)
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> const int has_64bit_reloc = gen >= 8;
> struct drm_i915_gem_exec_object2 results = { .handle = gem_create(i915, 4096) };
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> diff --git a/tests/i915/gem_ctx_engines.c b/tests/i915/gem_ctx_engines.c
> index e6def511b..7d4abdb5c 100644
> --- a/tests/i915/gem_ctx_engines.c
> +++ b/tests/i915/gem_ctx_engines.c
> @@ -482,7 +482,7 @@ static uint32_t read_result(int timeline, uint32_t *map, int idx)
> static void independent(int i915)
> {
> #define RCS_TIMESTAMP (0x2000 + 0x358)
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> const int has_64bit_reloc = gen >= 8;
> I915_DEFINE_CONTEXT_PARAM_ENGINES(engines , I915_EXEC_RING_MASK + 1);
> struct drm_i915_gem_context_param param = {
> diff --git a/tests/i915/gem_ctx_isolation.c b/tests/i915/gem_ctx_isolation.c
> index 9fdf78bb8..58a35b487 100644
> --- a/tests/i915/gem_ctx_isolation.c
> +++ b/tests/i915/gem_ctx_isolation.c
> @@ -501,7 +501,7 @@ static void dump_regs(int fd,
> const struct intel_execution_engine2 *e,
> unsigned int regs)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const unsigned int gen_bit = 1 << gen;
> const unsigned int engine_bit = ENGINE(e->class, e->instance);
> const uint32_t mmio_base = gem_engine_mmio_base(fd, e->name);
> diff --git a/tests/i915/gem_ctx_shared.c b/tests/i915/gem_ctx_shared.c
> index 55678d96f..616462d79 100644
> --- a/tests/i915/gem_ctx_shared.c
> +++ b/tests/i915/gem_ctx_shared.c
> @@ -186,7 +186,7 @@ static void exhaust_shared_gtt(int i915, unsigned int flags)
>
> static void exec_shared_gtt(int i915, unsigned int ring)
> {
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> struct drm_i915_gem_exec_object2 obj = {};
> struct drm_i915_gem_execbuffer2 execbuf = {
> @@ -436,7 +436,7 @@ static void store_dword(int i915, uint32_t ctx, unsigned ring,
> uint32_t target, uint32_t offset, uint32_t value,
> uint32_t cork, unsigned write_domain)
> {
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> struct drm_i915_gem_exec_object2 obj[3];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> diff --git a/tests/i915/gem_ctx_thrash.c b/tests/i915/gem_ctx_thrash.c
> index dc7259c18..d32619d5d 100644
> --- a/tests/i915/gem_ctx_thrash.c
> +++ b/tests/i915/gem_ctx_thrash.c
> @@ -46,7 +46,7 @@ static void xchg_int(void *array, unsigned i, unsigned j)
>
> static unsigned context_size(int fd)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
>
> switch (gen) {
> case 0:
> diff --git a/tests/i915/gem_exec_async.c b/tests/i915/gem_exec_async.c
> index 035e78377..9f2c80f05 100644
> --- a/tests/i915/gem_exec_async.c
> +++ b/tests/i915/gem_exec_async.c
> @@ -29,7 +29,7 @@ IGT_TEST_DESCRIPTION("Check that we can issue concurrent writes across the engin
> static void store_dword(int fd, unsigned ring,
> uint32_t target, uint32_t offset, uint32_t value)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> diff --git a/tests/i915/gem_exec_await.c b/tests/i915/gem_exec_await.c
> index 6bc624e4a..70fda968e 100644
> --- a/tests/i915/gem_exec_await.c
> +++ b/tests/i915/gem_exec_await.c
> @@ -59,7 +59,7 @@ static void wide(int fd, int ring_size, int timeout, unsigned int flags)
> {
> const struct intel_execution_engine2 *engine;
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct {
> struct drm_i915_gem_exec_object2 *obj;
> struct drm_i915_gem_exec_object2 exec[2];
> diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c
> index 1a53d2fb7..d250c8166 100644
> --- a/tests/i915/gem_exec_capture.c
> +++ b/tests/i915/gem_exec_capture.c
> @@ -61,7 +61,7 @@ static void check_error_state(int dir, struct drm_i915_gem_exec_object2 *obj)
>
> static void __capture1(int fd, int dir, unsigned ring, uint32_t target)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[4];
> #define SCRATCH 0
> #define CAPTURE 1
> @@ -196,7 +196,7 @@ static struct offset {
> unsigned int flags)
> #define INCREMENTAL 0x1
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 *obj;
> struct drm_i915_gem_relocation_entry reloc[2];
> struct drm_i915_gem_execbuffer2 execbuf;
> diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c
> index c9b95fe64..0992314d3 100644
> --- a/tests/i915/gem_exec_fence.c
> +++ b/tests/i915/gem_exec_fence.c
> @@ -61,7 +61,7 @@ static void store(int fd, const struct intel_execution_engine2 *e,
> {
> const int SCRATCH = 0;
> const int BATCH = 1;
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -122,7 +122,7 @@ static bool fence_busy(int fence)
> static void test_fence_busy(int fd, const struct intel_execution_engine2 *e,
> unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj;
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -218,7 +218,7 @@ static void test_fence_busy(int fd, const struct intel_execution_engine2 *e,
> static void test_fence_busy_all(int fd, unsigned flags)
> {
> const struct intel_execution_engine2 *e;
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj;
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -598,7 +598,7 @@ static int __execbuf(int fd, struct drm_i915_gem_execbuffer2 *execbuf)
> static void test_parallel(int i915, const struct intel_execution_engine2 *e)
> {
> const struct intel_execution_engine2 *e2;
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> uint32_t scratch = gem_create(i915, 4096);
> uint32_t *out = gem_mmap__wc(i915, scratch, 0, 4096, PROT_READ);
> uint32_t handle[I915_EXEC_RING_MASK];
> @@ -704,7 +704,7 @@ static void test_parallel(int i915, const struct intel_execution_engine2 *e)
>
> static void test_concurrent(int i915, const struct intel_execution_engine2 *e)
> {
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> struct drm_i915_gem_relocation_entry reloc = {
> .target_handle = gem_create(i915, 4096),
> .write_domain = I915_GEM_DOMAIN_RENDER,
> diff --git a/tests/i915/gem_exec_flush.c b/tests/i915/gem_exec_flush.c
> index 7d9fcbfcb..403e498bd 100644
> --- a/tests/i915/gem_exec_flush.c
> +++ b/tests/i915/gem_exec_flush.c
> @@ -78,7 +78,7 @@ static uint32_t movnt(uint32_t *map, int i)
> static void run(int fd, unsigned ring, int nchild, int timeout,
> unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
>
> /* The crux of this testing is whether writes by the GPU are coherent
> * from the CPU.
> @@ -355,7 +355,7 @@ enum batch_mode {
> static void batch(int fd, unsigned ring, int nchild, int timeout,
> enum batch_mode mode, unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
>
> if (mode == BATCH_GTT)
> gem_require_mappable_ggtt(fd);
> diff --git a/tests/i915/gem_exec_gttfill.c b/tests/i915/gem_exec_gttfill.c
> index 7a6d7c0fb..8f2336a30 100644
> --- a/tests/i915/gem_exec_gttfill.c
> +++ b/tests/i915/gem_exec_gttfill.c
> @@ -107,7 +107,7 @@ static void submit(int fd, int gen,
>
> static void fillgtt(int fd, unsigned ring, int timeout)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_execbuffer2 execbuf;
> struct drm_i915_gem_relocation_entry reloc[2];
> volatile uint64_t *shared;
> diff --git a/tests/i915/gem_exec_latency.c b/tests/i915/gem_exec_latency.c
> index 198e54fd2..568d727f2 100644
> --- a/tests/i915/gem_exec_latency.c
> +++ b/tests/i915/gem_exec_latency.c
> @@ -109,7 +109,7 @@ static void latency_on_ring(int fd,
> unsigned ring, const char *name,
> unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const int has_64bit_reloc = gen >= 8;
> struct drm_i915_gem_exec_object2 obj[3];
> struct drm_i915_gem_relocation_entry reloc;
> @@ -258,7 +258,7 @@ static void latency_from_ring(int fd,
> unsigned ring, const char *name,
> unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const int has_64bit_reloc = gen >= 8;
> struct drm_i915_gem_exec_object2 obj[3];
> struct drm_i915_gem_relocation_entry reloc;
> diff --git a/tests/i915/gem_exec_nop.c b/tests/i915/gem_exec_nop.c
> index 21a937c83..62554ecb2 100644
> --- a/tests/i915/gem_exec_nop.c
> +++ b/tests/i915/gem_exec_nop.c
> @@ -104,7 +104,7 @@ static double nop_on_ring(int fd, uint32_t handle,
> static void poll_ring(int fd, const struct intel_execution_engine2 *e,
> int timeout)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const uint32_t MI_ARB_CHK = 0x5 << 23;
> struct drm_i915_gem_execbuffer2 execbuf;
> struct drm_i915_gem_exec_object2 obj;
> @@ -214,7 +214,7 @@ static void poll_ring(int fd, const struct intel_execution_engine2 *e,
>
> static void poll_sequential(int fd, const char *name, int timeout)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const struct intel_execution_engine2 *e;
> const uint32_t MI_ARB_CHK = 0x5 << 23;
> struct drm_i915_gem_execbuffer2 execbuf;
> diff --git a/tests/i915/gem_exec_parallel.c b/tests/i915/gem_exec_parallel.c
> index bf94b93d4..cb8488f3b 100644
> --- a/tests/i915/gem_exec_parallel.c
> +++ b/tests/i915/gem_exec_parallel.c
> @@ -166,7 +166,7 @@ static void check_bo(int fd, uint32_t handle, int pass, struct thread *threads)
>
> static void all(int fd, struct intel_execution_engine2 *engine, unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> pthread_mutex_t mutex;
> pthread_cond_t cond;
> struct thread *threads;
> diff --git a/tests/i915/gem_exec_params.c b/tests/i915/gem_exec_params.c
> index f8a940740..e0bbea94b 100644
> --- a/tests/i915/gem_exec_params.c
> +++ b/tests/i915/gem_exec_params.c
> @@ -91,7 +91,7 @@ static bool has_resource_streamer(int fd)
>
> static void test_batch_first(int fd)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_execbuffer2 execbuf;
> struct drm_i915_gem_exec_object2 obj[3];
> struct drm_i915_gem_relocation_entry reloc[2];
> diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c
> index d50a8b694..a86d22029 100644
> --- a/tests/i915/gem_exec_reloc.c
> +++ b/tests/i915/gem_exec_reloc.c
> @@ -64,7 +64,7 @@ static void write_dword(int fd,
> uint64_t target_offset,
> uint32_t value)
> {
> - int gen = intel_gen(intel_get_drm_devid(fd));
> + unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_execbuffer2 execbuf;
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> @@ -266,7 +266,7 @@ static void check_bo(int fd, uint32_t handle)
>
> static void active(int fd, unsigned engine)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -1081,7 +1081,7 @@ static void parallel(int i915)
> static uint64_t concurrent_relocs(int i915, int idx, int count)
> {
> struct drm_i915_gem_relocation_entry *reloc;
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> unsigned long sz;
> int offset;
>
> @@ -1180,7 +1180,7 @@ static void concurrent_child(int i915,
>
> static uint32_t create_concurrent_batch(int i915, unsigned int count)
> {
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> size_t sz = ALIGN(4 * (1 + 4 * count), 4096);
> uint32_t handle = gem_create(i915, sz);
> uint32_t *map, *cs;
> diff --git a/tests/i915/gem_exec_schedule.c b/tests/i915/gem_exec_schedule.c
> index 488d93511..72277e57f 100644
> --- a/tests/i915/gem_exec_schedule.c
> +++ b/tests/i915/gem_exec_schedule.c
> @@ -94,7 +94,7 @@ static uint32_t __store_dword(int fd, uint32_t ctx, unsigned ring,
> uint32_t target, uint32_t offset, uint32_t value,
> uint32_t cork, int fence, unsigned write_domain)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[3];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -1062,7 +1062,7 @@ static void semaphore_resolve(int i915)
>
> static void semaphore_noskip(int i915)
> {
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> const struct intel_execution_engine2 *outer, *inner;
> uint32_t ctx;
>
> @@ -1695,7 +1695,7 @@ static void deep(int fd, unsigned ring)
>
> /* Create a deep dependency chain, with a few branches */
> for (n = 0; n < nreq && igt_seconds_elapsed(&tv) < 2; n++) {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[3];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 eb = {
> @@ -1848,7 +1848,7 @@ static void wide(int fd, unsigned ring)
> static void reorder_wide(int fd, unsigned ring)
> {
> const unsigned int ring_size = gem_submission_measure(fd, ring);
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const int priorities[] = { MIN_PRIO, MAX_PRIO };
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_exec_object2 obj[2];
> diff --git a/tests/i915/gem_exec_store.c b/tests/i915/gem_exec_store.c
> index 272ab9cd8..771ee1690 100644
> --- a/tests/i915/gem_exec_store.c
> +++ b/tests/i915/gem_exec_store.c
> @@ -38,7 +38,7 @@
>
> static void store_dword(int fd, const struct intel_execution_engine2 *e)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -96,7 +96,7 @@ static void store_dword(int fd, const struct intel_execution_engine2 *e)
> static void store_cachelines(int fd, const struct intel_execution_engine2 *e,
> unsigned int flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 *obj;
> struct drm_i915_gem_relocation_entry *reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -172,7 +172,7 @@ static void store_cachelines(int fd, const struct intel_execution_engine2 *e,
>
> static void store_all(int fd)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct intel_execution_engine2 *engine;
> struct drm_i915_gem_relocation_entry *reloc;
> diff --git a/tests/i915/gem_exec_suspend.c b/tests/i915/gem_exec_suspend.c
> index d768db911..6886bccd4 100644
> --- a/tests/i915/gem_exec_suspend.c
> +++ b/tests/i915/gem_exec_suspend.c
> @@ -89,7 +89,7 @@ static bool has_semaphores(int fd)
>
> static void run_test(int fd, unsigned engine, unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> diff --git a/tests/i915/gem_exec_whisper.c b/tests/i915/gem_exec_whisper.c
> index 1fded7618..9acf6c306 100644
> --- a/tests/i915/gem_exec_whisper.c
> +++ b/tests/i915/gem_exec_whisper.c
> @@ -168,7 +168,7 @@ static void ctx_set_random_priority(int fd, uint32_t ctx)
> static void whisper(int fd, unsigned engine, unsigned flags)
> {
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 batches[QLEN];
> struct drm_i915_gem_relocation_entry inter[QLEN];
> struct drm_i915_gem_relocation_entry reloc;
> diff --git a/tests/i915/gem_render_copy.c b/tests/i915/gem_render_copy.c
> index 1e1e79b95..2da9837aa 100644
> --- a/tests/i915/gem_render_copy.c
> +++ b/tests/i915/gem_render_copy.c
> @@ -131,7 +131,7 @@ static void scratch_buf_write_to_png(data_t *data, struct igt_buf *buf,
> static void *linear_copy_ccs(data_t *data, struct igt_buf *buf)
> {
> void *ccs_data, *linear;
> - int gen = intel_gen(data->devid);
> + unsigned int gen = intel_gen(data->devid);
> int ccs_size = igt_buf_intel_ccs_width(gen, buf) *
> igt_buf_intel_ccs_height(gen, buf);
>
> @@ -154,7 +154,7 @@ static void scratch_buf_ccs_write_to_png(data_t *data,
> cairo_surface_t *surface;
> cairo_status_t ret;
> void *linear;
> - int gen = intel_gen(data->devid);
> + unsigned int gen = intel_gen(data->devid);
> unsigned int ccs_width = igt_buf_intel_ccs_width(gen, buf);
> unsigned int ccs_height = igt_buf_intel_ccs_height(gen, buf);
>
> @@ -348,7 +348,7 @@ scratch_buf_check_all(data_t *data,
> static void scratch_buf_ccs_check(data_t *data,
> struct igt_buf *buf)
> {
> - int gen = intel_gen(data->devid);
> + unsigned int gen = intel_gen(data->devid);
> int ccs_size = igt_buf_intel_ccs_width(gen, buf) *
> igt_buf_intel_ccs_height(gen, buf);
> uint8_t *linear;
> diff --git a/tests/i915/gem_ringfill.c b/tests/i915/gem_ringfill.c
> index 3e24ccf18..c499cb0dd 100644
> --- a/tests/i915/gem_ringfill.c
> +++ b/tests/i915/gem_ringfill.c
> @@ -99,7 +99,7 @@ static void setup_execbuf(int fd,
> struct drm_i915_gem_relocation_entry *reloc,
> unsigned int ring)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> uint32_t *batch, *b;
> int i;
> diff --git a/tests/i915/gem_softpin.c b/tests/i915/gem_softpin.c
> index 202abdd88..fcaf8ef30 100644
> --- a/tests/i915/gem_softpin.c
> +++ b/tests/i915/gem_softpin.c
> @@ -265,7 +265,7 @@ static void test_reverse(int i915)
>
> static uint64_t busy_batch(int fd)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + unsigned const int gen = intel_gen(intel_get_drm_devid(fd));
> const int has_64bit_reloc = gen >= 8;
> struct drm_i915_gem_execbuffer2 execbuf;
> struct drm_i915_gem_exec_object2 object[2];
> @@ -452,7 +452,7 @@ static void xchg_offset(void *array, unsigned i, unsigned j)
> enum sleep { NOSLEEP, SUSPEND, HIBERNATE };
> static void test_noreloc(int fd, enum sleep sleep, unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + unsigned const int gen = intel_gen(intel_get_drm_devid(fd));
> const uint32_t size = 4096;
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> struct drm_i915_gem_execbuffer2 execbuf;
> diff --git a/tests/i915/gem_sync.c b/tests/i915/gem_sync.c
> index b317a3927..a82bda924 100644
> --- a/tests/i915/gem_sync.c
> +++ b/tests/i915/gem_sync.c
> @@ -491,7 +491,7 @@ active_wakeup_ring(int fd, unsigned ring, int timeout, int wlen)
> static void
> store_ring(int fd, unsigned ring, int num_children, int timeout)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct intel_engine_data ied;
>
> ied = list_store_engines(fd, ring);
> @@ -587,7 +587,7 @@ store_ring(int fd, unsigned ring, int num_children, int timeout)
> static void
> switch_ring(int fd, unsigned ring, int num_children, int timeout)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct intel_engine_data ied;
>
> gem_require_contexts(fd);
> @@ -766,7 +766,7 @@ static void *waiter(void *arg)
> static void
> __store_many(int fd, unsigned ring, int timeout, unsigned long *cycles)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> struct drm_i915_gem_exec_object2 object[2];
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -971,7 +971,7 @@ sync_all(int fd, int num_children, int timeout)
> static void
> store_all(int fd, int num_children, int timeout)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct intel_engine_data ied;
>
> ied = list_store_engines(fd, ALL_ENGINES);
> diff --git a/tests/i915/gem_tiled_fence_blits.c b/tests/i915/gem_tiled_fence_blits.c
> index 99ec78f9b..0a633d91b 100644
> --- a/tests/i915/gem_tiled_fence_blits.c
> +++ b/tests/i915/gem_tiled_fence_blits.c
> @@ -88,7 +88,7 @@ static void check_bo(int fd, uint32_t handle, uint32_t start_val)
> static uint32_t
> create_batch(int fd, struct drm_i915_gem_relocation_entry *reloc)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const bool has_64b_reloc = gen >= 8;
> uint32_t *batch;
> uint32_t handle;
> diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c
> index 268423dcd..3ae022016 100644
> --- a/tests/i915/gem_userptr_blits.c
> +++ b/tests/i915/gem_userptr_blits.c
> @@ -300,7 +300,7 @@ blit(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo)
> static void store_dword(int fd, uint32_t target,
> uint32_t offset, uint32_t value)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -1125,7 +1125,7 @@ static void store_dword_rand(int i915, unsigned int engine,
> uint32_t target, uint64_t sz,
> int count)
> {
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> struct drm_i915_gem_relocation_entry *reloc;
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_execbuffer2 exec;
> diff --git a/tests/i915/gem_vm_create.c b/tests/i915/gem_vm_create.c
> index e8af68f19..8843b1b3b 100644
> --- a/tests/i915/gem_vm_create.c
> +++ b/tests/i915/gem_vm_create.c
> @@ -250,7 +250,7 @@ static void execbuf(int i915)
> static void
> write_to_address(int fd, uint32_t ctx, uint64_t addr, uint32_t value)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 batch = {
> .handle = gem_create(fd, 4096)
> };
> diff --git a/tests/i915/i915_module_load.c b/tests/i915/i915_module_load.c
> index 77aaac5c6..aa998b992 100644
> --- a/tests/i915/i915_module_load.c
> +++ b/tests/i915/i915_module_load.c
> @@ -40,7 +40,7 @@
>
> static void store_dword(int fd, unsigned ring)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -102,7 +102,7 @@ static void store_dword(int fd, unsigned ring)
>
> static void store_all(int fd)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc[32];
> struct drm_i915_gem_execbuffer2 execbuf;
> diff --git a/tests/i915/i915_pm_rc6_residency.c b/tests/i915/i915_pm_rc6_residency.c
> index 6fdc607e3..d484121e7 100644
> --- a/tests/i915/i915_pm_rc6_residency.c
> +++ b/tests/i915/i915_pm_rc6_residency.c
> @@ -361,7 +361,7 @@ static void rc6_idle(int i915)
> {
> const int64_t duration_ns = SLEEP_DURATION * (int64_t)NSEC_PER_SEC;
> const int tolerance = 20; /* Some RC6 is better than none! */
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> struct {
> const char *name;
> unsigned int flags;
> @@ -452,7 +452,7 @@ static void rc6_fence(int i915)
> {
> const int64_t duration_ns = SLEEP_DURATION * (int64_t)NSEC_PER_SEC;
> const int tolerance = 20; /* Some RC6 is better than none! */
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> const struct intel_execution_engine2 *e;
> struct power_sample sample[2];
> unsigned long slept;
> diff --git a/tests/i915/sysfs_timeslice_duration.c b/tests/i915/sysfs_timeslice_duration.c
> index 2b1e52c80..b5b6ded78 100644
> --- a/tests/i915/sysfs_timeslice_duration.c
> +++ b/tests/i915/sysfs_timeslice_duration.c
> @@ -186,7 +186,7 @@ static uint64_t __test_duration(int i915, int engine, unsigned int timeout)
> .buffer_count = ARRAY_SIZE(obj),
> .buffers_ptr = to_user_pointer(obj),
> };
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> double duration = clockrate(i915);
> unsigned int class, inst, mmio;
> uint32_t *cs, *map;
> --
> 2.28.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [igt-dev] [Intel-gfx] [PATCH i-g-t] tests/i915: Treat gen as unsigned for forward compatibility
@ 2020-08-19 13:36 ` Lukasz Fiedorowicz
0 siblings, 0 replies; 6+ messages in thread
From: Lukasz Fiedorowicz @ 2020-08-19 13:36 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: igt-dev, Chris Wilson
Chris Wilson <chris@chris-wilson.co.uk> writes:
> We want to recognise future devices (gen = -1u) and treat them as an
> extension of the latest known device, which is typically true.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
CI failures looked to be unrelated to those changes so
Acked-by: Lukasz Fiedorowicz <lukasz.fiedorowicz@intel.com>
> ---
> tests/i915/gem_bad_reloc.c | 2 +-
> tests/i915/gem_ctx_create.c | 2 +-
> tests/i915/gem_ctx_engines.c | 2 +-
> tests/i915/gem_ctx_isolation.c | 2 +-
> tests/i915/gem_ctx_shared.c | 4 ++--
> tests/i915/gem_ctx_thrash.c | 2 +-
> tests/i915/gem_exec_async.c | 2 +-
> tests/i915/gem_exec_await.c | 2 +-
> tests/i915/gem_exec_capture.c | 4 ++--
> tests/i915/gem_exec_fence.c | 10 +++++-----
> tests/i915/gem_exec_flush.c | 4 ++--
> tests/i915/gem_exec_gttfill.c | 2 +-
> tests/i915/gem_exec_latency.c | 4 ++--
> tests/i915/gem_exec_nop.c | 4 ++--
> tests/i915/gem_exec_parallel.c | 2 +-
> tests/i915/gem_exec_params.c | 2 +-
> tests/i915/gem_exec_reloc.c | 8 ++++----
> tests/i915/gem_exec_schedule.c | 8 ++++----
> tests/i915/gem_exec_store.c | 6 +++---
> tests/i915/gem_exec_suspend.c | 2 +-
> tests/i915/gem_exec_whisper.c | 2 +-
> tests/i915/gem_render_copy.c | 6 +++---
> tests/i915/gem_ringfill.c | 2 +-
> tests/i915/gem_softpin.c | 4 ++--
> tests/i915/gem_sync.c | 8 ++++----
> tests/i915/gem_tiled_fence_blits.c | 2 +-
> tests/i915/gem_userptr_blits.c | 4 ++--
> tests/i915/gem_vm_create.c | 2 +-
> tests/i915/i915_module_load.c | 4 ++--
> tests/i915/i915_pm_rc6_residency.c | 4 ++--
> tests/i915/sysfs_timeslice_duration.c | 2 +-
> 31 files changed, 57 insertions(+), 57 deletions(-)
>
> diff --git a/tests/i915/gem_bad_reloc.c b/tests/i915/gem_bad_reloc.c
> index 7eb7fa538..6acc1724f 100644
> --- a/tests/i915/gem_bad_reloc.c
> +++ b/tests/i915/gem_bad_reloc.c
> @@ -113,7 +113,7 @@ static void negative_reloc(int fd, unsigned flags)
>
> static void negative_reloc_blt(int fd)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_execbuffer2 execbuf;
> struct drm_i915_gem_exec_object2 obj[1024][2];
> struct drm_i915_gem_relocation_entry reloc;
> diff --git a/tests/i915/gem_ctx_create.c b/tests/i915/gem_ctx_create.c
> index 39305f026..c7295f705 100644
> --- a/tests/i915/gem_ctx_create.c
> +++ b/tests/i915/gem_ctx_create.c
> @@ -419,7 +419,7 @@ static void basic_ext_param(int i915)
> static void check_single_timeline(int i915, uint32_t ctx, int num_engines)
> {
> #define RCS_TIMESTAMP (0x2000 + 0x358)
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> const int has_64bit_reloc = gen >= 8;
> struct drm_i915_gem_exec_object2 results = { .handle = gem_create(i915, 4096) };
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> diff --git a/tests/i915/gem_ctx_engines.c b/tests/i915/gem_ctx_engines.c
> index e6def511b..7d4abdb5c 100644
> --- a/tests/i915/gem_ctx_engines.c
> +++ b/tests/i915/gem_ctx_engines.c
> @@ -482,7 +482,7 @@ static uint32_t read_result(int timeline, uint32_t *map, int idx)
> static void independent(int i915)
> {
> #define RCS_TIMESTAMP (0x2000 + 0x358)
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> const int has_64bit_reloc = gen >= 8;
> I915_DEFINE_CONTEXT_PARAM_ENGINES(engines , I915_EXEC_RING_MASK + 1);
> struct drm_i915_gem_context_param param = {
> diff --git a/tests/i915/gem_ctx_isolation.c b/tests/i915/gem_ctx_isolation.c
> index 9fdf78bb8..58a35b487 100644
> --- a/tests/i915/gem_ctx_isolation.c
> +++ b/tests/i915/gem_ctx_isolation.c
> @@ -501,7 +501,7 @@ static void dump_regs(int fd,
> const struct intel_execution_engine2 *e,
> unsigned int regs)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const unsigned int gen_bit = 1 << gen;
> const unsigned int engine_bit = ENGINE(e->class, e->instance);
> const uint32_t mmio_base = gem_engine_mmio_base(fd, e->name);
> diff --git a/tests/i915/gem_ctx_shared.c b/tests/i915/gem_ctx_shared.c
> index 55678d96f..616462d79 100644
> --- a/tests/i915/gem_ctx_shared.c
> +++ b/tests/i915/gem_ctx_shared.c
> @@ -186,7 +186,7 @@ static void exhaust_shared_gtt(int i915, unsigned int flags)
>
> static void exec_shared_gtt(int i915, unsigned int ring)
> {
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> struct drm_i915_gem_exec_object2 obj = {};
> struct drm_i915_gem_execbuffer2 execbuf = {
> @@ -436,7 +436,7 @@ static void store_dword(int i915, uint32_t ctx, unsigned ring,
> uint32_t target, uint32_t offset, uint32_t value,
> uint32_t cork, unsigned write_domain)
> {
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> struct drm_i915_gem_exec_object2 obj[3];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> diff --git a/tests/i915/gem_ctx_thrash.c b/tests/i915/gem_ctx_thrash.c
> index dc7259c18..d32619d5d 100644
> --- a/tests/i915/gem_ctx_thrash.c
> +++ b/tests/i915/gem_ctx_thrash.c
> @@ -46,7 +46,7 @@ static void xchg_int(void *array, unsigned i, unsigned j)
>
> static unsigned context_size(int fd)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
>
> switch (gen) {
> case 0:
> diff --git a/tests/i915/gem_exec_async.c b/tests/i915/gem_exec_async.c
> index 035e78377..9f2c80f05 100644
> --- a/tests/i915/gem_exec_async.c
> +++ b/tests/i915/gem_exec_async.c
> @@ -29,7 +29,7 @@ IGT_TEST_DESCRIPTION("Check that we can issue concurrent writes across the engin
> static void store_dword(int fd, unsigned ring,
> uint32_t target, uint32_t offset, uint32_t value)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> diff --git a/tests/i915/gem_exec_await.c b/tests/i915/gem_exec_await.c
> index 6bc624e4a..70fda968e 100644
> --- a/tests/i915/gem_exec_await.c
> +++ b/tests/i915/gem_exec_await.c
> @@ -59,7 +59,7 @@ static void wide(int fd, int ring_size, int timeout, unsigned int flags)
> {
> const struct intel_execution_engine2 *engine;
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct {
> struct drm_i915_gem_exec_object2 *obj;
> struct drm_i915_gem_exec_object2 exec[2];
> diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c
> index 1a53d2fb7..d250c8166 100644
> --- a/tests/i915/gem_exec_capture.c
> +++ b/tests/i915/gem_exec_capture.c
> @@ -61,7 +61,7 @@ static void check_error_state(int dir, struct drm_i915_gem_exec_object2 *obj)
>
> static void __capture1(int fd, int dir, unsigned ring, uint32_t target)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[4];
> #define SCRATCH 0
> #define CAPTURE 1
> @@ -196,7 +196,7 @@ static struct offset {
> unsigned int flags)
> #define INCREMENTAL 0x1
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 *obj;
> struct drm_i915_gem_relocation_entry reloc[2];
> struct drm_i915_gem_execbuffer2 execbuf;
> diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c
> index c9b95fe64..0992314d3 100644
> --- a/tests/i915/gem_exec_fence.c
> +++ b/tests/i915/gem_exec_fence.c
> @@ -61,7 +61,7 @@ static void store(int fd, const struct intel_execution_engine2 *e,
> {
> const int SCRATCH = 0;
> const int BATCH = 1;
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -122,7 +122,7 @@ static bool fence_busy(int fence)
> static void test_fence_busy(int fd, const struct intel_execution_engine2 *e,
> unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj;
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -218,7 +218,7 @@ static void test_fence_busy(int fd, const struct intel_execution_engine2 *e,
> static void test_fence_busy_all(int fd, unsigned flags)
> {
> const struct intel_execution_engine2 *e;
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj;
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -598,7 +598,7 @@ static int __execbuf(int fd, struct drm_i915_gem_execbuffer2 *execbuf)
> static void test_parallel(int i915, const struct intel_execution_engine2 *e)
> {
> const struct intel_execution_engine2 *e2;
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> uint32_t scratch = gem_create(i915, 4096);
> uint32_t *out = gem_mmap__wc(i915, scratch, 0, 4096, PROT_READ);
> uint32_t handle[I915_EXEC_RING_MASK];
> @@ -704,7 +704,7 @@ static void test_parallel(int i915, const struct intel_execution_engine2 *e)
>
> static void test_concurrent(int i915, const struct intel_execution_engine2 *e)
> {
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> struct drm_i915_gem_relocation_entry reloc = {
> .target_handle = gem_create(i915, 4096),
> .write_domain = I915_GEM_DOMAIN_RENDER,
> diff --git a/tests/i915/gem_exec_flush.c b/tests/i915/gem_exec_flush.c
> index 7d9fcbfcb..403e498bd 100644
> --- a/tests/i915/gem_exec_flush.c
> +++ b/tests/i915/gem_exec_flush.c
> @@ -78,7 +78,7 @@ static uint32_t movnt(uint32_t *map, int i)
> static void run(int fd, unsigned ring, int nchild, int timeout,
> unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
>
> /* The crux of this testing is whether writes by the GPU are coherent
> * from the CPU.
> @@ -355,7 +355,7 @@ enum batch_mode {
> static void batch(int fd, unsigned ring, int nchild, int timeout,
> enum batch_mode mode, unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
>
> if (mode == BATCH_GTT)
> gem_require_mappable_ggtt(fd);
> diff --git a/tests/i915/gem_exec_gttfill.c b/tests/i915/gem_exec_gttfill.c
> index 7a6d7c0fb..8f2336a30 100644
> --- a/tests/i915/gem_exec_gttfill.c
> +++ b/tests/i915/gem_exec_gttfill.c
> @@ -107,7 +107,7 @@ static void submit(int fd, int gen,
>
> static void fillgtt(int fd, unsigned ring, int timeout)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_execbuffer2 execbuf;
> struct drm_i915_gem_relocation_entry reloc[2];
> volatile uint64_t *shared;
> diff --git a/tests/i915/gem_exec_latency.c b/tests/i915/gem_exec_latency.c
> index 198e54fd2..568d727f2 100644
> --- a/tests/i915/gem_exec_latency.c
> +++ b/tests/i915/gem_exec_latency.c
> @@ -109,7 +109,7 @@ static void latency_on_ring(int fd,
> unsigned ring, const char *name,
> unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const int has_64bit_reloc = gen >= 8;
> struct drm_i915_gem_exec_object2 obj[3];
> struct drm_i915_gem_relocation_entry reloc;
> @@ -258,7 +258,7 @@ static void latency_from_ring(int fd,
> unsigned ring, const char *name,
> unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const int has_64bit_reloc = gen >= 8;
> struct drm_i915_gem_exec_object2 obj[3];
> struct drm_i915_gem_relocation_entry reloc;
> diff --git a/tests/i915/gem_exec_nop.c b/tests/i915/gem_exec_nop.c
> index 21a937c83..62554ecb2 100644
> --- a/tests/i915/gem_exec_nop.c
> +++ b/tests/i915/gem_exec_nop.c
> @@ -104,7 +104,7 @@ static double nop_on_ring(int fd, uint32_t handle,
> static void poll_ring(int fd, const struct intel_execution_engine2 *e,
> int timeout)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const uint32_t MI_ARB_CHK = 0x5 << 23;
> struct drm_i915_gem_execbuffer2 execbuf;
> struct drm_i915_gem_exec_object2 obj;
> @@ -214,7 +214,7 @@ static void poll_ring(int fd, const struct intel_execution_engine2 *e,
>
> static void poll_sequential(int fd, const char *name, int timeout)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const struct intel_execution_engine2 *e;
> const uint32_t MI_ARB_CHK = 0x5 << 23;
> struct drm_i915_gem_execbuffer2 execbuf;
> diff --git a/tests/i915/gem_exec_parallel.c b/tests/i915/gem_exec_parallel.c
> index bf94b93d4..cb8488f3b 100644
> --- a/tests/i915/gem_exec_parallel.c
> +++ b/tests/i915/gem_exec_parallel.c
> @@ -166,7 +166,7 @@ static void check_bo(int fd, uint32_t handle, int pass, struct thread *threads)
>
> static void all(int fd, struct intel_execution_engine2 *engine, unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> pthread_mutex_t mutex;
> pthread_cond_t cond;
> struct thread *threads;
> diff --git a/tests/i915/gem_exec_params.c b/tests/i915/gem_exec_params.c
> index f8a940740..e0bbea94b 100644
> --- a/tests/i915/gem_exec_params.c
> +++ b/tests/i915/gem_exec_params.c
> @@ -91,7 +91,7 @@ static bool has_resource_streamer(int fd)
>
> static void test_batch_first(int fd)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_execbuffer2 execbuf;
> struct drm_i915_gem_exec_object2 obj[3];
> struct drm_i915_gem_relocation_entry reloc[2];
> diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c
> index d50a8b694..a86d22029 100644
> --- a/tests/i915/gem_exec_reloc.c
> +++ b/tests/i915/gem_exec_reloc.c
> @@ -64,7 +64,7 @@ static void write_dword(int fd,
> uint64_t target_offset,
> uint32_t value)
> {
> - int gen = intel_gen(intel_get_drm_devid(fd));
> + unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_execbuffer2 execbuf;
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> @@ -266,7 +266,7 @@ static void check_bo(int fd, uint32_t handle)
>
> static void active(int fd, unsigned engine)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -1081,7 +1081,7 @@ static void parallel(int i915)
> static uint64_t concurrent_relocs(int i915, int idx, int count)
> {
> struct drm_i915_gem_relocation_entry *reloc;
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> unsigned long sz;
> int offset;
>
> @@ -1180,7 +1180,7 @@ static void concurrent_child(int i915,
>
> static uint32_t create_concurrent_batch(int i915, unsigned int count)
> {
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> size_t sz = ALIGN(4 * (1 + 4 * count), 4096);
> uint32_t handle = gem_create(i915, sz);
> uint32_t *map, *cs;
> diff --git a/tests/i915/gem_exec_schedule.c b/tests/i915/gem_exec_schedule.c
> index 488d93511..72277e57f 100644
> --- a/tests/i915/gem_exec_schedule.c
> +++ b/tests/i915/gem_exec_schedule.c
> @@ -94,7 +94,7 @@ static uint32_t __store_dword(int fd, uint32_t ctx, unsigned ring,
> uint32_t target, uint32_t offset, uint32_t value,
> uint32_t cork, int fence, unsigned write_domain)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[3];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -1062,7 +1062,7 @@ static void semaphore_resolve(int i915)
>
> static void semaphore_noskip(int i915)
> {
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> const struct intel_execution_engine2 *outer, *inner;
> uint32_t ctx;
>
> @@ -1695,7 +1695,7 @@ static void deep(int fd, unsigned ring)
>
> /* Create a deep dependency chain, with a few branches */
> for (n = 0; n < nreq && igt_seconds_elapsed(&tv) < 2; n++) {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[3];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 eb = {
> @@ -1848,7 +1848,7 @@ static void wide(int fd, unsigned ring)
> static void reorder_wide(int fd, unsigned ring)
> {
> const unsigned int ring_size = gem_submission_measure(fd, ring);
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const int priorities[] = { MIN_PRIO, MAX_PRIO };
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_exec_object2 obj[2];
> diff --git a/tests/i915/gem_exec_store.c b/tests/i915/gem_exec_store.c
> index 272ab9cd8..771ee1690 100644
> --- a/tests/i915/gem_exec_store.c
> +++ b/tests/i915/gem_exec_store.c
> @@ -38,7 +38,7 @@
>
> static void store_dword(int fd, const struct intel_execution_engine2 *e)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -96,7 +96,7 @@ static void store_dword(int fd, const struct intel_execution_engine2 *e)
> static void store_cachelines(int fd, const struct intel_execution_engine2 *e,
> unsigned int flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 *obj;
> struct drm_i915_gem_relocation_entry *reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -172,7 +172,7 @@ static void store_cachelines(int fd, const struct intel_execution_engine2 *e,
>
> static void store_all(int fd)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct intel_execution_engine2 *engine;
> struct drm_i915_gem_relocation_entry *reloc;
> diff --git a/tests/i915/gem_exec_suspend.c b/tests/i915/gem_exec_suspend.c
> index d768db911..6886bccd4 100644
> --- a/tests/i915/gem_exec_suspend.c
> +++ b/tests/i915/gem_exec_suspend.c
> @@ -89,7 +89,7 @@ static bool has_semaphores(int fd)
>
> static void run_test(int fd, unsigned engine, unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> diff --git a/tests/i915/gem_exec_whisper.c b/tests/i915/gem_exec_whisper.c
> index 1fded7618..9acf6c306 100644
> --- a/tests/i915/gem_exec_whisper.c
> +++ b/tests/i915/gem_exec_whisper.c
> @@ -168,7 +168,7 @@ static void ctx_set_random_priority(int fd, uint32_t ctx)
> static void whisper(int fd, unsigned engine, unsigned flags)
> {
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 batches[QLEN];
> struct drm_i915_gem_relocation_entry inter[QLEN];
> struct drm_i915_gem_relocation_entry reloc;
> diff --git a/tests/i915/gem_render_copy.c b/tests/i915/gem_render_copy.c
> index 1e1e79b95..2da9837aa 100644
> --- a/tests/i915/gem_render_copy.c
> +++ b/tests/i915/gem_render_copy.c
> @@ -131,7 +131,7 @@ static void scratch_buf_write_to_png(data_t *data, struct igt_buf *buf,
> static void *linear_copy_ccs(data_t *data, struct igt_buf *buf)
> {
> void *ccs_data, *linear;
> - int gen = intel_gen(data->devid);
> + unsigned int gen = intel_gen(data->devid);
> int ccs_size = igt_buf_intel_ccs_width(gen, buf) *
> igt_buf_intel_ccs_height(gen, buf);
>
> @@ -154,7 +154,7 @@ static void scratch_buf_ccs_write_to_png(data_t *data,
> cairo_surface_t *surface;
> cairo_status_t ret;
> void *linear;
> - int gen = intel_gen(data->devid);
> + unsigned int gen = intel_gen(data->devid);
> unsigned int ccs_width = igt_buf_intel_ccs_width(gen, buf);
> unsigned int ccs_height = igt_buf_intel_ccs_height(gen, buf);
>
> @@ -348,7 +348,7 @@ scratch_buf_check_all(data_t *data,
> static void scratch_buf_ccs_check(data_t *data,
> struct igt_buf *buf)
> {
> - int gen = intel_gen(data->devid);
> + unsigned int gen = intel_gen(data->devid);
> int ccs_size = igt_buf_intel_ccs_width(gen, buf) *
> igt_buf_intel_ccs_height(gen, buf);
> uint8_t *linear;
> diff --git a/tests/i915/gem_ringfill.c b/tests/i915/gem_ringfill.c
> index 3e24ccf18..c499cb0dd 100644
> --- a/tests/i915/gem_ringfill.c
> +++ b/tests/i915/gem_ringfill.c
> @@ -99,7 +99,7 @@ static void setup_execbuf(int fd,
> struct drm_i915_gem_relocation_entry *reloc,
> unsigned int ring)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> uint32_t *batch, *b;
> int i;
> diff --git a/tests/i915/gem_softpin.c b/tests/i915/gem_softpin.c
> index 202abdd88..fcaf8ef30 100644
> --- a/tests/i915/gem_softpin.c
> +++ b/tests/i915/gem_softpin.c
> @@ -265,7 +265,7 @@ static void test_reverse(int i915)
>
> static uint64_t busy_batch(int fd)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + unsigned const int gen = intel_gen(intel_get_drm_devid(fd));
> const int has_64bit_reloc = gen >= 8;
> struct drm_i915_gem_execbuffer2 execbuf;
> struct drm_i915_gem_exec_object2 object[2];
> @@ -452,7 +452,7 @@ static void xchg_offset(void *array, unsigned i, unsigned j)
> enum sleep { NOSLEEP, SUSPEND, HIBERNATE };
> static void test_noreloc(int fd, enum sleep sleep, unsigned flags)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + unsigned const int gen = intel_gen(intel_get_drm_devid(fd));
> const uint32_t size = 4096;
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> struct drm_i915_gem_execbuffer2 execbuf;
> diff --git a/tests/i915/gem_sync.c b/tests/i915/gem_sync.c
> index b317a3927..a82bda924 100644
> --- a/tests/i915/gem_sync.c
> +++ b/tests/i915/gem_sync.c
> @@ -491,7 +491,7 @@ active_wakeup_ring(int fd, unsigned ring, int timeout, int wlen)
> static void
> store_ring(int fd, unsigned ring, int num_children, int timeout)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct intel_engine_data ied;
>
> ied = list_store_engines(fd, ring);
> @@ -587,7 +587,7 @@ store_ring(int fd, unsigned ring, int num_children, int timeout)
> static void
> switch_ring(int fd, unsigned ring, int num_children, int timeout)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct intel_engine_data ied;
>
> gem_require_contexts(fd);
> @@ -766,7 +766,7 @@ static void *waiter(void *arg)
> static void
> __store_many(int fd, unsigned ring, int timeout, unsigned long *cycles)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const uint32_t bbe = MI_BATCH_BUFFER_END;
> struct drm_i915_gem_exec_object2 object[2];
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -971,7 +971,7 @@ sync_all(int fd, int num_children, int timeout)
> static void
> store_all(int fd, int num_children, int timeout)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct intel_engine_data ied;
>
> ied = list_store_engines(fd, ALL_ENGINES);
> diff --git a/tests/i915/gem_tiled_fence_blits.c b/tests/i915/gem_tiled_fence_blits.c
> index 99ec78f9b..0a633d91b 100644
> --- a/tests/i915/gem_tiled_fence_blits.c
> +++ b/tests/i915/gem_tiled_fence_blits.c
> @@ -88,7 +88,7 @@ static void check_bo(int fd, uint32_t handle, uint32_t start_val)
> static uint32_t
> create_batch(int fd, struct drm_i915_gem_relocation_entry *reloc)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> const bool has_64b_reloc = gen >= 8;
> uint32_t *batch;
> uint32_t handle;
> diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c
> index 268423dcd..3ae022016 100644
> --- a/tests/i915/gem_userptr_blits.c
> +++ b/tests/i915/gem_userptr_blits.c
> @@ -300,7 +300,7 @@ blit(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo)
> static void store_dword(int fd, uint32_t target,
> uint32_t offset, uint32_t value)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -1125,7 +1125,7 @@ static void store_dword_rand(int i915, unsigned int engine,
> uint32_t target, uint64_t sz,
> int count)
> {
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> struct drm_i915_gem_relocation_entry *reloc;
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_execbuffer2 exec;
> diff --git a/tests/i915/gem_vm_create.c b/tests/i915/gem_vm_create.c
> index e8af68f19..8843b1b3b 100644
> --- a/tests/i915/gem_vm_create.c
> +++ b/tests/i915/gem_vm_create.c
> @@ -250,7 +250,7 @@ static void execbuf(int i915)
> static void
> write_to_address(int fd, uint32_t ctx, uint64_t addr, uint32_t value)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 batch = {
> .handle = gem_create(fd, 4096)
> };
> diff --git a/tests/i915/i915_module_load.c b/tests/i915/i915_module_load.c
> index 77aaac5c6..aa998b992 100644
> --- a/tests/i915/i915_module_load.c
> +++ b/tests/i915/i915_module_load.c
> @@ -40,7 +40,7 @@
>
> static void store_dword(int fd, unsigned ring)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc;
> struct drm_i915_gem_execbuffer2 execbuf;
> @@ -102,7 +102,7 @@ static void store_dword(int fd, unsigned ring)
>
> static void store_all(int fd)
> {
> - const int gen = intel_gen(intel_get_drm_devid(fd));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> struct drm_i915_gem_exec_object2 obj[2];
> struct drm_i915_gem_relocation_entry reloc[32];
> struct drm_i915_gem_execbuffer2 execbuf;
> diff --git a/tests/i915/i915_pm_rc6_residency.c b/tests/i915/i915_pm_rc6_residency.c
> index 6fdc607e3..d484121e7 100644
> --- a/tests/i915/i915_pm_rc6_residency.c
> +++ b/tests/i915/i915_pm_rc6_residency.c
> @@ -361,7 +361,7 @@ static void rc6_idle(int i915)
> {
> const int64_t duration_ns = SLEEP_DURATION * (int64_t)NSEC_PER_SEC;
> const int tolerance = 20; /* Some RC6 is better than none! */
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> struct {
> const char *name;
> unsigned int flags;
> @@ -452,7 +452,7 @@ static void rc6_fence(int i915)
> {
> const int64_t duration_ns = SLEEP_DURATION * (int64_t)NSEC_PER_SEC;
> const int tolerance = 20; /* Some RC6 is better than none! */
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> const struct intel_execution_engine2 *e;
> struct power_sample sample[2];
> unsigned long slept;
> diff --git a/tests/i915/sysfs_timeslice_duration.c b/tests/i915/sysfs_timeslice_duration.c
> index 2b1e52c80..b5b6ded78 100644
> --- a/tests/i915/sysfs_timeslice_duration.c
> +++ b/tests/i915/sysfs_timeslice_duration.c
> @@ -186,7 +186,7 @@ static uint64_t __test_duration(int i915, int engine, unsigned int timeout)
> .buffer_count = ARRAY_SIZE(obj),
> .buffers_ptr = to_user_pointer(obj),
> };
> - const int gen = intel_gen(intel_get_drm_devid(i915));
> + const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
> double duration = clockrate(i915);
> unsigned int class, inst, mmio;
> uint32_t *cs, *map;
> --
> 2.28.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-08-19 13:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-06 15:28 [Intel-gfx] [PATCH i-g-t] tests/i915: Treat gen as unsigned for forward compatibility Chris Wilson
2020-08-06 15:28 ` [igt-dev] " Chris Wilson
2020-08-06 16:58 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2020-08-06 23:39 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2020-08-19 13:36 ` [Intel-gfx] [PATCH i-g-t] " Lukasz Fiedorowicz
2020-08-19 13:36 ` [igt-dev] " Lukasz Fiedorowicz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.