kms/impl-device: Always catch pending KMS update in _schedule_process
Not only if the deadline timer is enabled. With the next commit, it'll be semi-expected to happen even if the deadline timer is disabled. Still leave the warning though, as a reminder that we'd rather prevent this outside of the KMS thread. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4338>
This commit is contained in:
parent
ca3f155ff8
commit
6297a19fa4
@ -2081,17 +2081,8 @@ meta_kms_impl_device_schedule_process (MetaKmsImplDevice *impl_device,
|
||||
|
||||
if (ensure_deadline_timer_armed (impl_device, crtc_frame))
|
||||
return;
|
||||
|
||||
if (crtc_frame->pending_update)
|
||||
{
|
||||
meta_kms_impl_device_do_process_update (impl_device, crtc_frame,
|
||||
crtc_frame->crtc,
|
||||
crtc_frame->pending_update,
|
||||
META_KMS_UPDATE_FLAG_NONE);
|
||||
}
|
||||
}
|
||||
|
||||
if (crtc_frame->pending_update)
|
||||
else if (crtc_frame->pending_update)
|
||||
{
|
||||
MetaKmsImplDevicePrivate *priv =
|
||||
meta_kms_impl_device_get_instance_private (impl_device);
|
||||
@ -2100,6 +2091,14 @@ meta_kms_impl_device_schedule_process (MetaKmsImplDevice *impl_device,
|
||||
crtc_frame->pending_update, priv->deadline_timer_state);
|
||||
}
|
||||
|
||||
if (crtc_frame->pending_update)
|
||||
{
|
||||
meta_kms_impl_device_do_process_update (impl_device, crtc_frame,
|
||||
crtc_frame->crtc,
|
||||
crtc_frame->pending_update,
|
||||
META_KMS_UPDATE_FLAG_NONE);
|
||||
}
|
||||
|
||||
meta_kms_device_set_needs_flush (meta_kms_crtc_get_device (crtc), crtc);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user