egl/android: Cancel any outstanding ANativeBuffer in surface destructor
That is, call ANativeWindow::cancelBuffer in droid_destroy_surface(). This should prevent application deadlock when the app destroys the EGLSurface after EGL has acquired a buffer from SurfaceFlinger (ANativeWindow::dequeueBuffer) but before EGL has released it (ANativeWindow::enqueueBuffer). This patch is part of a series for fixing android.hardware.camera2.cts.RobustnessTest#testAbandonRepeatingRequestSurface on Chrome OS x86 devices. Cc: mesa-stable@lists.freedesktop.org Cc: Tomasz Figa <tfiga@chromium.org> Cc: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
parent
23c86c74cc
commit
0212db3504
|
@ -264,10 +264,15 @@ droid_window_enqueue_buffer(_EGLDisplay *disp, struct dri2_egl_surface *dri2_sur
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
droid_window_cancel_buffer(_EGLDisplay *disp, struct dri2_egl_surface *dri2_surf)
|
droid_window_cancel_buffer(struct dri2_egl_surface *dri2_surf)
|
||||||
{
|
{
|
||||||
/* no cancel buffer? */
|
int ret;
|
||||||
droid_window_enqueue_buffer(disp, dri2_surf);
|
|
||||||
|
ret = dri2_surf->window->cancelBuffer(dri2_surf->window, dri2_surf->buffer, -1);
|
||||||
|
if (ret < 0) {
|
||||||
|
_eglLog(_EGL_WARNING, "ANativeWindow::cancelBuffer failed");
|
||||||
|
dri2_surf->base.Lost = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static __DRIbuffer *
|
static __DRIbuffer *
|
||||||
|
@ -399,7 +404,7 @@ droid_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf)
|
||||||
|
|
||||||
if (dri2_surf->base.Type == EGL_WINDOW_BIT) {
|
if (dri2_surf->base.Type == EGL_WINDOW_BIT) {
|
||||||
if (dri2_surf->buffer)
|
if (dri2_surf->buffer)
|
||||||
droid_window_cancel_buffer(disp, dri2_surf);
|
droid_window_cancel_buffer(dri2_surf);
|
||||||
|
|
||||||
dri2_surf->window->common.decRef(&dri2_surf->window->common);
|
dri2_surf->window->common.decRef(&dri2_surf->window->common);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue