diff -ur mesa-19.0.3-bak/src/gbm/backends/dri/gbm_dri.c mesa-19.0.3/src/gbm/backends/dri/gbm_dri.c
--- mesa-19.0.3-bak/src/gbm/backends/dri/gbm_dri.c	2019-05-10 21:07:11.827246637 -0500
+++ mesa-19.0.3/src/gbm/backends/dri/gbm_dri.c	2019-05-12 20:18:23.100848640 -0500
@@ -689,6 +689,12 @@
    ret.s32 = -1;
 
    if (!dri->image || dri->image->base.version < 13 || !dri->image->fromPlanar) {
+      /* Preserve legacy behavior if plane is 0 */
+      if (plane == 0) {
+         /* NOTE: return _bo->handle, *NOT* bo->handle which is invalid at this point */
+         return _bo->handle;
+      }
+
       errno = ENOSYS;
       return ret;
    }