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

crtc/kms: Dynamically assign primary and cursor planes

Browse Source 
When there are a set of primary planes, and a set of CRTCs, where each
plane can be used on multiple CRTCs, we need to make sure that when we
mode set and page flip, each CRTC gets assigned an individual plane that
isn't used with any other CRTC.

Do this during the monitor resource assignments that sets up later to be
applied configurations of the mode setting objects, but with the new
hooks into the backend, so that we don't need to teach the monitor
config manager about planes.

Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2398
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3428>
This commit is contained in:
Jonas Ådahl
2023-11-28 22:06:33 +01:00
committed by Marge Bot
parent 48145a91f9
commit cc7bca073b
5 changed files with 167 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/backends/native/meta-kms-cursor-manager.c
View File

@ -45,6 +45,7 @@ typedef struct _CrtcStateImpl
MetaKmsCursorManagerImpl *cursor_manager_impl;
MetaKmsCrtc *crtc;
MetaKmsPlane *cursor_plane;
graphene_rect_t layout;
float scale;
MetaMonitorTransform transform;
@ -97,6 +98,7 @@ find_crtc_state (MetaKmsCursorManagerImpl *cursor_manager_impl,
static CrtcStateImpl *
crtc_state_impl_new (MetaKmsCursorManagerImpl *cursor_manager_impl,
MetaKmsCrtc *crtc,
MetaKmsPlane *cursor_plane,
graphene_rect_t layout,
float scale,
MetaDrmBuffer *buffer)
@ -107,6 +109,7 @@ crtc_state_impl_new (MetaKmsCursorManagerImpl *cursor_manager_impl,
g_atomic_ref_count_init (&crtc_state_impl->ref_count);
crtc_state_impl->cursor_manager_impl = cursor_manager_impl;
crtc_state_impl->crtc = crtc;
crtc_state_impl->cursor_plane = cursor_plane;
crtc_state_impl->layout = layout;
crtc_state_impl->scale = scale;
crtc_state_impl->buffer = buffer;
@ -365,7 +368,7 @@ maybe_update_cursor_plane (MetaKmsCursorManagerImpl *cursor_manager_impl,
meta_kms_update_realize (update, impl_device);
}
cursor_plane = meta_kms_device_get_cursor_plane_for (device, crtc);
cursor_plane = crtc_state_impl->cursor_plane;
if (should_have_cursor)
{
@ -838,6 +841,7 @@ update_viewports_in_impl (MetaThreadImpl *thread_impl,
crtc_state_impl =
crtc_state_impl_new (cursor_manager_impl,
crtc_layout->crtc,
crtc_layout->cursor_plane,
crtc_layout->layout,
crtc_layout->scale,
g_steal_pointer (&old_crtc_state->buffer));
@ -847,6 +851,7 @@ update_viewports_in_impl (MetaThreadImpl *thread_impl,
crtc_state_impl =
crtc_state_impl_new (cursor_manager_impl,
crtc_layout->crtc,
crtc_layout->cursor_plane,
crtc_layout->layout,
crtc_layout->scale,
NULL);