Remove a bunch of branches, functionally equivalent. Changes since v1: - Added back display->has_cursor_plane assignment
Signed-off-by: Brian Starkey <[email protected]> Reviewed-by: Robert Foss <[email protected]> --- lib/igt_kms.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 9e59e35f2e2f..585aad7aafb3 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -1639,32 +1639,19 @@ void igt_display_init(igt_display_t *display, int drm_fd) type = get_drm_plane_type(display->drm_fd, plane_resources->planes[j]); - switch (type) { - case DRM_PLANE_TYPE_PRIMARY: - if (pipe->plane_primary == -1) { - plane = &pipe->planes[0]; - plane->index = 0; - pipe->plane_primary = 0; - } else { - plane = &pipe->planes[p]; - plane->index = p++; - } - break; - case DRM_PLANE_TYPE_CURSOR: - if (pipe->plane_cursor == -1) { - plane = &pipe->planes[last_plane]; - plane->index = last_plane; - pipe->plane_cursor = last_plane; - } else { - plane = &pipe->planes[p]; - plane->index = p++; - } + + if (type == DRM_PLANE_TYPE_PRIMARY && pipe->plane_primary == -1) { + plane = &pipe->planes[0]; + plane->index = 0; + pipe->plane_primary = 0; + } else if (type == DRM_PLANE_TYPE_CURSOR && pipe->plane_cursor == -1) { + plane = &pipe->planes[last_plane]; + plane->index = last_plane; + pipe->plane_cursor = last_plane; display->has_cursor_plane = true; - break; - default: + } else { plane = &pipe->planes[p]; plane->index = p++; - break; } igt_assert_f(plane->index < n_planes, "n_planes < plane->index failed\n"); -- 1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
