diff options
author | Lyude <lyude@redhat.com> | 2016-12-07 19:02:04 -0500 |
---|---|---|
committer | Lyude <lyude@redhat.com> | 2016-12-08 11:26:26 -0500 |
commit | 80baeb023223e7948ebfa22ebb4d3b706b4bc550 (patch) | |
tree | 5aae4d51683c3a1bb64388afb53bc595cbd0538e /tests | |
parent | 4f0866610a4300d2d740b75122ea3b92e0134c08 (diff) |
igt_kms: Remove support for drivers with <1 drm_plane
We've had support for universal planes since kernel version 3.15, so
there's not really a good reason to try supporting drivers that lack
plane support now. As well, the current has_universal_planes logic is
broken anyway as it makes the assumption that having display planes
always means we have both a primary plane and a cursor plane (this isn't
true on radeon/amdgpu and nouveau).
So, remove this, and just check for whether or not we have a cursor
plane.
Signed-off-by: Lyude <lyude@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/kms_crtc_background_color.c | 2 | ||||
-rw-r--r-- | tests/kms_plane_scaling.c | 1 | ||||
-rw-r--r-- | tests/kms_rotation_crc.c | 25 | ||||
-rw-r--r-- | tests/kms_universal_plane.c | 5 |
4 files changed, 14 insertions, 19 deletions
diff --git a/tests/kms_crtc_background_color.c b/tests/kms_crtc_background_color.c index b97c1142..537d4ce6 100644 --- a/tests/kms_crtc_background_color.c +++ b/tests/kms_crtc_background_color.c @@ -131,8 +131,6 @@ static void test_crtc_background(data_t *data) enum pipe pipe; int valid_tests = 0; - igt_require(data->display.has_universal_planes); - for_each_pipe_with_valid_output(display, pipe, output) { igt_plane_t *plane; diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c index 4546ce54..368da09f 100644 --- a/tests/kms_plane_scaling.c +++ b/tests/kms_plane_scaling.c @@ -183,7 +183,6 @@ static void test_plane_scaling(data_t *d) int valid_tests = 0; int primary_plane_scaling = 0; /* For now */ - igt_require(d->display.has_universal_planes); igt_require(d->num_scalers); for_each_pipe_with_valid_output(display, pipe, output) { diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c index 6cc15337..796b4486 100644 --- a/tests/kms_rotation_crc.c +++ b/tests/kms_rotation_crc.c @@ -106,10 +106,8 @@ static void commit_crtc(data_t *data, igt_output_t *output, igt_plane_t *plane) if (!plane->is_cursor) igt_plane_set_position(plane, data->pos_x, data->pos_y); - if (plane->is_primary || plane->is_cursor) { - igt_require(data->display.has_universal_planes); + if (plane->is_primary || plane->is_cursor) commit = COMMIT_UNIVERSAL; - } if (data->display.is_atomic) commit = COMMIT_ATOMIC; @@ -248,10 +246,11 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type) unsigned int flip_count; int ret; - if (plane_type == IGT_PLANE_PRIMARY || plane_type == IGT_PLANE_CURSOR) { - igt_require(data->display.has_universal_planes); + if (plane_type == IGT_PLANE_PRIMARY || plane_type == IGT_PLANE_CURSOR) commit = COMMIT_UNIVERSAL; - } + + if (plane_type == IGT_PLANE_CURSOR) + igt_require(display->has_cursor_plane); if (data->display.is_atomic) commit = COMMIT_ATOMIC; @@ -341,10 +340,11 @@ static void test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_ty plane = igt_output_get_plane(output, plane_type); igt_require(igt_plane_supports_rotation(plane)); - if (plane_type == IGT_PLANE_PRIMARY || plane_type == IGT_PLANE_CURSOR) { - igt_require(data->display.has_universal_planes); + if (plane_type == IGT_PLANE_PRIMARY || plane_type == IGT_PLANE_CURSOR) commit = COMMIT_UNIVERSAL; - } + + if (plane_type == IGT_PLANE_CURSOR) + igt_require(display->has_cursor_plane); if (data->display.is_atomic) commit = COMMIT_ATOMIC; @@ -408,10 +408,11 @@ static void test_plane_rotation_exhaust_fences(data_t *data, enum igt_plane plan plane = igt_output_get_plane(output, plane_type); igt_require(igt_plane_supports_rotation(plane)); - if (plane_type == IGT_PLANE_PRIMARY || plane_type == IGT_PLANE_CURSOR) { - igt_require(data->display.has_universal_planes); + if (plane_type == IGT_PLANE_PRIMARY || plane_type == IGT_PLANE_CURSOR) commit = COMMIT_UNIVERSAL; - } + + if (plane_type == IGT_PLANE_CURSOR) + igt_require(display->has_cursor_plane); if (data->display.is_atomic) commit = COMMIT_ATOMIC; diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c index b06b51e6..b9e0651b 100644 --- a/tests/kms_universal_plane.c +++ b/tests/kms_universal_plane.c @@ -134,7 +134,6 @@ functional_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) int num_primary = 0, num_cursor = 0; int i; - igt_assert(data->display.has_universal_planes); igt_skip_on(pipe >= display->n_pipes); igt_info("Testing connector %s using pipe %s\n", igt_output_name(output), @@ -573,8 +572,8 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) int r, g, b; int count1, count2; - igt_assert(data->display.has_universal_planes); igt_skip_on(pipe >= display->n_pipes); + igt_require(display->has_cursor_plane); igt_output_set_pipe(output, pipe); mode = igt_output_get_mode(output); @@ -783,8 +782,6 @@ igt_main igt_require_pipe_crc(); igt_display_init(&data.display, data.drm_fd); - - igt_require(data.display.has_universal_planes); } for (int pipe = 0; pipe < I915_MAX_PIPES; pipe++) |