On Wed, 2017-08-02 at 12:29 +0200, Maarten Lankhorst wrote:
> With the conversion to atomic, this is already handled in the core.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> ---
> lib/igt_kms.c | 15 ---------------
> lib/igt_kms.h | 1 -
> 2 files changed, 16 deletions(-)
>
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index 6390229f1546..14e2701c3afd 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -2374,8 +2374,6 @@ static int
> igt_primary_plane_commit_legacy(igt_plane_t *primary,
>
> CHECK_RETURN(ret, fail_on_error);
>
> - primary->pipe->enabled = (fb_id != 0);
> -
How was this related to vblank wait removal?
> return 0;
> }
>
> @@ -2413,10 +2411,8 @@ static int igt_pipe_commit(igt_pipe_t *pipe,
> enum igt_commit_style s,
> bool fail_on_error)
> {
> - igt_display_t *display = pipe->display;
> int i;
> int ret;
> - bool need_wait_for_vblank = false;
>
> if (pipe->background_changed) {
> igt_crtc_set_property(pipe, pipe-
> >background_property,
> @@ -2435,21 +2431,10 @@ static int igt_pipe_commit(igt_pipe_t *pipe,
> for (i = 0; i < pipe->n_planes; i++) {
> igt_plane_t *plane = &pipe->planes[i];
>
> - if (plane->fb_changed || plane->position_changed ||
> plane->size_changed)
> - need_wait_for_vblank = true;
> -
> ret = igt_plane_commit(plane, pipe, s,
> fail_on_error);
> CHECK_RETURN(ret, fail_on_error);
> }
>
> - /*
> - * If the crtc is enabled, wait until the next vblank before
> returning
> - * if we made changes to any of the planes.
> - */
> - if (need_wait_for_vblank && pipe->enabled) {
> - igt_wait_for_vblank(display->drm_fd, pipe->pipe);
> - }
> -
> return 0;
> }
>
> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
> index 35428f3e9675..d18a92600933 100644
> --- a/lib/igt_kms.h
> +++ b/lib/igt_kms.h
> @@ -323,7 +323,6 @@ typedef struct {
> struct igt_pipe {
> igt_display_t *display;
> enum pipe pipe;
> - bool enabled;
>
> int n_planes;
> int plane_cursor;
--
Mika Kahola - Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
