Commit b2200514 authored by Alex Villacís Lasso's avatar Alex Villacís Lasso Committed by Daniel Stone

gbm: gbm_bo_get_handle_for_plane fallback to nonplanar handle

Commit f9567ab4 (gbm: Export a getter for per
plane handles) contains an API version check that fails on i915 (API version 7
vs. check for minimum API version 13). Any client that migrates to the planar
API will start failing on i915 (see https://gitlab.gnome.org/GNOME/mutter/issues/127
for mutter, and https://bugs.freedesktop.org/show_bug.cgi?id=108487 for weston).

This commit adds a fallback for plane 0 when the API check fails and returns the
non-planar handle in this scenario, making the call equivalent to
gbm_bo_get_handle(). This is enough for weston 6.0.0 to start working again on an
i915 system.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=108487Signed-off-by: default avatarAlex Villacís Lasso <a_villacis@palosanto.com>
Reviewed-by: Daniel Stone's avatarDaniel Stone <daniels@collabora.com>
parent a9cef4f0
Pipeline #37032 passed with stages
in 11 minutes and 1 second
......@@ -681,6 +681,12 @@ gbm_dri_bo_get_handle_for_plane(struct gbm_bo *_bo, int plane)
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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment