Reviewed-by: Mika Kahola <mika.kahola at intel.com>
On Tue, 2017-01-24 at 18:34 -0500, Robert Foss wrote:
> Due to the dyn n_planes implementation some attributes and functions
> were made obsolete and cand be removed.
>
> However to keep all of the tests building the obsolete code is
> removed after all of the tests have been made compatible with the
> dyn n_planes changes.
>
> Signed-off-by: Robert Foss <robert.foss at collabora.com>
> ---
> lib/igt_kms.c | 28 ----------------------------
> lib/igt_kms.h | 20 --------------------
> 2 files changed, 48 deletions(-)
>
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index bfe5eab4..75225881 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -342,32 +342,6 @@ int kmstest_pipe_to_index(char pipe)
> }
>
> /**
> - * kmstest_plane_name:
> - * @plane: display plane
> - *
> - * Returns: String representing @plane, e.g. "plane1".
> - */
> -const char *kmstest_plane_name(enum igt_plane plane)
> -{
> - static const char *names[] = {
> - [IGT_PLANE_1] = "plane1",
> - [IGT_PLANE_2] = "plane2",
> - [IGT_PLANE_3] = "plane3",
> - [IGT_PLANE_4] = "plane4",
> - [IGT_PLANE_5] = "plane5",
> - [IGT_PLANE_6] = "plane6",
> - [IGT_PLANE_7] = "plane7",
> - [IGT_PLANE_8] = "plane8",
> - [IGT_PLANE_9] = "plane9",
> - [IGT_PLANE_CURSOR] = "cursor",
> - };
> -
> - igt_assert(plane < ARRAY_SIZE(names) && names[plane]);
> -
> - return names[plane];
> -}
> -
> -/**
> * kmstest_plane_type_name:
> * @plane: display plane
> *
> @@ -1633,7 +1607,6 @@ void igt_display_init(igt_display_t *display,
> int drm_fd)
> plane = &pipe->planes[p];
> plane->index = p++;
> }
> - plane->is_primary = 1;
> break;
> case DRM_PLANE_TYPE_CURSOR:
> if (pipe->plane_cursor == -1) {
> @@ -1645,7 +1618,6 @@ void igt_display_init(igt_display_t *display,
> int drm_fd)
> plane->index = p++;
> }
> display->has_cursor_plane = true;
> - plane->is_cursor = 1;
> break;
> default:
> plane = &pipe->planes[p];
> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
> index dea50df3..f34f22f6 100644
> --- a/lib/igt_kms.h
> +++ b/lib/igt_kms.h
> @@ -58,24 +58,6 @@ enum pipe {
> };
> const char *kmstest_pipe_name(enum pipe pipe);
> int kmstest_pipe_to_index(char pipe);
> -
> -/* We namespace this enum to not conflict with the Android
> i915_drm.h */
> -enum igt_plane {
> - IGT_PLANE_1 = 0,
> - IGT_PLANE_PRIMARY = IGT_PLANE_1,
> - IGT_PLANE_2,
> - IGT_PLANE_3,
> - IGT_PLANE_4,
> - IGT_PLANE_5,
> - IGT_PLANE_6,
> - IGT_PLANE_7,
> - IGT_PLANE_8,
> - IGT_PLANE_9,
> - IGT_PLANE_CURSOR, /* IGT_PLANE_CURSOR is always the last
> plane. */
> - IGT_MAX_PLANES,
> -};
> -
> -const char *kmstest_plane_name(enum igt_plane plane);
> const char *kmstest_plane_type_name(int plane_type);
>
> enum port {
> @@ -258,8 +240,6 @@ typedef struct {
> int index;
> /* capabilities */
> int type;
> - unsigned int is_primary : 1;
> - unsigned int is_cursor : 1;
> /* state tracking */
> unsigned int fb_changed : 1;
> unsigned int position_changed : 1;
--
Mika Kahola - Intel OTC