sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

kms/update: Add flags to plane assignment

Browse source 
Currently unused, but will used to let the implementation know when it
can avoid setting the plane content (i.e. not call drmModeSetCursor()).

https://gitlab.gnome.org/GNOME/mutter/merge_requests/930
This commit is contained in:
Jonas Ådahl 2019-11-08 23:54:43 +01:00
parent c1fc46e3db
commit 01bab81727
4 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/backends/native/meta-crtc-kms.c
View file

@ -83,6 +83,7 @@ meta_crtc_kms_assign_primary_plane (MetaCrtc *crtc,
int x, y; int x, y;
MetaFixed16Rectangle src_rect; MetaFixed16Rectangle src_rect;
MetaFixed16Rectangle dst_rect; MetaFixed16Rectangle dst_rect;
MetaKmsAssignPlaneFlag flags;
MetaKmsCrtc *kms_crtc; MetaKmsCrtc *kms_crtc;
MetaKmsDevice *kms_device; MetaKmsDevice *kms_device;
MetaKmsPlane *primary_kms_plane; MetaKmsPlane *primary_kms_plane;
@ -105,6 +106,8 @@ meta_crtc_kms_assign_primary_plane (MetaCrtc *crtc,
.height = meta_fixed_16_from_int (crtc->rect.height), .height = meta_fixed_16_from_int (crtc->rect.height),
}; };
flags = META_KMS_ASSIGN_PLANE_FLAG_NONE;
kms_crtc = meta_crtc_kms_get_kms_crtc (crtc); kms_crtc = meta_crtc_kms_get_kms_crtc (crtc);
kms_device = meta_kms_crtc_get_device (kms_crtc); kms_device = meta_kms_crtc_get_device (kms_crtc);
primary_kms_plane = meta_kms_device_get_primary_plane_for (kms_device, primary_kms_plane = meta_kms_device_get_primary_plane_for (kms_device,
@ -114,7 +117,8 @@ meta_crtc_kms_assign_primary_plane (MetaCrtc *crtc,
primary_kms_plane, primary_kms_plane,
fb_id, fb_id,
src_rect, src_rect,
dst_rect); dst_rect,
flags);
meta_crtc_kms_apply_transform (crtc, plane_assignment); meta_crtc_kms_apply_transform (crtc, plane_assignment);
} }

1
src/backends/native/meta-kms-update-private.h
View file

@ -40,6 +40,7 @@ typedef struct _MetaKmsPlaneAssignment
uint32_t fb_id; uint32_t fb_id;
MetaFixed16Rectangle src_rect; MetaFixed16Rectangle src_rect;
MetaFixed16Rectangle dst_rect; MetaFixed16Rectangle dst_rect;
MetaKmsAssignPlaneFlag flags;
GList *plane_properties; GList *plane_properties;
} MetaKmsPlaneAssignment; } MetaKmsPlaneAssignment;

14
src/backends/native/meta-kms-update.c
View file

@ -75,12 +75,13 @@ meta_kms_mode_set_free (MetaKmsModeSet *mode_set)
} }
MetaKmsPlaneAssignment * MetaKmsPlaneAssignment *
meta_kms_update_assign_plane (MetaKmsUpdate *update, meta_kms_update_assign_plane (MetaKmsUpdate *update,
MetaKmsCrtc *crtc, MetaKmsCrtc *crtc,
MetaKmsPlane *plane, MetaKmsPlane *plane,
uint32_t fb_id, uint32_t fb_id,
MetaFixed16Rectangle src_rect, MetaFixed16Rectangle src_rect,
MetaFixed16Rectangle dst_rect) MetaFixed16Rectangle dst_rect,
MetaKmsAssignPlaneFlag flags)
{ {
MetaKmsPlaneAssignment *plane_assignment; MetaKmsPlaneAssignment *plane_assignment;
@ -94,6 +95,7 @@ meta_kms_update_assign_plane (MetaKmsUpdate *update,
.fb_id = fb_id, .fb_id = fb_id,
.src_rect = src_rect, .src_rect = src_rect,
.dst_rect = dst_rect, .dst_rect = dst_rect,
.flags = flags,
}; };
update->plane_assignments = g_list_prepend (update->plane_assignments, update->plane_assignments = g_list_prepend (update->plane_assignments,

18
src/backends/native/meta-kms-update.h
View file

@ -29,6 +29,11 @@
#include "backends/native/meta-kms-types.h" #include "backends/native/meta-kms-types.h"
#include "meta/boxes.h" #include "meta/boxes.h"
typedef enum _MetaKmsAssignPlaneFlag
{
META_KMS_ASSIGN_PLANE_FLAG_NONE = 0,
} MetaKmsAssignPlaneFlag;
struct _MetaKmsPageFlipFeedback struct _MetaKmsPageFlipFeedback
{ {
void (* flipped) (MetaKmsCrtc *crtc, void (* flipped) (MetaKmsCrtc *crtc,
@ -59,12 +64,13 @@ void meta_kms_update_mode_set (MetaKmsUpdate *update,
GList *connectors, GList *connectors,
drmModeModeInfo *drm_mode); drmModeModeInfo *drm_mode);
MetaKmsPlaneAssignment * meta_kms_update_assign_plane (MetaKmsUpdate *update, MetaKmsPlaneAssignment * meta_kms_update_assign_plane (MetaKmsUpdate *update,
MetaKmsCrtc *crtc, MetaKmsCrtc *crtc,
MetaKmsPlane *plane, MetaKmsPlane *plane,
uint32_t fb_id, uint32_t fb_id,
MetaFixed16Rectangle src_rect, MetaFixed16Rectangle src_rect,
MetaFixed16Rectangle dst_rect); MetaFixed16Rectangle dst_rect,
MetaKmsAssignPlaneFlag flags);
MetaKmsPlaneAssignment * meta_kms_update_unassign_plane (MetaKmsUpdate *update, MetaKmsPlaneAssignment * meta_kms_update_unassign_plane (MetaKmsUpdate *update,
MetaKmsCrtc *crtc, MetaKmsCrtc *crtc,