[PATCH v19 05/10] compositor-drm: Add test-only mode to state application

Daniel Stone daniel at fooishbar.org
Wed Jul 11 09:21:57 UTC 2018


On Tue, 10 Jul 2018 at 18:59, Daniel Stone <daniels at collabora.com> wrote:
> @@ -3388,7 +3414,18 @@ drm_output_propose_state(struct weston_output *output_base,
>         pixman_region32_fini(&renderer_region);
>         pixman_region32_fini(&occluded_region);
>
> +       /* Check to see if this state will actually work. */
> +       ret = drm_pending_state_test(state->pending_state);
> +       if (ret != 0)
> +               goto err;
> +
>         return state;
> +
> +err:
> +       pixman_region32_fini(&renderer_region);
> +       pixman_region32_fini(&occluded_region);
> +       drm_output_state_free(state);
> +       return NULL;
>  }

Looking at this fresh, this err jump should jump to freeing the state
and returning NULL, not finishing the regions. The region free is only
needed by 'Add planes-only mode to state proposal', which can bail out
inside the per-view loop.

Cheers,
Daniel


More information about the wayland-devel mailing list