isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-01 02:54:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

kms/impl-device/simple: Ensure buffer fb_id on test update too

Browse Source 
This ensures the fb_id will be there when we actually apply the update,
and will also make scanout test case pass if we run it with the
non-atomic KMS API.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2456>
This commit is contained in:
Jonas Ådahl 2022-06-03 18:32:17 +02:00 committed by Marge Bot
parent e0145447a3
commit 5823d2d1ae
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backends/native/meta-kms-impl-device-simple.c
View File

@ -1414,6 +1414,7 @@ perform_update_test (MetaKmsImplDevice *impl_device,
MetaKmsCrtc *crtc = plane_assignment->crtc; MetaKmsCrtc *crtc = plane_assignment->crtc;
MetaDrmBuffer *buffer = plane_assignment->buffer; MetaDrmBuffer *buffer = plane_assignment->buffer;
CachedModeSet *cached_mode_set; CachedModeSet *cached_mode_set;
g_autoptr (GError) error = NULL;
if (!plane_assignment->crtc || if (!plane_assignment->crtc ||
!plane_assignment->buffer) !plane_assignment->buffer)
@ -1432,6 +1433,17 @@ perform_update_test (MetaKmsImplDevice *impl_device,
continue; continue;
} }
if (!meta_drm_buffer_ensure_fb_id (plane_assignment->buffer, &error))
{
MetaKmsPlaneFeedback *plane_feedback;
plane_feedback =
meta_kms_plane_feedback_new_take_error (plane, crtc,
g_steal_pointer (&error));
failed_planes = g_list_append (failed_planes, plane_feedback);
continue;
}
if (meta_drm_buffer_get_width (buffer) != cached_mode_set->width || if (meta_drm_buffer_get_width (buffer) != cached_mode_set->width ||
meta_drm_buffer_get_height (buffer) != cached_mode_set->height || meta_drm_buffer_get_height (buffer) != cached_mode_set->height ||
meta_drm_buffer_get_stride (buffer) != cached_mode_set->stride || meta_drm_buffer_get_stride (buffer) != cached_mode_set->stride ||