flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-12 02:16:17 +00:00
Code Issues Releases Wiki Activity

tests/pm_rps: simplify load helper setup

Browse Source 
There's no need to be fancy here.

Cc: Jeff McGee <jeff.mcgee@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-03-14 10:12:55 +01:00
parent 5188bbe23e
commit d4f89d0ff2
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/pm_rps.c
View File

@ -153,7 +153,6 @@ static struct load_helper {
drm_intel_bufmgr *bufmgr; drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch; struct intel_batchbuffer *batch;
drm_intel_bo *target_buffer; drm_intel_bo *target_buffer;
bool ready;
enum load load; enum load load;
bool exit; bool exit;
struct igt_helper_process igt_proc; struct igt_helper_process igt_proc;
@ -218,8 +217,6 @@ static void load_helper_run(enum load load)
return; return;
} }
igt_require(lh.ready == true);
lh.load = load; lh.load = load;
igt_fork_helper(&lh.igt_proc) { igt_fork_helper(&lh.igt_proc) {
@ -253,42 +250,26 @@ static void load_helper_stop(void)
igt_wait_helper(&lh.igt_proc); igt_wait_helper(&lh.igt_proc);
} }
/* The load helper resource is used by only some subtests. We attempt to
* initialize in igt_fixture but do our igt_require check only if a
* subtest attempts to run it */
static void load_helper_init(void) static void load_helper_init(void)
{ {
lh.devid = intel_get_drm_devid(drm_fd); lh.devid = intel_get_drm_devid(drm_fd);
lh.has_ppgtt = gem_uses_aliasing_ppgtt(drm_fd); lh.has_ppgtt = gem_uses_aliasing_ppgtt(drm_fd);
/* MI_STORE_DATA can only use GTT address on gen4+/g33 and needs /* MI_STORE_DATA can only use GTT address on gen4+/g33 and needs
* snoopable mem on pre-gen6. */ * snoopable mem on pre-gen6. Hence load-helper only works on gen6+, but
if (intel_gen(lh.devid) < 6) { * that's also all we care about for the rps testcase*/
igt_debug("load helper init failed: pre-gen6 not supported\n"); igt_assert(intel_gen(lh.devid) >= 6);
return;
}
lh.bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096); lh.bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
if (!lh.bufmgr) { igt_assert(lh.bufmgr);
igt_debug("load helper init failed: buffer manager init\n");
return;
}
drm_intel_bufmgr_gem_enable_reuse(lh.bufmgr); drm_intel_bufmgr_gem_enable_reuse(lh.bufmgr);
lh.batch = intel_batchbuffer_alloc(lh.bufmgr, lh.devid); lh.batch = intel_batchbuffer_alloc(lh.bufmgr, lh.devid);
if (!lh.batch) { igt_assert(lh.batch);
igt_debug("load helper init failed: batch buffer alloc\n");
return;
}
lh.target_buffer = drm_intel_bo_alloc(lh.bufmgr, "target bo", lh.target_buffer = drm_intel_bo_alloc(lh.bufmgr, "target bo",
4096, 4096); 4096, 4096);
if (!lh.target_buffer) { igt_assert(lh.target_buffer);
igt_debug("load helper init failed: target buffer alloc\n");
return;
}
lh.ready = true;
} }
static void load_helper_deinit(void) static void load_helper_deinit(void)