From: Ben Widawsky <benjamin.widawsky@intel.com>
Date: Wed, 9 Oct 2013 02:47:53 +0000 (-0700)
Subject: pwrite_pread: Get devid only once
X-Git-Tag: intel-gpu-tools-1.5~117
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=40599b077972e1a721fdfcc93455e60b5b564a13;p=profile%2Fextras%2Fintel-gpu-tools.git

pwrite_pread: Get devid only once

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---

diff --git a/tests/gem_pwrite_pread.c b/tests/gem_pwrite_pread.c
index 78532c2..bda35a0 100644
--- a/tests/gem_pwrite_pread.c
+++ b/tests/gem_pwrite_pread.c
@@ -51,6 +51,8 @@
 #define BLT_SRC_TILED		(1<<15)
 #define BLT_DST_TILED		(1<<11)
 
+uint32_t devid;
+
 static inline void build_batch(uint32_t *batch, int len, uint32_t *batch_len)
 {
 	unsigned int i = 0;
@@ -88,7 +90,7 @@ static void copy(int fd, uint32_t src, uint32_t dst, void *buf, int len, int loo
 		(uintptr_t)exec, 3,
 		0, 0,
 		0, 0, 0, 0,
-		HAS_BLT_RING(intel_get_drm_devid(fd)) ? I915_EXEC_BLT : 0,
+		HAS_BLT_RING(devid) ? I915_EXEC_BLT : 0,
 	};
 
 	build_batch(batch, len, &execbuf.batch_len);
@@ -121,7 +123,7 @@ static void as_gtt_mmap(int fd, uint32_t src, uint32_t dst, void *buf, int len,
 		(uintptr_t)exec, 3,
 		0, GPP_BATCH_SIZE,
 		0, 0, 0, 0,
-		HAS_BLT_RING(intel_get_drm_devid(fd)) ? I915_EXEC_BLT : 0,
+		HAS_BLT_RING(devid) ? I915_EXEC_BLT : 0,
 	};
 	uint32_t *src_ptr, *dst_ptr;
 
@@ -166,7 +168,7 @@ static void as_cpu_mmap(int fd, uint32_t src, uint32_t dst, void *buf, int len,
 		(uintptr_t)exec, 3,
 		0, GPP_BATCH_SIZE,
 		0, 0, 0, 0,
-		HAS_BLT_RING(intel_get_drm_devid(fd)) ? I915_EXEC_BLT : 0,
+		HAS_BLT_RING(devid) ? I915_EXEC_BLT : 0,
 	};
 	uint32_t *src_ptr, *dst_ptr;
 
@@ -210,7 +212,7 @@ static void test_copy(int fd, uint32_t src, uint32_t dst, uint32_t *buf, int len
 		(uintptr_t)exec, 3,
 		0, GPP_BATCH_SIZE,
 		0, 0, 0, 0,
-		HAS_BLT_RING(intel_get_drm_devid(fd)) ? I915_EXEC_BLT : 0,
+		HAS_BLT_RING(devid) ? I915_EXEC_BLT : 0,
 	};
 	int i;
 
@@ -250,7 +252,7 @@ static void test_as_gtt_mmap(int fd, uint32_t src, uint32_t dst, int len)
 		(uintptr_t)exec, 3,
 		0, GPP_BATCH_SIZE,
 		0, 0, 0, 0,
-		HAS_BLT_RING(intel_get_drm_devid(fd)) ? I915_EXEC_BLT : 0,
+		HAS_BLT_RING(devid) ? I915_EXEC_BLT : 0,
 	};
 	uint32_t *src_ptr, *dst_ptr;
 	int i;
@@ -294,7 +296,7 @@ static void test_as_cpu_mmap(int fd, uint32_t src, uint32_t dst, int len)
 		(uintptr_t)exec, 3,
 		0, GPP_BATCH_SIZE,
 		0, 0, 0, 0,
-		HAS_BLT_RING(intel_get_drm_devid(fd)) ? I915_EXEC_BLT : 0,
+		HAS_BLT_RING(devid) ? I915_EXEC_BLT : 0,
 	};
 	uint32_t *src_ptr, *dst_ptr;
 	int i;
@@ -376,6 +378,8 @@ int main(int argc, char **argv)
 		gem_set_caching(fd, dst, 0);
 	}
 
+	devid = intel_get_drm_devid(fd);
+
 	igt_subtest("uncached-copy-correctness")
 		test_copy(fd, src, dst, tmp, object_size);
 	igt_subtest("uncached-copy-performance") {