glupload: dmabuf: Fix emulated tiled import
authorNicolas Dufresne <nicolas.dufresne@collabora.com>
Thu, 14 Nov 2024 20:13:50 +0000 (15:13 -0500)
committerBackport Bot <gitlab-backport-bot@gstreamer-foundation.org>
Sat, 16 Nov 2024 15:49:33 +0000 (15:49 +0000)
The added check for LINEAR modifier broke dmabuf import for
NV12 emulation (R8/RG88) of all sort (linear and tiled).

Fixes !5461

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7907>

subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c

index bafd804fe819b7ba5408694ca7f600e23f1ea79b..f1ee70730945ed21aeae2c723fc8712a0cb6edef 100644 (file)
@@ -1503,7 +1503,8 @@ _dma_buf_upload_accept (gpointer impl, GstBuffer * buffer, GstCaps * in_caps,
     return FALSE;
   }
 
-  if (!dmabuf->direct && in_info_drm->drm_modifier != DRM_FORMAT_MOD_LINEAR) {
+  if (!dmabuf->direct && in_info_drm->drm_modifier != DRM_FORMAT_MOD_LINEAR
+      && in_info_drm->drm_modifier != DRM_FORMAT_MOD_INVALID) {
     GST_DEBUG_OBJECT (dmabuf->upload,
         "Indirect uploads are only support for linear formats.");
     return FALSE;