diff options
| author | Alex Villacís Lasso <a_villacis@palosanto.com> | 2019-05-12 20:34:28 -0500 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2019-05-15 18:27:30 +0100 |
| commit | b2200514af1ce22da9b0dcc0ca5e24731badd192 (patch) | |
| tree | af4cb0212e417bc6441d4095f969d194850de35c /src/gbm | |
| parent | a9cef4f0e5e447468e192889609b8c73ef5c5bda (diff) | |
gbm: gbm_bo_get_handle_for_plane fallback to nonplanar handle
Commit f9567ab435217a72cbae628336ead84dc0b2a803 (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=108487
Signed-off-by: Alex Villacís Lasso <a_villacis@palosanto.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to 'src/gbm')
| -rw-r--r-- | src/gbm/backends/dri/gbm_dri.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 99396f658f2..8d7e4babc3a 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -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; } |