isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-27 13:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland/dma-buf: Add tranche priorities

Browse Source 
Unused for now, but will be added to prioritize scanout tranches higher
than render only ones.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1959>
This commit is contained in:
Jonas Ådahl 2021-08-06 16:20:14 +02:00 committed by Marge Bot
parent 9c942a43d6
commit 9a47766a96
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/wayland/meta-wayland-dma-buf.c
View File

@ -76,6 +76,12 @@ typedef enum _MetaWaylandDmaBufTrancheFlags
META_WAYLAND_DMA_BUF_TRANCHE_FLAG_SCANOUT = 1, META_WAYLAND_DMA_BUF_TRANCHE_FLAG_SCANOUT = 1,
} MetaWaylandDmaBufTrancheFlags; } MetaWaylandDmaBufTrancheFlags;
typedef enum _MetaWaylandDmaBufTranchePriority
{
META_WAYLAND_DMA_BUF_TRANCHE_PRIORITY_HIGH = 0,
META_WAYLAND_DMA_BUF_TRANCHE_PRIORITY_DEFAULT = 10,
} MetaWaylandDmaBufTranchePriority;
typedef struct _MetaWaylandDmaBufFormat typedef struct _MetaWaylandDmaBufFormat
{ {
uint32_t drm_format; uint32_t drm_format;
@ -85,6 +91,7 @@ typedef struct _MetaWaylandDmaBufFormat
typedef struct _MetaWaylandDmaBufTranche typedef struct _MetaWaylandDmaBufTranche
{ {
MetaWaylandDmaBufTranchePriority priority;
dev_t target_device_id; dev_t target_device_id;
GArray *formats; GArray *formats;
MetaWaylandDmaBufTrancheFlags flags; MetaWaylandDmaBufTrancheFlags flags;
@ -127,9 +134,25 @@ G_DEFINE_TYPE (MetaWaylandDmaBufBuffer, meta_wayland_dma_buf_buffer, G_TYPE_OBJE
G_DEFINE_TYPE (MetaWaylandDmaBufManager, meta_wayland_dma_buf_manager, G_DEFINE_TYPE (MetaWaylandDmaBufManager, meta_wayland_dma_buf_manager,
G_TYPE_OBJECT) G_TYPE_OBJECT)
static gint
compare_tranches (gconstpointer a,
gconstpointer b)
{
const MetaWaylandDmaBufTranche *tranche_a = a;
const MetaWaylandDmaBufTranche *tranche_b = b;
if (tranche_a->priority > tranche_b->priority)
return 1;
if (tranche_a->priority < tranche_b->priority)
return -1;
else
return 0;
}
static MetaWaylandDmaBufTranche * static MetaWaylandDmaBufTranche *
meta_wayland_dma_buf_tranche_new (dev_t device_id, meta_wayland_dma_buf_tranche_new (dev_t device_id,
GArray *formats, GArray *formats,
MetaWaylandDmaBufTranchePriority priority,
MetaWaylandDmaBufTrancheFlags flags) MetaWaylandDmaBufTrancheFlags flags)
{ {
MetaWaylandDmaBufTranche *tranche; MetaWaylandDmaBufTranche *tranche;
@ -137,6 +160,7 @@ meta_wayland_dma_buf_tranche_new (dev_t device_id,
tranche = g_new0 (MetaWaylandDmaBufTranche, 1); tranche = g_new0 (MetaWaylandDmaBufTranche, 1);
tranche->target_device_id = device_id; tranche->target_device_id = device_id;
tranche->formats = g_array_copy (formats); tranche->formats = g_array_copy (formats);
tranche->priority = priority;
tranche->flags = flags; tranche->flags = flags;
return tranche; return tranche;
@ -217,7 +241,8 @@ static void
meta_wayland_dma_buf_feedback_add_tranche (MetaWaylandDmaBufFeedback *feedback, meta_wayland_dma_buf_feedback_add_tranche (MetaWaylandDmaBufFeedback *feedback,
MetaWaylandDmaBufTranche *tranche) MetaWaylandDmaBufTranche *tranche)
{ {
feedback->tranches = g_list_append (feedback->tranches, tranche); feedback->tranches = g_list_insert_sorted (feedback->tranches, tranche,
compare_tranches);
} }
static MetaWaylandDmaBufFeedback * static MetaWaylandDmaBufFeedback *
@ -1053,15 +1078,18 @@ init_formats (MetaWaylandDmaBufManager *dma_buf_manager,
static void static void
init_default_feedback (MetaWaylandDmaBufManager *dma_buf_manager) init_default_feedback (MetaWaylandDmaBufManager *dma_buf_manager)
{ {
MetaWaylandDmaBufTranchePriority priority;
MetaWaylandDmaBufTrancheFlags flags; MetaWaylandDmaBufTrancheFlags flags;
MetaWaylandDmaBufTranche *tranche; MetaWaylandDmaBufTranche *tranche;
dma_buf_manager->default_feedback = dma_buf_manager->default_feedback =
meta_wayland_dma_buf_feedback_new (dma_buf_manager->main_device_id); meta_wayland_dma_buf_feedback_new (dma_buf_manager->main_device_id);
priority = META_WAYLAND_DMA_BUF_TRANCHE_PRIORITY_DEFAULT;
flags = META_WAYLAND_DMA_BUF_TRANCHE_FLAG_NONE; flags = META_WAYLAND_DMA_BUF_TRANCHE_FLAG_NONE;
tranche = meta_wayland_dma_buf_tranche_new (dma_buf_manager->main_device_id, tranche = meta_wayland_dma_buf_tranche_new (dma_buf_manager->main_device_id,
dma_buf_manager->formats, dma_buf_manager->formats,
priority,
flags); flags);
meta_wayland_dma_buf_feedback_add_tranche (dma_buf_manager->default_feedback, meta_wayland_dma_buf_feedback_add_tranche (dma_buf_manager->default_feedback,
tranche); tranche);