diff options
| author | ranjeet kumar <ranjeet1.kumar@intel.com> | 2020-04-28 19:01:41 +0530 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-05-11 20:16:27 +0100 |
| commit | 22d0955e019020f9ecda4124707801214e279a0c (patch) | |
| tree | 6f43a7cc405399eb892e905bae59311f9f0ab8ae /benchmarks/gem_latency.c | |
| parent | 5a5a3162a7638b3ae38b6dc2545622c204d1b97c (diff) | |
Macros fixes: Removed unused & redundant macros
Local macros were declared in several files as a prelude to upstream
implementations. Now that we ship include/drm-uapi, we can remove LOCAL
as we upstream.
Cc: Dixit, Ashutosh <ashutosh.dixit@intel.com>
Cc: Tahvanainen Jari <jari.tahvanainen@intel.com>
Signed-off-by: ranjeet kumar <ranjeet1.kumar@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'benchmarks/gem_latency.c')
| -rw-r--r-- | benchmarks/gem_latency.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/benchmarks/gem_latency.c b/benchmarks/gem_latency.c index 7269e22d..e89b5c5a 100644 --- a/benchmarks/gem_latency.c +++ b/benchmarks/gem_latency.c @@ -44,9 +44,6 @@ #include <sys/resource.h> #include "drm.h" -#define LOCAL_I915_EXEC_FENCE_IN (1<<16) -#define LOCAL_I915_EXEC_FENCE_OUT (1<<17) - #define CONTEXT 0x1 #define REALTIME 0x2 #define CMDPARSER 0x4 @@ -140,7 +137,6 @@ struct producer { struct consumer *consumers; }; -#define LOCAL_EXEC_NO_RELOC (1<<11) #define COPY_BLT_CMD (2<<29|0x53<<22|0x6) #define BLT_WRITE_ALPHA (1<<21) #define BLT_WRITE_RGB (1<<20) @@ -226,7 +222,7 @@ static void setup_workload(struct producer *p, int gen, eb->buffer_count = 2; if (flags & CMDPARSER) eb->batch_len = 4096; - eb->flags = I915_EXEC_BLT | LOCAL_EXEC_NO_RELOC; + eb->flags = I915_EXEC_BLT | I915_EXEC_NO_RELOC; eb->rsvd1 = p->ctx; } @@ -272,9 +268,9 @@ static void setup_latency(struct producer *p, int gen, unsigned flags) eb->buffer_count = 1; if (flags & CMDPARSER) eb->batch_len = sizeof(*map) * ((i + 1) & ~1); - eb->flags = I915_EXEC_BLT | LOCAL_EXEC_NO_RELOC; + eb->flags = I915_EXEC_BLT | I915_EXEC_NO_RELOC; if (flags & FENCE_OUT) - eb->flags |= LOCAL_I915_EXEC_FENCE_OUT; + eb->flags |= I915_EXEC_FENCE_OUT; eb->rsvd1 = p->ctx; } @@ -300,7 +296,7 @@ static void setup_nop(struct producer *p, uint32_t batch, unsigned flags) eb->buffer_count = 1; if (flags & CMDPARSER) eb->batch_len = 8; - eb->flags = I915_EXEC_BLT | LOCAL_EXEC_NO_RELOC; + eb->flags = I915_EXEC_BLT | I915_EXEC_NO_RELOC; eb->rsvd1 = p->ctx; } @@ -312,7 +308,7 @@ static void fence_wait(int fence) static void measure_latency(struct producer *p, struct igt_mean *mean) { - if (!(p->latency_dispatch.execbuf.flags & LOCAL_I915_EXEC_FENCE_OUT)) + if (!(p->latency_dispatch.execbuf.flags & I915_EXEC_FENCE_OUT)) gem_sync(fd, p->latency_dispatch.exec[0].handle); else fence_wait(p->latency_dispatch.execbuf.rsvd2 >> 32); @@ -348,7 +344,7 @@ static void *producer(void *arg) /* Finally, execute a batch that just reads the current * TIMESTAMP so we can measure the latency. */ - if (p->latency_dispatch.execbuf.flags & LOCAL_I915_EXEC_FENCE_OUT) + if (p->latency_dispatch.execbuf.flags & I915_EXEC_FENCE_OUT) gem_execbuf_wr(fd, &p->latency_dispatch.execbuf); else gem_execbuf(fd, &p->latency_dispatch.execbuf); @@ -374,7 +370,7 @@ static void *producer(void *arg) p->complete++; - if (p->latency_dispatch.execbuf.flags & LOCAL_I915_EXEC_FENCE_OUT) + if (p->latency_dispatch.execbuf.flags & I915_EXEC_FENCE_OUT) close(p->latency_dispatch.execbuf.rsvd2 >> 32); } |