diff --git a/.pick_status.json b/.pick_status.json index 64a4b5ffec6..f0cede73b24 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -814,7 +814,7 @@ "description": "gbm/dri: Remove erroneous assert", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "0b16d7ebb92e05a5bcdaf70626e0d916551015e1", "notes": null diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 9ab5e452872..2bd1191a195 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -1055,9 +1055,6 @@ gbm_dri_bo_create(struct gbm_device *gbm, free(mods_filtered); mods_filtered = NULL; - if (modifiers) - assert(gbm_dri_bo_get_modifier(&bo->base) != DRM_FORMAT_MOD_INVALID); - dri->image->queryImage(bo->image, __DRI_IMAGE_ATTRIB_HANDLE, &bo->base.v0.handle.s32); dri->image->queryImage(bo->image, __DRI_IMAGE_ATTRIB_STRIDE,