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/kms_fbc_crc: use igt_pipe_crc_collect_crc()

Browse Source 
Instead of its hardcoded implementation.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
This commit is contained in:
Paulo Zanoni 2015-03-24 17:11:05 -03:00
parent 26ff2c7daa
commit 235e87de45
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/kms_fbc_crc.c
View File

@ -213,7 +213,7 @@ static void test_crc(data_t *data, enum test_mode mode)
{ {
uint32_t crtc_id = data->output->config.crtc->crtc_id; uint32_t crtc_id = data->output->config.crtc->crtc_id;
igt_pipe_crc_t *pipe_crc = data->pipe_crc; igt_pipe_crc_t *pipe_crc = data->pipe_crc;
igt_crc_t *crcs = NULL; igt_crc_t crc;
uint32_t handle = data->handle[0]; uint32_t handle = data->handle[0];
igt_assert(fbc_enabled(data)); igt_assert(fbc_enabled(data));
@ -269,14 +269,11 @@ static void test_crc(data_t *data, enum test_mode mode)
igt_wait_for_vblank(data->drm_fd, data->pipe); igt_wait_for_vblank(data->drm_fd, data->pipe);
igt_wait_for_vblank(data->drm_fd, data->pipe); igt_wait_for_vblank(data->drm_fd, data->pipe);
igt_pipe_crc_start(pipe_crc); igt_pipe_crc_collect_crc(pipe_crc, &crc);
igt_pipe_crc_get_crcs(pipe_crc, 1, &crcs);
igt_pipe_crc_stop(pipe_crc);
if (mode == TEST_PAGE_FLIP) if (mode == TEST_PAGE_FLIP)
igt_assert_crc_equal(&crcs[0], &data->ref_crc[1]); igt_assert_crc_equal(&crc, &data->ref_crc[1]);
else else
;/* FIXME: missing reference CRCs */ ;/* FIXME: missing reference CRCs */
free(crcs);
/* /*
* Allow time for FBC to kick in again if it * Allow time for FBC to kick in again if it
@ -284,14 +281,11 @@ static void test_crc(data_t *data, enum test_mode mode)
*/ */
igt_assert(wait_for_fbc_enabled(data)); igt_assert(wait_for_fbc_enabled(data));
igt_pipe_crc_start(pipe_crc); igt_pipe_crc_collect_crc(pipe_crc, &crc);
igt_pipe_crc_get_crcs(pipe_crc, 1, &crcs);
igt_pipe_crc_stop(pipe_crc);
if (mode == TEST_PAGE_FLIP) if (mode == TEST_PAGE_FLIP)
igt_assert_crc_equal(&crcs[0], &data->ref_crc[1]); igt_assert_crc_equal(&crc, &data->ref_crc[1]);
else else
;/* FIXME: missing reference CRCs */ ;/* FIXME: missing reference CRCs */
free(crcs);
} }
static bool prepare_crtc(data_t *data) static bool prepare_crtc(data_t *data)
@ -318,7 +312,6 @@ static bool prepare_test(data_t *data, enum test_mode test_mode)
igt_output_t *output = data->output; igt_output_t *output = data->output;
drmModeModeInfo *mode; drmModeModeInfo *mode;
igt_pipe_crc_t *pipe_crc; igt_pipe_crc_t *pipe_crc;
igt_crc_t *crcs = NULL;
data->primary = igt_output_get_plane(data->output, IGT_PLANE_PRIMARY); data->primary = igt_output_get_plane(data->output, IGT_PLANE_PRIMARY);
mode = igt_output_get_mode(data->output); mode = igt_output_get_mode(data->output);
@ -365,11 +358,7 @@ static bool prepare_test(data_t *data, enum test_mode test_mode)
igt_wait_for_vblank(data->drm_fd, data->pipe); igt_wait_for_vblank(data->drm_fd, data->pipe);
/* get reference crc for fb[1] */ /* get reference crc for fb[1] */
igt_pipe_crc_start(pipe_crc); igt_pipe_crc_collect_crc(pipe_crc, &data->ref_crc[1]);
igt_pipe_crc_get_crcs(pipe_crc, 1, &crcs);
data->ref_crc[1] = crcs[0];
igt_pipe_crc_stop(pipe_crc);
free(crcs);
if (test_mode == TEST_CONTEXT || test_mode == TEST_PAGE_FLIP_AND_CONTEXT) { if (test_mode == TEST_CONTEXT || test_mode == TEST_PAGE_FLIP_AND_CONTEXT) {
data->ctx[0] = drm_intel_gem_context_create(data->bufmgr); data->ctx[0] = drm_intel_gem_context_create(data->bufmgr);
@ -404,11 +393,7 @@ static bool prepare_test(data_t *data, enum test_mode test_mode)
igt_wait_for_vblank(data->drm_fd, data->pipe); igt_wait_for_vblank(data->drm_fd, data->pipe);
/* get reference crc for fb[0] */ /* get reference crc for fb[0] */
igt_pipe_crc_start(pipe_crc); igt_pipe_crc_collect_crc(pipe_crc, &data->ref_crc[0]);
igt_pipe_crc_get_crcs(pipe_crc, 1, &crcs);
data->ref_crc[0] = crcs[0];
igt_pipe_crc_stop(pipe_crc);
free(crcs);
return true; return true;
} }