Prepare for split BLT ring on Sandybridge.

Depends on libdrm 057fab3382c02af54126ce395c43d4e6dce9439a

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31123
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 6 insertions, 8 deletions

diff --git a/tests/gem_pread_after_blit.c b/tests/gem_pread_after_blit.c
index 4ba9a627..c9c8b02c 100644
--- a/tests/gem_pread_after_blit.c
+++ b/tests/gem_pread_after_blit.c
@@ -131,14 +131,12 @@ main(int argc, char **argv)
 	drm_intel_bo *src1, *src2, *bo;
 	uint32_t start1 = 0;
 	uint32_t start2 = 1024 * 1024 / 4;
-	uint32_t devid;
 
 	fd = drm_open_any();
-	devid = intel_get_drm_devid(fd);
 
 	bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
 	drm_intel_bufmgr_gem_enable_reuse(bufmgr);
-	batch = intel_batchbuffer_alloc(bufmgr);
+	batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd));
 
 	src1 = create_bo(start1);
 	src2 = create_bo(start2);
@@ -147,21 +145,21 @@ main(int argc, char **argv)
 
 	/* First, do a full-buffer read after blitting */
 	printf("Large read after blit 1\n");
-	intel_copy_bo(batch, bo, src1, width, height, devid);
+	intel_copy_bo(batch, bo, src1, width, height);
 	verify_large_read(bo, start1);
 	printf("Large read after blit 2\n");
-	intel_copy_bo(batch, bo, src2, width, height, devid);
+	intel_copy_bo(batch, bo, src2, width, height);
 	verify_large_read(bo, start2);
 
 	printf("Small reads after blit 1\n");
-	intel_copy_bo(batch, bo, src1, width, height, devid);
+	intel_copy_bo(batch, bo, src1, width, height);
 	verify_small_read(bo, start1);
 	printf("Small reads after blit 2\n");
-	intel_copy_bo(batch, bo, src2, width, height, devid);
+	intel_copy_bo(batch, bo, src2, width, height);
 	verify_small_read(bo, start2);
 
 	printf("Large read after blit 3\n");
-	intel_copy_bo(batch, bo, src1, width, height, devid);
+	intel_copy_bo(batch, bo, src1, width, height);
 	verify_large_read(bo, start1);
 
 	drm_intel_bo_unreference(src1);