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

backends/crtc: Keep a pointer to the monitor manager

Browse Source 
Instead of passing it around or fetching the singleton, keep a pointer
to the monitor manager that owns the CRTC. This will eventually be
replaced with a per GPU/graphics card object.

https://bugzilla.gnome.org/show_bug.cgi?id=785381
This commit is contained in:
Jonas Ådahl 2017-07-04 15:58:44 +08:00
parent 7ea01693a7
commit cfee58798e
6 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backends/meta-crtc.c
View File

@ -25,6 +25,12 @@ G_DEFINE_TYPE (MetaCrtc, meta_crtc, G_TYPE_OBJECT)
G_DEFINE_TYPE (MetaCrtcMode, meta_crtc_mode, G_TYPE_OBJECT) G_DEFINE_TYPE (MetaCrtcMode, meta_crtc_mode, G_TYPE_OBJECT)
MetaMonitorManager *
meta_crtc_get_monitor_manager (MetaCrtc *crtc)
{
return crtc->monitor_manager;
}
static void static void
meta_crtc_finalize (GObject *object) meta_crtc_finalize (GObject *object)
{ {

4
src/backends/meta-crtc.h
View File

@ -50,6 +50,8 @@ struct _MetaCrtc
{ {
GObject parent; GObject parent;
MetaMonitorManager *monitor_manager;
glong crtc_id; glong crtc_id;
MetaRectangle rect; MetaRectangle rect;
MetaCrtcMode *current_mode; MetaCrtcMode *current_mode;
@ -91,4 +93,6 @@ G_DECLARE_FINAL_TYPE (MetaCrtc, meta_crtc, META, CRTC, GObject)
#define META_TYPE_CRTC_MODE (meta_crtc_mode_get_type ()) #define META_TYPE_CRTC_MODE (meta_crtc_mode_get_type ())
G_DECLARE_FINAL_TYPE (MetaCrtcMode, meta_crtc_mode, META, CRTC_MODE, GObject) G_DECLARE_FINAL_TYPE (MetaCrtcMode, meta_crtc_mode, META, CRTC_MODE, GObject)
MetaMonitorManager * meta_crtc_get_monitor_manager (MetaCrtc *crtc);
#endif /* META_CRTC_H */ #endif /* META_CRTC_H */

1
src/backends/meta-monitor-manager-dummy.c
View File

@ -218,6 +218,7 @@ append_tiled_monitor (MetaMonitorManager *manager,
MetaCrtc *crtc; MetaCrtc *crtc;
crtc = g_object_new (META_TYPE_CRTC, NULL); crtc = g_object_new (META_TYPE_CRTC, NULL);
crtc->monitor_manager = manager;
crtc->crtc_id = g_list_length (*crtcs) + i + 1; crtc->crtc_id = g_list_length (*crtcs) + i + 1;
crtc->all_transforms = ALL_TRANSFORMS; crtc->all_transforms = ALL_TRANSFORMS;
new_crtcs = g_list_append (new_crtcs, crtc); new_crtcs = g_list_append (new_crtcs, crtc);

1
src/backends/native/meta-monitor-manager-kms.c
View File

@ -422,6 +422,7 @@ create_crtc (MetaMonitorManager *manager,
crtc = g_object_new (META_TYPE_CRTC, NULL); crtc = g_object_new (META_TYPE_CRTC, NULL);
crtc->monitor_manager = manager;
crtc->crtc_id = drm_crtc->crtc_id; crtc->crtc_id = drm_crtc->crtc_id;
crtc->rect.x = drm_crtc->x; crtc->rect.x = drm_crtc->x;
crtc->rect.y = drm_crtc->y; crtc->rect.y = drm_crtc->y;

1
src/backends/x11/meta-monitor-manager-xrandr.c
View File

@ -833,6 +833,7 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
crtc = g_object_new (META_TYPE_CRTC, NULL); crtc = g_object_new (META_TYPE_CRTC, NULL);
crtc->monitor_manager = manager;
crtc->crtc_id = resources->crtcs[i]; crtc->crtc_id = resources->crtcs[i];
crtc->rect.x = xrandr_crtc->x; crtc->rect.x = xrandr_crtc->x;
crtc->rect.y = xrandr_crtc->y; crtc->rect.y = xrandr_crtc->y;

2
src/tests/meta-monitor-manager-test.c
View File

@ -97,6 +97,8 @@ meta_monitor_manager_test_read_current (MetaMonitorManager *manager)
for (l = manager_test->test_setup->outputs; l; l = l->next) for (l = manager_test->test_setup->outputs; l; l = l->next)
META_OUTPUT (l->data)->monitor_manager = manager; META_OUTPUT (l->data)->monitor_manager = manager;
for (l = manager_test->test_setup->crtcs; l; l = l->next)
META_CRTC (l->data)->monitor_manager = manager;
manager->modes = manager_test->test_setup->modes; manager->modes = manager_test->test_setup->modes;