diff --git a/.pick_status.json b/.pick_status.json index 6524d7bd0e9..d0cf4388f30 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2110,7 +2110,7 @@ "description": "egl/dri2: fix race between image create and egl_image_target_texture", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 8c6fd19ab2e..fa6e57e40e0 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -685,7 +685,10 @@ dri2_lookup_egl_image(__DRIscreen *screen, void *image, void *data) (void) screen; + mtx_lock(&disp->Mutex); img = _eglLookupImage(image, disp); + mtx_unlock(&disp->Mutex); + if (img == NULL) { _eglError(EGL_BAD_PARAMETER, "dri2_lookup_egl_image"); return NULL;