From 7f6cafa8472e754309ca45f43f272d4990442656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 15 Jan 2020 17:17:33 +0100
Subject: [PATCH] logical-monitor: Pass monitor in the for each CRTC helper
 callback

Will be used in later commits.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/1042
---
 src/backends/meta-logical-monitor.c        | 1 +
 src/backends/meta-logical-monitor.h        | 1 +
 src/backends/native/meta-renderer-native.c | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/src/backends/meta-logical-monitor.c b/src/backends/meta-logical-monitor.c
index 580db8194..3f98de2cd 100644
--- a/src/backends/meta-logical-monitor.c
+++ b/src/backends/meta-logical-monitor.c
@@ -242,6 +242,7 @@ foreach_crtc (MetaMonitor         *monitor,
   ForeachCrtcData *data = user_data;
 
   data->func (data->logical_monitor,
+              monitor,
               monitor_crtc_mode->output,
               meta_output_get_assigned_crtc (monitor_crtc_mode->output),
               data->user_data);
diff --git a/src/backends/meta-logical-monitor.h b/src/backends/meta-logical-monitor.h
index 4532e654c..8cddc6b05 100644
--- a/src/backends/meta-logical-monitor.h
+++ b/src/backends/meta-logical-monitor.h
@@ -63,6 +63,7 @@ G_DECLARE_FINAL_TYPE (MetaLogicalMonitor, meta_logical_monitor,
                       GObject)
 
 typedef void (* MetaLogicalMonitorCrtcFunc) (MetaLogicalMonitor *logical_monitor,
+                                             MetaMonitor        *monitor,
                                              MetaOutput         *output,
                                              MetaCrtc           *crtc,
                                              gpointer            user_data);
diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
index 57597ce8d..68dabe91d 100644
--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@@ -601,6 +601,7 @@ typedef struct _GetSupportedKmsFormatsData
 
 static void
 get_supported_kms_formats_crtc_func (MetaLogicalMonitor *logical_monitor,
+                                     MetaMonitor        *monitor,
                                      MetaOutput         *output,
                                      MetaCrtc           *crtc,
                                      gpointer            user_data)
@@ -1619,6 +1620,7 @@ typedef struct _SetCrtcModeData
 
 static void
 set_crtc_mode (MetaLogicalMonitor *logical_monitor,
+               MetaMonitor        *monitor,
                MetaOutput         *output,
                MetaCrtc           *crtc,
                gpointer            user_data)
@@ -1677,6 +1679,7 @@ typedef struct _FlipCrtcData
 
 static void
 flip_crtc (MetaLogicalMonitor *logical_monitor,
+           MetaMonitor        *monitor,
            MetaOutput         *output,
            MetaCrtc           *crtc,
            gpointer            user_data)