[igt-dev] [PATCH i-g-t v2 3/4] tests/i915_pm_sseu: remove libdrm dependency

Zbigniew Kempczyński
2020-06-04T10:10:35Z

Remove all "localized" functions in media spin and libdrm usage
in the test.

Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
lib/media_spin.c | 469 +++++---------------------------------
lib/media_spin.h | 8 +-
tests/i915/i915_pm_sseu.c | 73 +++---
3 files changed, 98 insertions(+), 452 deletions(-)

diff --git a/lib/media_spin.c b/lib/media_spin.c
index d3d0c278..6e81a13d 100644
--- a/lib/media_spin.c
+++ b/lib/media_spin.c
@@ -24,15 +24,13 @@
* Jeff McGee <jeff.mcgee@intel.com>
*/

-#include <intel_bufmgr.h>
#include <i915_drm.h>
#include "intel_reg.h"
#include "drmtest.h"
#include "intel_batchbuffer.h"
#include "intel_chipset.h"
-#include "gen7_media.h"
-#include "gen8_media.h"
#include "media_spin.h"
+#include "gpu_cmds.h"

static const uint32_t spin_kernel[][4] = {
{ 0x00600001, 0x20800208, 0x008d0000, 0x00000000 }, /* mov (8)r4.0<1>:ud r0.0<8;8;1>:ud */
@@ -67,6 +65,7 @@ static const uint32_t spin_kernel[][4] = {
*
*/

+#define PAGE_SIZE 4096
#define BATCH_STATE_SPLIT 2048
/* VFE STATE params */
#define THREADS 0
@@ -80,455 +79,113 @@ static const uint32_t spin_kernel[][4] = {
#define xoffset 0
#define yoffset 0

-static void
-gen7_render_flush(struct intel_batchbuffer *batch, uint32_t batch_end)
-{
- int ret;
-
- ret = drm_intel_bo_subdata(batch->bo, 0, 4096, batch->buffer);
- if (ret == 0)
- ret = drm_intel_bo_mrb_exec(batch->bo, batch_end,
- NULL, 0, 0, 0);
- igt_assert(ret == 0);
-}
-
static uint32_t
-gen7_fill_kernel(struct intel_batchbuffer *batch,
- const uint32_t kernel[][4], size_t size)
-{
- uint32_t offset;
-
- offset = intel_batchbuffer_copy_data(batch, kernel, size, 64);
-
- return offset;
-}
-
-static uint32_t
-gen7_fill_surface_state(struct intel_batchbuffer *batch,
- const struct igt_buf *buf,
- uint32_t format,
- int is_dst)
-{
- struct gen7_surface_state *ss;
- uint32_t write_domain, read_domain, offset;
- int ret;
-
- if (is_dst) {
- write_domain = read_domain = I915_GEM_DOMAIN_RENDER;
- } else {
- write_domain = 0;
- read_domain = I915_GEM_DOMAIN_SAMPLER;
- }
-
- ss = intel_batchbuffer_subdata_alloc(batch, sizeof(*ss), 64);
- offset = intel_batchbuffer_subdata_offset(batch, ss);
-
- ss->ss0.surface_type = SURFACE_2D;
- ss->ss0.surface_format = format;
- ss->ss0.render_cache_read_write = 1;
-
- if (buf->tiling == I915_TILING_X)
- ss->ss0.tiled_mode = 2;
- else if (buf->tiling == I915_TILING_Y)
- ss->ss0.tiled_mode = 3;
-
- ss->ss1.base_addr = buf->bo->offset;
- ret = drm_intel_bo_emit_reloc(batch->bo,
- intel_batchbuffer_subdata_offset(batch, ss) + 4,
- buf->bo, 0,
- read_domain, write_domain);
- igt_assert(ret == 0);
-
- ss->ss2.height = igt_buf_height(buf) - 1;
- ss->ss2.width = igt_buf_width(buf) - 1;
-
- ss->ss3.pitch = buf->surface[0].stride - 1;
-
- ss->ss7.shader_chanel_select_r = 4;
- ss->ss7.shader_chanel_select_g = 5;
- ss->ss7.shader_chanel_select_b = 6;
- ss->ss7.shader_chanel_select_a = 7;
-
- return offset;
-}
-
-static uint32_t
-gen8_fill_surface_state(struct intel_batchbuffer *batch,
- const struct igt_buf *buf,
- uint32_t format,
- int is_dst)
-{
- struct gen8_surface_state *ss;
- uint32_t write_domain, read_domain, offset;
- int ret;
-
- if (is_dst) {
- write_domain = read_domain = I915_GEM_DOMAIN_RENDER;
- } else {
- write_domain = 0;
- read_domain = I915_GEM_DOMAIN_SAMPLER;
- }
-
- ss = intel_batchbuffer_subdata_alloc(batch, sizeof(*ss), 64);
- offset = intel_batchbuffer_subdata_offset(batch, ss);
-
- ss->ss0.surface_type = SURFACE_2D;
- ss->ss0.surface_format = format;
- ss->ss0.render_cache_read_write = 1;
- ss->ss0.vertical_alignment = 1; /* align 4 */
- ss->ss0.horizontal_alignment = 1; /* align 4 */
-
- if (buf->tiling == I915_TILING_X)
- ss->ss0.tiled_mode = 2;
- else if (buf->tiling == I915_TILING_Y)
- ss->ss0.tiled_mode = 3;
-
- ss->ss8.base_addr = buf->bo->offset;
-
- ret = drm_intel_bo_emit_reloc(batch->bo,
- intel_batchbuffer_subdata_offset(batch, ss) + 8 * 4,
- buf->bo, 0, read_domain, write_domain);
- igt_assert(ret == 0);
-
- ss->ss2.height = igt_buf_height(buf) - 1;
- ss->ss2.width = igt_buf_width(buf) - 1;
- ss->ss3.pitch = buf->surface[0].stride - 1;
-
- ss->ss7.shader_chanel_select_r = 4;
- ss->ss7.shader_chanel_select_g = 5;
- ss->ss7.shader_chanel_select_b = 6;
- ss->ss7.shader_chanel_select_a = 7;
-
- return offset;
-}
-
-static uint32_t
-gen8_spin_curbe_buffer_data(struct intel_batchbuffer *batch,
- uint32_t iters)
+gen8_spin_curbe_buffer_data(struct intel_bb *ibb, uint32_t iters)
{
uint32_t *curbe_buffer;
uint32_t offset;

- curbe_buffer = intel_batchbuffer_subdata_alloc(batch, 64, 64);
- offset = intel_batchbuffer_subdata_offset(batch, curbe_buffer);
- *curbe_buffer = iters;
-
- return offset;
-}
-
-static uint32_t
-gen7_fill_binding_table(struct intel_batchbuffer *batch,
- const struct igt_buf *dst)
-{
- uint32_t *binding_table, offset;
-
- binding_table = intel_batchbuffer_subdata_alloc(batch, 32, 64);
- offset = intel_batchbuffer_subdata_offset(batch, binding_table);
- if (IS_GEN7(batch->devid))
- binding_table[0] = gen7_fill_surface_state(batch, dst,
- SURFACEFORMAT_R8_UNORM, 1);
- else
- binding_table[0] = gen8_fill_surface_state(batch, dst,
- SURFACEFORMAT_R8_UNORM, 1);
-
- return offset;
-}
-
-static uint32_t
-gen8_fill_interface_descriptor(struct intel_batchbuffer *batch,
- const struct igt_buf *dst,
- const uint32_t kernel[][4],
- size_t size)
-{
- struct gen8_interface_descriptor_data *idd;
- uint32_t offset;
- uint32_t binding_table_offset, kernel_offset;
-
- binding_table_offset = gen7_fill_binding_table(batch, dst);
- kernel_offset = gen7_fill_kernel(batch, kernel, size);
-
- idd = intel_batchbuffer_subdata_alloc(batch, sizeof(*idd), 64);
- offset = intel_batchbuffer_subdata_offset(batch, idd);
+ intel_bb_ptr_align(ibb, 64);
+ curbe_buffer = intel_bb_ptr(ibb);
+ offset = intel_bb_offset(ibb);

- idd->desc0.kernel_start_pointer = (kernel_offset >> 6);
-
- idd->desc2.single_program_flow = 1;
- idd->desc2.floating_point_mode = GEN8_FLOATING_POINT_IEEE_754;
-
- idd->desc3.sampler_count = 0; /* 0 samplers used */
- idd->desc3.sampler_state_pointer = 0;
-
- idd->desc4.binding_table_entry_count = 0;
- idd->desc4.binding_table_pointer = (binding_table_offset >> 5);
-
- idd->desc5.constant_urb_entry_read_offset = 0;
- idd->desc5.constant_urb_entry_read_length = 1; /* grf 1 */
-
- idd->desc6.num_threads_in_tg = 1;
+ *curbe_buffer = iters;
+ intel_bb_ptr_add(ibb, 64);

return offset;
}

-static void
-gen8_emit_state_base_address(struct intel_batchbuffer *batch)
-{
- OUT_BATCH(GEN8_STATE_BASE_ADDRESS | (16 - 2));
-
- /* general */
- OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
- OUT_BATCH(0);
-
- /* stateless data port */
- OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
-
- /* surface */
- OUT_RELOC(batch->bo, I915_GEM_DOMAIN_SAMPLER, 0, BASE_ADDRESS_MODIFY);
-
- /* dynamic */
- OUT_RELOC(batch->bo,
- I915_GEM_DOMAIN_RENDER | I915_GEM_DOMAIN_INSTRUCTION,
- 0, BASE_ADDRESS_MODIFY);
-
- /* indirect */
- OUT_BATCH(0);
- OUT_BATCH(0);
-
- /* instruction */
- OUT_RELOC(batch->bo, I915_GEM_DOMAIN_INSTRUCTION, 0,
- BASE_ADDRESS_MODIFY);
-
- /* general state buffer size */
- OUT_BATCH(0xfffff000 | 1);
- /* dynamic state buffer size */
- OUT_BATCH(1 << 12 | 1);
- /* indirect object buffer size */
- OUT_BATCH(0xfffff000 | 1);
- /* instruction buffer size, must set modify enable bit, otherwise it may
- * result in GPU hang
- */
- OUT_BATCH(1 << 12 | 1);
-}
-
-static void
-gen8_emit_vfe_state(struct intel_batchbuffer *batch, uint32_t threads,
- uint32_t urb_entries, uint32_t urb_size,
- uint32_t curbe_size)
-{
- OUT_BATCH(GEN7_MEDIA_VFE_STATE | (9 - 2));
-
- /* scratch buffer */
- OUT_BATCH(0);
- OUT_BATCH(0);
-
- /* number of threads & urb entries */
- OUT_BATCH(threads << 16 |
- urb_entries << 8);
-
- OUT_BATCH(0);
-
- /* urb entry size & curbe size */
- OUT_BATCH(urb_size << 16 |
- curbe_size);
-
- /* scoreboard */
- OUT_BATCH(0);
- OUT_BATCH(0);
- OUT_BATCH(0);
-}
-
-static void
-gen7_emit_curbe_load(struct intel_batchbuffer *batch, uint32_t curbe_buffer)
-{
- OUT_BATCH(GEN7_MEDIA_CURBE_LOAD | (4 - 2));
- OUT_BATCH(0);
- /* curbe total data length */
- OUT_BATCH(64);
- /* curbe data start address, is relative to the dynamics base address */
- OUT_BATCH(curbe_buffer);
-}
-
-static void
-gen7_emit_interface_descriptor_load(struct intel_batchbuffer *batch,
- uint32_t interface_descriptor)
-{
- OUT_BATCH(GEN7_MEDIA_INTERFACE_DESCRIPTOR_LOAD | (4 - 2));
- OUT_BATCH(0);
- /* interface descriptor data length */
- if (IS_GEN7(batch->devid))
- OUT_BATCH(sizeof(struct gen7_interface_descriptor_data));
- else
- OUT_BATCH(sizeof(struct gen8_interface_descriptor_data));
- /* interface descriptor address, is relative to the dynamics base
- * address
- */
- OUT_BATCH(interface_descriptor);
-}
-
-static void
-gen8_emit_media_state_flush(struct intel_batchbuffer *batch)
-{
- OUT_BATCH(GEN8_MEDIA_STATE_FLUSH | (2 - 2));
- OUT_BATCH(0);
-}
-
-static void
-gen_emit_media_object(struct intel_batchbuffer *batch,
- unsigned int xoff, unsigned int yoff)
-{
- OUT_BATCH(GEN7_MEDIA_OBJECT | (8 - 2));
-
- /* interface descriptor offset */
- OUT_BATCH(0);
-
- /* without indirect data */
- OUT_BATCH(0);
- OUT_BATCH(0);
-
- /* scoreboard */
- OUT_BATCH(0);
- OUT_BATCH(0);
-
- /* inline data (xoffset, yoffset) */
- OUT_BATCH(xoff);
- OUT_BATCH(yoff);
- if (AT_LEAST_GEN(batch->devid, 8) && !IS_CHERRYVIEW(batch->devid))
- gen8_emit_media_state_flush(batch);
-}
-
-static void
-gen9_emit_state_base_address(struct intel_batchbuffer *batch)
-{
- OUT_BATCH(GEN8_STATE_BASE_ADDRESS | (19 - 2));
-
- /* general */
- OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
- OUT_BATCH(0);
-
- /* stateless data port */
- OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
-
- /* surface */
- OUT_RELOC(batch->bo, I915_GEM_DOMAIN_SAMPLER, 0, BASE_ADDRESS_MODIFY);
-
- /* dynamic */
- OUT_RELOC(batch->bo,
- I915_GEM_DOMAIN_RENDER | I915_GEM_DOMAIN_INSTRUCTION,
- 0, BASE_ADDRESS_MODIFY);
-
- /* indirect */
- OUT_BATCH(0);
- OUT_BATCH(0);
-
- /* instruction */
- OUT_RELOC(batch->bo, I915_GEM_DOMAIN_INSTRUCTION, 0,
- BASE_ADDRESS_MODIFY);
-
- /* general state buffer size */
- OUT_BATCH(0xfffff000 | 1);
- /* dynamic state buffer size */
- OUT_BATCH(1 << 12 | 1);
- /* indirect object buffer size */
- OUT_BATCH(0xfffff000 | 1);
- /* intruction buffer size, must set modify enable bit, otherwise it may
- * result in GPU hang
- */
- OUT_BATCH(1 << 12 | 1);
-
- /* Bindless surface state base address */
- OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
- OUT_BATCH(0);
- OUT_BATCH(0xfffff000);
-}
-
void
-gen8_media_spinfunc(struct intel_batchbuffer *batch,
- const struct igt_buf *dst, uint32_t spins)
+gen8_media_spinfunc(int i915, struct intel_buf *buf, uint32_t spins)
{
+ struct intel_bb *ibb;
uint32_t curbe_buffer, interface_descriptor;
- uint32_t batch_end;

- intel_batchbuffer_flush_with_context(batch, NULL);
+ ibb = intel_bb_create(i915, PAGE_SIZE);
+ intel_bb_add_object(ibb, buf->handle, 0, true);

/* setup states */
- batch->ptr = &batch->buffer[BATCH_STATE_SPLIT];
+ intel_bb_ptr_set(ibb, BATCH_STATE_SPLIT);

- curbe_buffer = gen8_spin_curbe_buffer_data(batch, spins);
- interface_descriptor = gen8_fill_interface_descriptor(batch, dst,
+ curbe_buffer = gen8_spin_curbe_buffer_data(ibb, spins);
+ interface_descriptor = gen8_fill_interface_descriptor(ibb, buf,
spin_kernel, sizeof(spin_kernel));
- igt_assert(batch->ptr < &batch->buffer[4095]);
+
+ intel_bb_ptr_set(ibb, 0);

/* media pipeline */
- batch->ptr = batch->buffer;
- OUT_BATCH(GEN8_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
- gen8_emit_state_base_address(batch);
+ intel_bb_out(ibb, GEN8_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
+ gen8_emit_state_base_address(ibb);

- gen8_emit_vfe_state(batch, THREADS, MEDIA_URB_ENTRIES,
+ gen8_emit_vfe_state(ibb, THREADS, MEDIA_URB_ENTRIES,
MEDIA_URB_SIZE, MEDIA_CURBE_SIZE);

- gen7_emit_curbe_load(batch, curbe_buffer);
+ gen7_emit_curbe_load(ibb, curbe_buffer);

- gen7_emit_interface_descriptor_load(batch, interface_descriptor);
+ gen7_emit_interface_descriptor_load(ibb, interface_descriptor);

- gen_emit_media_object(batch, xoffset, yoffset);
+ gen_emit_media_object(ibb, xoffset, yoffset);

- OUT_BATCH(MI_BATCH_BUFFER_END);
+ intel_bb_out(ibb, MI_BATCH_BUFFER_END);
+ intel_bb_ptr_align(ibb, 32);

- batch_end = intel_batchbuffer_align(batch, 8);
- igt_assert(batch_end < BATCH_STATE_SPLIT);
+ intel_bb_exec(ibb, intel_bb_offset(ibb),
+ I915_EXEC_DEFAULT | I915_EXEC_NO_RELOC, false);

- gen7_render_flush(batch, batch_end);
- intel_batchbuffer_reset(batch);
+ intel_bb_object_offset_to_buf(ibb, buf);
+ intel_bb_destroy(ibb);
}

-
void
-gen9_media_spinfunc(struct intel_batchbuffer *batch,
- const struct igt_buf *dst, uint32_t spins)
+gen9_media_spinfunc(int i915, struct intel_buf *buf, uint32_t spins)
{
+ struct intel_bb *ibb;
uint32_t curbe_buffer, interface_descriptor;
- uint32_t batch_end;

- intel_batchbuffer_flush_with_context(batch, NULL);
+ ibb = intel_bb_create(i915, PAGE_SIZE);
+ intel_bb_add_object(ibb, buf->handle, 0, true);

/* setup states */
- batch->ptr = &batch->buffer[BATCH_STATE_SPLIT];
+ intel_bb_ptr_set(ibb, BATCH_STATE_SPLIT);

- curbe_buffer = gen8_spin_curbe_buffer_data(batch, spins);
- interface_descriptor = gen8_fill_interface_descriptor(batch, dst,
+ curbe_buffer = gen8_spin_curbe_buffer_data(ibb, spins);
+ interface_descriptor = gen8_fill_interface_descriptor(ibb, buf,
spin_kernel, sizeof(spin_kernel));
- igt_assert(batch->ptr < &batch->buffer[4095]);
+
+ intel_bb_ptr_set(ibb, 0);

/* 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,
+ intel_bb_out(ibb, 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(ibb);
+
+ gen8_emit_vfe_state(ibb, THREADS, MEDIA_URB_ENTRIES,
MEDIA_URB_SIZE, MEDIA_CURBE_SIZE);

- gen7_emit_curbe_load(batch, curbe_buffer);
+ gen7_emit_curbe_load(ibb, curbe_buffer);
+
+ gen7_emit_interface_descriptor_load(ibb, interface_descriptor);

- gen7_emit_interface_descriptor_load(batch, interface_descriptor);
+ gen_emit_media_object(ibb, xoffset, yoffset);

- gen_emit_media_object(batch, xoffset, yoffset);
+ intel_bb_out(ibb, 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(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);
+ intel_bb_out(ibb, MI_BATCH_BUFFER_END);

- OUT_BATCH(MI_BATCH_BUFFER_END);
+ intel_bb_ptr_align(ibb, 32);

- batch_end = intel_batchbuffer_align(batch, 8);
- igt_assert(batch_end < BATCH_STATE_SPLIT);
+ intel_bb_exec(ibb, intel_bb_offset(ibb),
+ I915_EXEC_DEFAULT | I915_EXEC_NO_RELOC, false);

- gen7_render_flush(batch, batch_end);
- intel_batchbuffer_reset(batch);
+ intel_bb_object_offset_to_buf(ibb, buf);
+ intel_bb_destroy(ibb);
}
diff --git a/lib/media_spin.h b/lib/media_spin.h
index 768eccc0..5e15e021 100644
--- a/lib/media_spin.h
+++ b/lib/media_spin.h
@@ -27,10 +27,10 @@
#ifndef MEDIA_SPIN_H
#define MEDIA_SPIN_H

-void gen8_media_spinfunc(struct intel_batchbuffer *batch,
- const struct igt_buf *dst, uint32_t spins);
+struct intel_buf;

-void gen9_media_spinfunc(struct intel_batchbuffer *batch,
- const struct igt_buf *dst, uint32_t spins);
+void gen8_media_spinfunc(int i915, struct intel_buf *buf, uint32_t spins);
+
+void gen9_media_spinfunc(int i915, struct intel_buf *buf, uint32_t spins);

#endif /* MEDIA_SPIN_H */
diff --git a/tests/i915/i915_pm_sseu.c b/tests/i915/i915_pm_sseu.c
index 461c70cc..30b7cfec 100644
--- a/tests/i915/i915_pm_sseu.c
+++ b/tests/i915/i915_pm_sseu.c
@@ -34,7 +34,7 @@

#include "i915/gem.h"
#include "igt.h"
-#include "intel_bufmgr.h"
+#include "intel_bufops.h"

IGT_TEST_DESCRIPTION("Tests slice/subslice/EU power gating functionality.\n");

@@ -43,10 +43,10 @@ static struct {
int drm_fd;
int devid;
int gen;
- drm_intel_bufmgr *bufmgr;
- struct intel_batchbuffer *batch;
+
+ struct buf_ops *bops;
+ struct intel_buf buf;
igt_media_spinfunc_t spinfunc;
- struct igt_buf buf;
uint32_t spins_per_msec;
} gem;

@@ -217,6 +217,7 @@ dbg_init(void)
{
igt_assert(gem.init);
dbg.status_fd = igt_debugfs_open(gem.drm_fd, "i915_sseu_status", O_RDONLY);
+
igt_skip_on_f(dbg.status_fd == -1,
"debugfs entry 'i915_sseu_status' not found\n");
dbg.init = 1;
@@ -233,11 +234,8 @@ dbg_deinit(void)
}

static void
-gem_check_spin(uint32_t spins)
+gem_check_spin(uint32_t *data, uint32_t spins)
{
- uint32_t *data;
-
- data = (uint32_t*)gem.buf.bo->virtual;
igt_assert_eq_u32(*data, spins);
}

@@ -246,8 +244,8 @@ gem_get_target_spins(double dt)
{
struct timespec tstart, tdone;
double prev_dt, cur_dt;
- uint32_t spins;
- int i, ret;
+ uint32_t spins, *ptr;
+ int i;

/* Double increments until we bound the target time */
prev_dt = 0.0;
@@ -255,13 +253,18 @@ gem_get_target_spins(double dt)
spins = 1 << i;
clock_gettime(CLOCK_MONOTONIC, &tstart);

- gem.spinfunc(gem.batch, &gem.buf, spins);
- ret = drm_intel_bo_map(gem.buf.bo, 0);
- igt_assert_eq(ret, 0);
+ gem.spinfunc(gem.drm_fd, &gem.buf, spins);
+ gem_set_domain(gem.drm_fd, gem.buf.handle,
+ I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+
+ ptr = gem_mmap__device_coherent(gem.drm_fd, gem.buf.handle,
+ 0, gem.buf.size, PROT_READ);
+
clock_gettime(CLOCK_MONOTONIC, &tdone);

- gem_check_spin(spins);
- drm_intel_bo_unmap(gem.buf.bo);
+ gem_check_spin(ptr, spins);
+
+ munmap(ptr, gem.buf.size);

cur_dt = to_dt(&tstart, &tdone);
if (cur_dt > dt)
@@ -292,25 +295,12 @@ gem_init(void)
gem.spinfunc = igt_get_media_spinfunc(gem.devid);
igt_require(gem.spinfunc);

- gem.bufmgr = drm_intel_bufmgr_gem_init(gem.drm_fd, 4096);
- igt_assert(gem.bufmgr);
+ gem.bops = buf_ops_create(gem.drm_fd);
gem.init = 2;

- drm_intel_bufmgr_gem_enable_reuse(gem.bufmgr);
-
- gem.batch = intel_batchbuffer_alloc(gem.bufmgr, gem.devid);
- igt_assert(gem.batch);
+ intel_buf_init(gem.bops, &gem.buf, 1, 1, 32, 0, I915_TILING_NONE, 0);
gem.init = 3;

- gem.buf.surface[0].stride = sizeof(uint32_t);
- gem.buf.tiling = I915_TILING_NONE;
- gem.buf.surface[0].size = gem.buf.surface[0].stride;
- gem.buf.bo = drm_intel_bo_alloc(gem.bufmgr, "",
- gem.buf.surface[0].size, 4096);
- gem.buf.bpp = 32;
- igt_assert(gem.buf.bo);
- gem.init = 4;
-
gem.spins_per_msec = gem_get_target_spins(100) / 100;
}

@@ -319,13 +309,10 @@ gem_deinit(void)
{
switch (gem.init)
{
- case 4:
- drm_intel_bo_unmap(gem.buf.bo);
- drm_intel_bo_unreference(gem.buf.bo);
case 3:
- intel_batchbuffer_free(gem.batch);
+ intel_buf_close(gem.bops, &gem.buf);
case 2:
- drm_intel_bufmgr_destroy(gem.bufmgr);
+ buf_ops_destroy(gem.bops);
case 1:
close(gem.drm_fd);
}
@@ -354,7 +341,8 @@ full_enable(void)
{
struct status stat;
const int spin_msec = 10;
- int ret, spins;
+ uint32_t *ptr;
+ int spins;

/*
* Gen9 SKL is the first case in which render power gating can leave
@@ -365,16 +353,17 @@ full_enable(void)

spins = spin_msec * gem.spins_per_msec;

- gem.spinfunc(gem.batch, &gem.buf, spins);
+ gem.spinfunc(gem.drm_fd, &gem.buf, spins);

usleep(2000); /* 2ms wait to make sure batch is running */
dbg_get_status(&stat);

- ret = drm_intel_bo_map(gem.buf.bo, 0);
- igt_assert_eq(ret, 0);
-
- gem_check_spin(spins);
- drm_intel_bo_unmap(gem.buf.bo);
+ gem_set_domain(gem.drm_fd, gem.buf.handle,
+ I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+ ptr = gem_mmap__device_coherent(gem.drm_fd, gem.buf.handle,
+ 0, gem.buf.size, PROT_READ);
+ gem_check_spin(ptr, spins);
+ munmap(ptr, gem.buf.size);

check_full_enable(&stat);
}