tests/gem_(gpgpu|media)_fill: remove the _v2 suffix

Remove libdrm functions and replace them with new ones after removing
_v2 suffix introduced for transition state.

Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 49 insertions, 218 deletions

diff --git a/lib/media_fill.c b/lib/media_fill.c
index 53d63b4b..c21de54b 100644
--- a/lib/media_fill.c
+++ b/lib/media_fill.c
@@ -145,56 +145,12 @@ static const uint32_t gen12_media_kernel[][4] = {
 #define GEN7_VFE_STATE_MEDIA_MODE 0
 
 void
-gen7_media_fillfunc(struct intel_batchbuffer *batch,
-		    const struct igt_buf *dst,
+gen7_media_fillfunc(int i915,
+		    struct intel_buf *buf,
 		    unsigned int x, unsigned int y,
 		    unsigned int width, unsigned int height,
 		    uint8_t color)
 {
-	uint32_t curbe_buffer, interface_descriptor;
-	uint32_t batch_end;
-
-	intel_batchbuffer_flush(batch);
-
-	/* setup states */
-	batch->ptr = &batch->buffer[BATCH_STATE_SPLIT];
-
-	curbe_buffer = gen7_fill_curbe_buffer_data(batch, color);
-	interface_descriptor = gen7_fill_interface_descriptor(batch, dst,
-					gen7_media_kernel,
-					sizeof(gen7_media_kernel));
-	igt_assert(batch->ptr < &batch->buffer[4095]);
-
-	/* media pipeline */
-	batch->ptr = batch->buffer;
-	OUT_BATCH(GEN7_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
-	gen7_emit_state_base_address(batch);
-
-	gen7_emit_vfe_state(batch, THREADS, MEDIA_URB_ENTRIES, MEDIA_URB_SIZE,
-			    MEDIA_CURBE_SIZE, GEN7_VFE_STATE_MEDIA_MODE);;
-
-	gen7_emit_curbe_load(batch, curbe_buffer);
-
-	gen7_emit_interface_descriptor_load(batch, interface_descriptor);
-
-	gen7_emit_media_objects(batch, x, y, width, height);
-
-	OUT_BATCH(MI_BATCH_BUFFER_END);
-
-	batch_end = intel_batchbuffer_align(batch, 8);
-	igt_assert(batch_end < BATCH_STATE_SPLIT);
-
-	gen7_render_flush(batch, batch_end);
-	intel_batchbuffer_reset(batch);
-}
-
-void
-gen7_media_fillfunc_v2(int i915,
-		       struct intel_buf *buf,
-		       unsigned int x, unsigned int y,
-		       unsigned int width, unsigned int height,
-		       uint8_t color)
-{
 	struct intel_bb *ibb;
 	uint32_t curbe_buffer, interface_descriptor;
 
@@ -203,24 +159,24 @@ gen7_media_fillfunc_v2(int i915,
 
 	intel_bb_ptr_set(ibb, BATCH_STATE_SPLIT);
 
-	curbe_buffer = gen7_fill_curbe_buffer_data_v2(ibb, color);
-	interface_descriptor = gen7_fill_interface_descriptor_v2(ibb, buf,
+	curbe_buffer = gen7_fill_curbe_buffer_data(ibb, color);
+	interface_descriptor = gen7_fill_interface_descriptor(ibb, buf,
 					gen7_media_kernel,
 					sizeof(gen7_media_kernel));
 	intel_bb_ptr_set(ibb, 0);
 
 	/* media pipeline */
 	intel_bb_out(ibb, GEN7_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
-	gen7_emit_state_base_address_v2(ibb);
+	gen7_emit_state_base_address(ibb);
 
-	gen7_emit_vfe_state_v2(ibb, THREADS, MEDIA_URB_ENTRIES, MEDIA_URB_SIZE,
-			       MEDIA_CURBE_SIZE, GEN7_VFE_STATE_MEDIA_MODE);
+	gen7_emit_vfe_state(ibb, THREADS, MEDIA_URB_ENTRIES, MEDIA_URB_SIZE,
+			    MEDIA_CURBE_SIZE, GEN7_VFE_STATE_MEDIA_MODE);
 
-	gen7_emit_curbe_load_v2(ibb, curbe_buffer);
+	gen7_emit_curbe_load(ibb, curbe_buffer);
 
-	gen7_emit_interface_descriptor_load_v2(ibb, interface_descriptor);
+	gen7_emit_interface_descriptor_load(ibb, interface_descriptor);
 
-	gen7_emit_media_objects_v2(ibb, x, y, width, height);
+	gen7_emit_media_objects(ibb, x, y, width, height);
 
 	intel_bb_out(ibb, MI_BATCH_BUFFER_END);
 	intel_bb_ptr_align(ibb, 32);
@@ -232,56 +188,12 @@ gen7_media_fillfunc_v2(int i915,
 }
 
 void
-gen8_media_fillfunc(struct intel_batchbuffer *batch,
-		    const struct igt_buf *dst,
+gen8_media_fillfunc(int i915,
+		    struct intel_buf *buf,
 		    unsigned int x, unsigned int y,
 		    unsigned int width, unsigned int height,
 		    uint8_t color)
 {
-	uint32_t curbe_buffer, interface_descriptor;
-	uint32_t batch_end;
-
-	intel_batchbuffer_flush(batch);
-
-	/* setup states */
-	batch->ptr = &batch->buffer[BATCH_STATE_SPLIT];
-
-	curbe_buffer = gen7_fill_curbe_buffer_data(batch, color);
-	interface_descriptor = gen8_fill_interface_descriptor(batch, dst,
-					gen8_media_kernel,
-					sizeof(gen8_media_kernel));
-	igt_assert(batch->ptr < &batch->buffer[4095]);
-
-	/* media pipeline */
-	batch->ptr = batch->buffer;
-	OUT_BATCH(GEN8_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
-	gen8_emit_state_base_address(batch);
-
-	gen8_emit_vfe_state(batch, THREADS, MEDIA_URB_ENTRIES, MEDIA_URB_SIZE,
-			    MEDIA_CURBE_SIZE);
-
-	gen7_emit_curbe_load(batch, curbe_buffer);
-
-	gen7_emit_interface_descriptor_load(batch, interface_descriptor);
-
-	gen7_emit_media_objects(batch, x, y, width, height);
-
-	OUT_BATCH(MI_BATCH_BUFFER_END);
-
-	batch_end = intel_batchbuffer_align(batch, 8);
-	igt_assert(batch_end < BATCH_STATE_SPLIT);
-
-	gen7_render_flush(batch, batch_end);
-	intel_batchbuffer_reset(batch);
-}
-
-void
-gen8_media_fillfunc_v2(int i915,
-		       struct intel_buf *buf,
-		       unsigned int x, unsigned int y,
-		       unsigned int width, unsigned int height,
-		       uint8_t color)
-{
 	struct intel_bb *ibb;
 	uint32_t curbe_buffer, interface_descriptor;
 
@@ -290,24 +202,24 @@ gen8_media_fillfunc_v2(int i915,
 
 	intel_bb_ptr_set(ibb, BATCH_STATE_SPLIT);
 
-	curbe_buffer = gen7_fill_curbe_buffer_data_v2(ibb, color);
-	interface_descriptor = gen8_fill_interface_descriptor_v2(ibb, buf,
+	curbe_buffer = gen7_fill_curbe_buffer_data(ibb, color);
+	interface_descriptor = gen8_fill_interface_descriptor(ibb, buf,
 					gen8_media_kernel,
 					sizeof(gen8_media_kernel));
 	intel_bb_ptr_set(ibb, 0);
 
 	/* media pipeline */
 	intel_bb_out(ibb, GEN8_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
-	gen8_emit_state_base_address_v2(ibb);
+	gen8_emit_state_base_address(ibb);
 
-	gen8_emit_vfe_state_v2(ibb, THREADS, MEDIA_URB_ENTRIES, MEDIA_URB_SIZE,
-			       MEDIA_CURBE_SIZE);
+	gen8_emit_vfe_state(ibb, THREADS, MEDIA_URB_ENTRIES, MEDIA_URB_SIZE,
+			    MEDIA_CURBE_SIZE);
 
-	gen7_emit_curbe_load_v2(ibb, curbe_buffer);
+	gen7_emit_curbe_load(ibb, curbe_buffer);
 
-	gen7_emit_interface_descriptor_load_v2(ibb, interface_descriptor);
+	gen7_emit_interface_descriptor_load(ibb, interface_descriptor);
 
-	gen7_emit_media_objects_v2(ibb, x, y, width, height);
+	gen7_emit_media_objects(ibb, x, y, width, height);
 
 	intel_bb_out(ibb, MI_BATCH_BUFFER_END);
 	intel_bb_ptr_align(ibb, 32);
@@ -319,81 +231,12 @@ gen8_media_fillfunc_v2(int i915,
 }
 
 static void
-__gen9_media_fillfunc(struct intel_batchbuffer *batch,
-		      const struct igt_buf *dst,
+__gen9_media_fillfunc(int i915,
+		      struct intel_buf *buf,
 		      unsigned int x, unsigned int y,
 		      unsigned int width, unsigned int height,
-		      uint8_t color, const uint32_t kernel[][4],
-		      size_t kernel_size)
-{
-	uint32_t curbe_buffer, interface_descriptor;
-	uint32_t batch_end;
-
-	intel_batchbuffer_flush(batch);
-
-	/* setup states */
-	batch->ptr = &batch->buffer[BATCH_STATE_SPLIT];
-
-	curbe_buffer = gen7_fill_curbe_buffer_data(batch, color);
-	interface_descriptor = gen8_fill_interface_descriptor(batch, dst,
-					kernel, kernel_size);
-	assert(batch->ptr < &batch->buffer[4095]);
-
-	/* media pipeline */
-	batch->ptr = batch->buffer;
-	OUT_BATCH(GEN8_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA |
-		  GEN9_FORCE_MEDIA_AWAKE_ENABLE |
-		  GEN9_SAMPLER_DOP_GATE_DISABLE |
-		  GEN9_PIPELINE_SELECTION_MASK |
-		  GEN9_SAMPLER_DOP_GATE_MASK |
-		  GEN9_FORCE_MEDIA_AWAKE_MASK);
-	gen9_emit_state_base_address(batch);
-
-	gen8_emit_vfe_state(batch, THREADS, MEDIA_URB_ENTRIES, MEDIA_URB_SIZE,
-			    MEDIA_CURBE_SIZE);
-
-	gen7_emit_curbe_load(batch, curbe_buffer);
-
-	gen7_emit_interface_descriptor_load(batch, interface_descriptor);
-
-	gen7_emit_media_objects(batch, x, y, width, height);
-
-	OUT_BATCH(GEN8_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA |
-		  GEN9_FORCE_MEDIA_AWAKE_DISABLE |
-		  GEN9_SAMPLER_DOP_GATE_ENABLE |
-		  GEN9_PIPELINE_SELECTION_MASK |
-		  GEN9_SAMPLER_DOP_GATE_MASK |
-		  GEN9_FORCE_MEDIA_AWAKE_MASK);
-
-	OUT_BATCH(MI_BATCH_BUFFER_END);
-
-	batch_end = intel_batchbuffer_align(batch, 8);
-	assert(batch_end < BATCH_STATE_SPLIT);
-
-	gen7_render_flush(batch, batch_end);
-	intel_batchbuffer_reset(batch);
-}
-
-void
-gen9_media_fillfunc(struct intel_batchbuffer *batch,
-		    const struct igt_buf *dst,
-		    unsigned int x, unsigned int y,
-		    unsigned int width, unsigned int height,
-		    uint8_t color)
-{
-
-	__gen9_media_fillfunc(batch, dst, x, y, width, height, color,
-			      gen8_media_kernel, sizeof(gen8_media_kernel));
-
-}
-
-static void
-__gen9_media_fillfunc_v2(int i915,
-			 struct intel_buf *buf,
-			 unsigned int x, unsigned int y,
-			 unsigned int width, unsigned int height,
-			 uint8_t color,
-			 const uint32_t kernel[][4], size_t kernel_size)
+		      uint8_t color,
+		      const uint32_t kernel[][4], size_t kernel_size)
 {
 	struct intel_bb *ibb;
 	uint32_t curbe_buffer, interface_descriptor;
@@ -404,10 +247,10 @@ __gen9_media_fillfunc_v2(int i915,
 	/* setup states */
 	intel_bb_ptr_set(ibb, BATCH_STATE_SPLIT);
 
-	curbe_buffer = gen7_fill_curbe_buffer_data_v2(ibb, color);
-	interface_descriptor = gen8_fill_interface_descriptor_v2(ibb, buf,
-								 kernel,
-								 kernel_size);
+	curbe_buffer = gen7_fill_curbe_buffer_data(ibb, color);
+	interface_descriptor = gen8_fill_interface_descriptor(ibb, buf,
+							      kernel,
+							      kernel_size);
 	intel_bb_ptr_set(ibb, 0);
 
 	/* media pipeline */
@@ -417,16 +260,16 @@ __gen9_media_fillfunc_v2(int i915,
 		     GEN9_PIPELINE_SELECTION_MASK |
 		     GEN9_SAMPLER_DOP_GATE_MASK |
 		     GEN9_FORCE_MEDIA_AWAKE_MASK);
-	gen9_emit_state_base_address_v2(ibb);
+	gen9_emit_state_base_address(ibb);
 
-	gen8_emit_vfe_state_v2(ibb, THREADS, MEDIA_URB_ENTRIES, MEDIA_URB_SIZE,
-			       MEDIA_CURBE_SIZE);
+	gen8_emit_vfe_state(ibb, THREADS, MEDIA_URB_ENTRIES, MEDIA_URB_SIZE,
+			    MEDIA_CURBE_SIZE);
 
-	gen7_emit_curbe_load_v2(ibb, curbe_buffer);
+	gen7_emit_curbe_load(ibb, curbe_buffer);
 
-	gen7_emit_interface_descriptor_load_v2(ibb, interface_descriptor);
+	gen7_emit_interface_descriptor_load(ibb, interface_descriptor);
 
-	gen7_emit_media_objects_v2(ibb, x, y, width, height);
+	gen7_emit_media_objects(ibb, x, y, width, height);
 
 	intel_bb_out(ibb, GEN8_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA |
 		     GEN9_FORCE_MEDIA_AWAKE_DISABLE |
@@ -445,15 +288,14 @@ __gen9_media_fillfunc_v2(int i915,
 }
 
 void
-gen9_media_fillfunc_v2(int i915,
-		       struct intel_buf *buf,
-		       unsigned int x, unsigned int y,
-		       unsigned int width, unsigned int height,
-		       uint8_t color)
+gen9_media_fillfunc(int i915,
+		    struct intel_buf *buf,
+		    unsigned int x, unsigned int y,
+		    unsigned int width, unsigned int height,
+		    uint8_t color)
 {
-
-	__gen9_media_fillfunc_v2(i915, buf, x, y, width, height, color,
-				 gen8_media_kernel, sizeof(gen8_media_kernel));
+	__gen9_media_fillfunc(i915, buf, x, y, width, height, color,
+			      gen8_media_kernel, sizeof(gen8_media_kernel));
 }
 
 static void
@@ -488,16 +330,16 @@ __gen11_media_vme_func(int i915,
 		     GEN9_PIPELINE_SELECTION_MASK |
 		     GEN9_SAMPLER_DOP_GATE_MASK |
 		     GEN9_FORCE_MEDIA_AWAKE_MASK);
-	gen9_emit_state_base_address_v2(ibb);
+	gen9_emit_state_base_address(ibb);
 
-	gen8_emit_vfe_state_v2(ibb, THREADS, MEDIA_URB_ENTRIES, MEDIA_URB_SIZE,
+	gen8_emit_vfe_state(ibb, THREADS, MEDIA_URB_ENTRIES, MEDIA_URB_SIZE,
 			    MEDIA_CURBE_SIZE);
 
-	gen7_emit_curbe_load_v2(ibb, curbe_buffer);
+	gen7_emit_curbe_load(ibb, curbe_buffer);
 
-	gen7_emit_interface_descriptor_load_v2(ibb, interface_descriptor);
+	gen7_emit_interface_descriptor_load(ibb, interface_descriptor);
 
-	gen7_emit_media_objects_v2(ibb, 0, 0, width, height);
+	gen7_emit_media_objects(ibb, 0, 0, width, height);
 
 	intel_bb_out(ibb, GEN8_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA |
 		     GEN9_FORCE_MEDIA_AWAKE_DISABLE |
@@ -531,23 +373,12 @@ gen11_media_vme_func(int i915,
 }
 
 void
-gen12_media_fillfunc(struct intel_batchbuffer *batch,
-		     const struct igt_buf *dst,
+gen12_media_fillfunc(int i915,
+		     struct intel_buf *buf,
 		     unsigned int x, unsigned int y,
 		     unsigned int width, unsigned int height,
 		     uint8_t color)
 {
-	__gen9_media_fillfunc(batch, dst, x, y, width, height, color,
+	__gen9_media_fillfunc(i915, buf, x, y, width, height, color,
 			      gen12_media_kernel, sizeof(gen12_media_kernel));
 }
-
-void
-gen12_media_fillfunc_v2(int i915,
-			struct intel_buf *buf,
-			unsigned int x, unsigned int y,
-			unsigned int width, unsigned int height,
-			uint8_t color)
-{
-	__gen9_media_fillfunc_v2(i915, buf, x, y, width, height, color,
-				 gen12_media_kernel, sizeof(gen12_media_kernel));
-}