[PATCH v19 03/10] compositor-drm: Add modes to drm_output_propose_state

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


Hi Pekka,
On Wed, 11 Jul 2018 at 10:21, Pekka Paalanen <ppaalanen at gmail.com> wrote:
> On Tue, 10 Jul 2018 18:58:42 +0100 Daniel Stone <daniels at collabora.com> wrote:
> > @@ -3339,13 +3347,16 @@ drm_output_propose_state(struct weston_output *output_base,
> >                       next_plane = primary;
> >               pixman_region32_fini(&surface_overlap);
> >
> > -             if (next_plane == NULL)
> > +             /* The cursor plane is 'special' in the sense that we can still
> > +              * place it in the legacy API, and we gate that with a separate
> > +              * cursors_are_broken flag. */
> > +             if (next_plane == NULL && !b->cursors_are_broken)
> >                       next_plane = drm_output_prepare_cursor_view(state, ev);
> >
> >               if (next_plane == NULL && !drm_view_is_opaque(ev))
> >                       next_plane = primary;
> >
> > -             if (next_plane == NULL && b->sprites_are_broken)
> > +             if (next_plane == NULL && !planes_ok)
>
> planes_ok is guaranteed to be true.

Thinking about it, adding an early return from 'planes_ok' is an
unwanted behaviour change, since it also disables cursor usage. With
the other three fixed, and the planes_ok early-return removed, would
your R-b still stand?

Cheers,
Daniel


More information about the wayland-devel mailing list