Re: [Mesa-dev] [PATCH] egl/wayland: Make swrast display_sync the correct queue

2018-03-22 Thread Eric Engestrom
On Thursday, 2018-03-22 15:28:49 +, Daniel Stone wrote:
> On 22 March 2018 at 15:20, Derek Foreman  wrote:
> > commit 03dd9a88b0be17ff0ce91e92f6902a9a85ba584a introduced per surface
> > queues, but the display_sync for swrast_commit_backbuffer remained on
> > the old queue.  This is likely to break when dispatching the correct
> > queue at the top of function (which can't dispatch the sync callback
> > we're waiting for).
> >
> > The easiest known reproduction case is running weston-subsurfaces under
> > weston --use-pixman
> 
> Oh dear. Pushed now with review. For future though, can you please use
> the 'Fixes:' annotation, which in this case would've been for
> 03dd9a88b0be? Don't feel too bad though, because I also forgot to add
> it when pushing.

We want this in stable, right?
Would've been done automatically with the Fixes: tag, but I cc'ed
mesa-stable@ now, so it's nominated :)

> 
> Cheers,
> Daniel
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] egl/wayland: Make swrast display_sync the correct queue

2018-03-22 Thread Daniel Stone
On 22 March 2018 at 15:20, Derek Foreman  wrote:
> commit 03dd9a88b0be17ff0ce91e92f6902a9a85ba584a introduced per surface
> queues, but the display_sync for swrast_commit_backbuffer remained on
> the old queue.  This is likely to break when dispatching the correct
> queue at the top of function (which can't dispatch the sync callback
> we're waiting for).
>
> The easiest known reproduction case is running weston-subsurfaces under
> weston --use-pixman

Oh dear. Pushed now with review. For future though, can you please use
the 'Fixes:' annotation, which in this case would've been for
03dd9a88b0be? Don't feel too bad though, because I also forgot to add
it when pushing.

Cheers,
Daniel
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH] egl/wayland: Make swrast display_sync the correct queue

2018-03-22 Thread Derek Foreman
commit 03dd9a88b0be17ff0ce91e92f6902a9a85ba584a introduced per surface
queues, but the display_sync for swrast_commit_backbuffer remained on
the old queue.  This is likely to break when dispatching the correct
queue at the top of function (which can't dispatch the sync callback
we're waiting for).

The easiest known reproduction case is running weston-subsurfaces under
weston --use-pixman

Signed-off-by: Derek Foreman 
---
 src/egl/drivers/dri2/platform_wayland.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/egl/drivers/dri2/platform_wayland.c 
b/src/egl/drivers/dri2/platform_wayland.c
index 94f7defa65..80853ac00b 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1751,7 +1751,7 @@ dri2_wl_swrast_commit_backbuffer(struct dri2_egl_surface 
*dri2_surf)
 * handle the commit and send a release event before checking for a free
 * buffer */
if (dri2_surf->throttle_callback == NULL) {
-  dri2_surf->throttle_callback = wl_display_sync(dri2_dpy->wl_dpy_wrapper);
+  dri2_surf->throttle_callback = 
wl_display_sync(dri2_surf->wl_dpy_wrapper);
   wl_callback_add_listener(dri2_surf->throttle_callback,
_listener, dri2_surf);
}
-- 
2.14.3

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev