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

lib: make igt_pipe_crc_start never fail

Browse Source 
It's what callers expect - pipe_crc_new is the function where
we pass a potential failure back to callers.

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2013-12-06 10:48:25 +01:00
parent c1b7e722da
commit a4d3a6c013
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/igt_debugfs.c
View File

@ -269,12 +269,11 @@ void igt_pipe_crc_free(igt_pipe_crc_t *pipe_crc)
free(pipe_crc); free(pipe_crc);
} }
bool igt_pipe_crc_start(igt_pipe_crc_t *pipe_crc) void igt_pipe_crc_start(igt_pipe_crc_t *pipe_crc)
{ {
igt_crc_t *crcs = NULL; igt_crc_t *crcs = NULL;
if (!igt_pipe_crc_do_start(pipe_crc)) igt_assert(igt_pipe_crc_do_start(pipe_crc));
return false;
/* /*
* For some no yet identified reason, the first CRC is bonkers. So * For some no yet identified reason, the first CRC is bonkers. So
@ -282,8 +281,6 @@ bool igt_pipe_crc_start(igt_pipe_crc_t *pipe_crc)
*/ */
igt_pipe_crc_get_crcs(pipe_crc, 1, &crcs); igt_pipe_crc_get_crcs(pipe_crc, 1, &crcs);
free(crcs); free(crcs);
return true;
} }
void igt_pipe_crc_stop(igt_pipe_crc_t *pipe_crc) void igt_pipe_crc_stop(igt_pipe_crc_t *pipe_crc)

2
lib/igt_debugfs.h
View File

@ -75,7 +75,7 @@ igt_pipe_crc_t *
igt_pipe_crc_new(igt_debugfs_t *debugfs, int drm_fd, enum pipe pipe, igt_pipe_crc_new(igt_debugfs_t *debugfs, int drm_fd, enum pipe pipe,
enum intel_pipe_crc_source source); enum intel_pipe_crc_source source);
void igt_pipe_crc_free(igt_pipe_crc_t *pipe_crc); void igt_pipe_crc_free(igt_pipe_crc_t *pipe_crc);
bool igt_pipe_crc_start(igt_pipe_crc_t *pipe_crc); void igt_pipe_crc_start(igt_pipe_crc_t *pipe_crc);
void igt_pipe_crc_stop(igt_pipe_crc_t *pipe_crc); void igt_pipe_crc_stop(igt_pipe_crc_t *pipe_crc);
void igt_pipe_crc_get_crcs(igt_pipe_crc_t *pipe_crc, int n_crcs, void igt_pipe_crc_get_crcs(igt_pipe_crc_t *pipe_crc, int n_crcs,
igt_crc_t **out_crcs); igt_crc_t **out_crcs);

2
tests/kms_pipe_crc_basic.c
View File

@ -180,7 +180,7 @@ static void test_read_crc(data_t *data, int pipe, unsigned flags)
continue; continue;
valid_connectors++; valid_connectors++;
igt_assert(igt_pipe_crc_start(pipe_crc)); igt_pipe_crc_start(pipe_crc);
/* wait for 3 vblanks and the corresponding 3 CRCs */ /* wait for 3 vblanks and the corresponding 3 CRCs */
igt_pipe_crc_get_crcs(pipe_crc, 3, &crcs); igt_pipe_crc_get_crcs(pipe_crc, 3, &crcs);