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

tests/kms_cursor_crc: Restore the valid pipe/connector combo check

Browse Source 
The valid pipe/connector combo check was lost in
 commit 57259d714d3fe1170cf931af72648219856a9918
 Author: Daniel Vetter <daniel.vetter@ffwll.ch>
 Date:   Mon Nov 24 16:08:32 2014 +0100

    lib/igt_debugfs: Don't setup crc in _new

Restore it to make the test again useful on CHV.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
This commit is contained in:
Ville Syrjälä 2014-12-09 22:33:16 +02:00
parent b6f68c10b4
commit 5d46f68eab
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/kms_cursor_crc.c
View File

@ -230,7 +230,7 @@ static void test_crc_random(data_t *data)
} }
} }
static void prepare_crtc(data_t *data, igt_output_t *output, static bool prepare_crtc(data_t *data, igt_output_t *output,
int cursor_w, int cursor_h) int cursor_w, int cursor_h)
{ {
drmModeModeInfo *mode; drmModeModeInfo *mode;
@ -245,7 +245,7 @@ static void prepare_crtc(data_t *data, igt_output_t *output,
if (!output->valid) { if (!output->valid) {
igt_output_set_pipe(output, PIPE_ANY); igt_output_set_pipe(output, PIPE_ANY);
igt_display_commit(display); igt_display_commit(display);
return; return false;
} }
/* create and set the primary plane fb */ /* create and set the primary plane fb */
@ -284,6 +284,8 @@ static void prepare_crtc(data_t *data, igt_output_t *output,
/* get reference crc w/o cursor */ /* get reference crc w/o cursor */
igt_pipe_crc_collect_crc(data->pipe_crc, &data->ref_crc); igt_pipe_crc_collect_crc(data->pipe_crc, &data->ref_crc);
return true;
} }
static void cleanup_crtc(data_t *data, igt_output_t *output) static void cleanup_crtc(data_t *data, igt_output_t *output)
@ -318,7 +320,8 @@ static void run_test(data_t *data, void (*testfunc)(data_t *), int cursor_w, int
for_each_pipe(display, p) { for_each_pipe(display, p) {
data->pipe = p; data->pipe = p;
prepare_crtc(data, output, cursor_w, cursor_h); if (!prepare_crtc(data, output, cursor_w, cursor_h))
continue;
valid_tests++; valid_tests++;