brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kms/update: Make each MetaKmsUpdate update a single device

Browse Source 
For now feedbacks from an update are combined, meaning we might lose
error information. The feedback API may have to be reconsidered and
redesigned when planes gets a more front seat position.

This means we need to avoid trying to post updates if we're in power
save mode, as it may be empty.

Note that this is an intermediate state during refactoring that aims to
introduce atomic mode setting support, and we'll stop combining
feedbacks completely in the future.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1488>
This commit is contained in:
Jonas Ådahl
2020-07-16 23:38:10 +02:00
committed by Marge Bot
parent a7a1391de7
commit 37fe30c515
10 changed files with 221 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/backends/native/meta-cursor-renderer-native.c
View File

@ -383,7 +383,6 @@ typedef struct
MetaLogicalMonitor *in_logical_monitor;
graphene_rect_t in_local_cursor_rect;
MetaCursorSprite *in_cursor_sprite;
MetaKmsUpdate *in_kms_update;
gboolean out_painted;
} UpdateCrtcCursorData;
@ -401,6 +400,10 @@ update_monitor_crtc_cursor (MetaMonitor *monitor,
MetaCursorRendererNativePrivate *priv =
meta_cursor_renderer_native_get_instance_private (cursor_renderer_native);
MetaCrtc *crtc;
MetaGpuKms *gpu_kms;
MetaKmsDevice *kms_device;
MetaKms *kms;
MetaKmsUpdate *kms_update;
MetaMonitorTransform transform;
const MetaCrtcModeInfo *crtc_mode_info;
graphene_rect_t scaled_crtc_rect;
@ -446,6 +449,10 @@ update_monitor_crtc_cursor (MetaMonitor *monitor,
};
crtc = meta_output_get_assigned_crtc (monitor_crtc_mode->output);
gpu_kms = META_GPU_KMS (meta_crtc_get_gpu (crtc));
kms_device = meta_gpu_kms_get_kms_device (gpu_kms);
kms = meta_kms_device_get_kms (kms_device);
kms_update = meta_kms_ensure_pending_update (kms, kms_device);
if (priv->has_hw_cursor &&
graphene_rect_intersection (&scaled_crtc_rect,
@ -487,7 +494,7 @@ update_monitor_crtc_cursor (MetaMonitor *monitor,
&cursor_rect);
set_crtc_cursor (data->in_cursor_renderer_native,
data->in_kms_update,
kms_update,
META_CRTC_KMS (crtc),
cursor_rect.x,
cursor_rect.y,
@ -498,7 +505,7 @@ update_monitor_crtc_cursor (MetaMonitor *monitor,
else
{
unset_crtc_cursor (data->in_cursor_renderer_native,
data->in_kms_update,
kms_update,
META_CRTC_KMS (crtc));
}
@ -533,15 +540,12 @@ update_hw_cursor (MetaCursorRendererNative *native,
MetaKms *kms = meta_backend_native_get_kms (backend_native);
MetaMonitorManager *monitor_manager =
meta_backend_get_monitor_manager (backend);
MetaKmsUpdate *kms_update;
GList *logical_monitors;
GList *l;
graphene_rect_t rect;
gboolean painted = FALSE;
g_autoptr (MetaKmsFeedback) feedback = NULL;
kms_update = meta_kms_ensure_pending_update (kms);
if (cursor_sprite)
rect = meta_cursor_renderer_calculate_rect (renderer, cursor_sprite);
else
@ -567,7 +571,6 @@ update_hw_cursor (MetaCursorRendererNative *native,
.size = rect.size
},
.in_cursor_sprite = cursor_sprite,
.in_kms_update = kms_update,
};
monitors = meta_logical_monitor_get_monitors (logical_monitor);
@ -586,7 +589,7 @@ update_hw_cursor (MetaCursorRendererNative *native,
painted = painted || data.out_painted;
}
feedback = meta_kms_post_pending_update_sync (kms);
feedback = meta_kms_post_pending_updates_sync (kms);
if (meta_kms_feedback_get_result (feedback) != META_KMS_FEEDBACK_PASSED)
{
for (l = meta_kms_feedback_get_failed_planes (feedback); l; l = l->next)