Attachment 1456611 Details for Bug 1575194 – renderer/native: Fallback to non-planar API if gbm_bo_get_handle_for_plane fails

[patch] renderer/native: Fallback to non-planar API if gbm_bo_get_handle_for_plane fails

mutter-fallback-to-nonplanar-gbm-api.patch (text/plain), 1.47 KB, created by Alex Villacís Lasso on 2018-07-04 20:06:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Villacís Lasso

Created: 2018-07-04 20:06:25 UTC

Size: 1.47 KB

patch

obsolete

>commit 68862da32af2a13a59e32e4d7ae0026bd82a36f5
>Author: Alex VillacÃs Lasso <a_villacis@palosanto.com>
>Date:   Wed Jul 4 14:25:53 2018 -0500
>
>    renderer/native: Fallback to non-planar API if gbm_bo_get_handle_for_plane fails
>    
>    Commit c0d9b08ef9bf2be865aad9bf1bc74ba24c655d9f replaced the old GBM API calls
>    with the multi-plane GBM API. However, the call to gbm_bo_get_handle_for_plane
>    fails for some DRI drivers (in particular i915). Due to missing error checks,
>    the subsequent call to drmModeAddFB[2] fails and the screen output locks up.
>    
>    This commit adds the missing error checks and falls back to the old GBM API
>    (non-planar) if necessary.
>    
>    Related to: https://gitlab.gnome.org/GNOME/mutter/issues/127
>
>diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
>index 935be17af..50c920296 100644
>--- a/src/backends/native/meta-renderer-native.c
>+++ b/src/backends/native/meta-renderer-native.c
>@@ -1632,6 +1632,14 @@ gbm_get_next_fb_id (MetaGpuKms         *gpu_kms,
>       offsets[i] = gbm_bo_get_offset (next_bo, i);
>       modifiers[i] = gbm_bo_get_modifier (next_bo);
>     }
>+  if (handles[0] == 0xffffffff)
>+    {
>+      /* Failed to fetch handle to plane, falling back to old method */
>+      strides[0] = gbm_bo_get_stride (next_bo);
>+      handles[0] = gbm_bo_get_handle (next_bo).u32;
>+      offsets[0] = 0;
>+      modifiers[0] = DRM_FORMAT_MOD_INVALID;
>+    }
> 
>   kms_fd = meta_gpu_kms_get_fd (gpu_kms);
>

Flags:

alexvillacislasso: review+

Actions: View | Diff

Attachments on bug 1575194: 1431705 | 1432009 | 1432162 | 1456611