diff options
| author | Lyude Paul <lyude@redhat.com> | 2021-03-17 18:44:07 -0400 |
|---|---|---|
| committer | Lyude Paul <lyude@redhat.com> | 2021-03-18 12:41:54 -0400 |
| commit | e2f0d31702e95837dbc2df66949e643284e29dea (patch) | |
| tree | 46ce48a202d4f314104c854ec6cff19b9a3346b0 /tests/kms_plane.c | |
| parent | 989186fa5d9f98b1fd95d6244a28ed7df4d8a9be (diff) | |
tests/kms_plane: Don't unset primary_fb when testing other planes
Currently, nouveau doesn't support having a CRTC without a primary FB set. We
won't reject such configurations, but the behavior is undefined which will cause
CRCs to become undefined. So, avoid clearing the primary FB while we're testing
non-primary planes.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: Martin Peres <martin.peres@free.fr>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Jeremy Cline <jcline@redhat.com>
Reviewed-by: Martin Peres <martin.peres@mupuf.org>
Diffstat (limited to 'tests/kms_plane.c')
| -rw-r--r-- | tests/kms_plane.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/kms_plane.c b/tests/kms_plane.c index 298a9375..c87983a4 100644 --- a/tests/kms_plane.c +++ b/tests/kms_plane.c @@ -817,9 +817,10 @@ enum crc_set { PACKED_CRC_SET, MAX_CRC_SET }; static bool test_format_plane(data_t *data, enum pipe pipe, - igt_output_t *output, igt_plane_t *plane) + igt_output_t *output, igt_plane_t *plane, igt_fb_t *primary_fb) { struct igt_fb fb = {}; + struct igt_fb *clear_fb = plane->type == DRM_PLANE_TYPE_PRIMARY ? primary_fb : NULL; drmModeModeInfo *mode; uint32_t format, ref_format; uint64_t modifier, ref_modifier; @@ -879,7 +880,7 @@ static bool test_format_plane(data_t *data, enum pipe pipe, height = test_fb.height; } - igt_plane_set_fb(plane, NULL); + igt_plane_set_fb(plane, clear_fb); igt_remove_fb(data->drm_fd, &test_fb); } @@ -937,7 +938,7 @@ static bool test_format_plane(data_t *data, enum pipe pipe, igt_pipe_crc_stop(data->pipe_crc); - igt_plane_set_fb(plane, NULL); + igt_plane_set_fb(plane, clear_fb); igt_remove_fb(data->drm_fd, &fb); return result; @@ -1010,7 +1011,7 @@ test_pixel_formats(data_t *data, enum pipe pipe) for_each_plane_on_pipe(&data->display, pipe, plane) { if (skip_plane(data, plane)) continue; - result &= test_format_plane(data, pipe, output, plane); + result &= test_format_plane(data, pipe, output, plane, &primary_fb); } test_fini(data); |