Prepare for 64bit relocation addresses

[platform/upstream/intel-gpu-tools.git] / tests / gem_tiled_partial_pwrite_pread.c

diff --git a/tests/gem_tiled_partial_pwrite_pread.c b/tests/gem_tiled_partial_pwrite_pread.c
index d535e38..a4a9d0b 100644 (file)
--- a/tests/gem_tiled_partial_pwrite_pread.c
+++ b/tests/gem_tiled_partial_pwrite_pread.c
@@ -33,12 +33,14 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include "drm.h"
-#include "i915_drm.h"
+
+#include <drm.h>
+
+#include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_bufmgr.h"
-#include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+#include "intel_io.h"
+#include "igt_aux.h"
 
 /*
  * Testcase: pwrite/pread consistency when touching partial cachelines
@@ -82,11 +84,7 @@ copy_bo(drm_intel_bo *src, int src_tiled,
                cmd_bits |= XY_SRC_COPY_BLT_SRC_TILED;
        }
 
-       BEGIN_BATCH(8);
-       OUT_BATCH(XY_SRC_COPY_BLT_CMD |
-                 XY_SRC_COPY_BLT_WRITE_ALPHA |
-                 XY_SRC_COPY_BLT_WRITE_RGB |
-                 cmd_bits);
+       BLIT_COPY_BATCH_START(devid, cmd_bits);
        OUT_BATCH((3 << 24) | /* 32 bits */
                  (0xcc << 16) | /* copy ROP */
                  dst_pitch);
@@ -131,7 +129,6 @@ static void test_partial_reads(void)
 {
        int i, j;
 
-       printf("checking partial reads\n");
        for (i = 0; i < ROUNDS; i++) {
                int start, len;
                int val = i % 256;
@@ -156,7 +153,6 @@ static void test_partial_writes(void)
 {
        int i, j;
 
-       printf("checking partial writes\n");
        for (i = 0; i < ROUNDS; i++) {
                int start, len;
                int val = i % 256;
@@ -199,7 +195,6 @@ static void test_partial_read_writes(void)
 {
        int i, j;
 
-       printf("checking partial writes after partial reads\n");
        for (i = 0; i < ROUNDS; i++) {
                int start, len;
                int val = i % 256;
@@ -255,11 +250,10 @@ static void test_partial_read_writes(void)
        }
 }
 
-int main(int argc, char **argv)
+igt_main
 {
        uint32_t tiling_mode = I915_TILING_X;
 
-       igt_subtest_init(argc, argv);
        igt_skip_on_simulation();
 
        srandom(0xdeadbeef);
@@ -303,6 +297,4 @@ int main(int argc, char **argv)
 
                close(fd);
        }
-
-       igt_exit();
 }