isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-30 20:01:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

monitor: Use current monitor mode to check whether active

Browse Source 
For historical reasons meta_monitor_is_active() checked whether it is
active by checking whether the main output have a CRTC assigned and
whether that CRTC has a current mode. At a later point, the MetaMonitor
got its own mode abstraction (MetaMonitorMode), but
meta_monitor_is_active() was never updated to use this.

An issue with checking the main output's CRTC state is that, if there is
some CRTC mode combination that for some reason isn't properly detected
by the MetaMonitorMode abstraction (e.g. some tiling configuration not
yet handled), meta_monitor_is_active() would return TRUE, even though no
(abstracted) mode was set. This would cause confusion here and there,
leading to NULL pointer dereferences due to the assumption that if a
monitor is active, it has an active mode.

Instead, change meta_monitor_is_active() to directly check the current
monitor mode, and log a warning if the main output still happen to have
a CRTC with a mode assigned to it. This way, when an not undrestood CRTC
mode combination is encountered, instead of dereferencing NULL pointers,
simply assume the monitor is not active, which means that it will not be
managed or rendered by mutter at all.

https://gitlab.gnome.org/GNOME/mutter/issues/130

(cherry picked from commit 4d465eac08)
This commit is contained in:
Jonas Ådahl 2018-07-31 11:18:51 +00:00 committed by Ray Strode
parent c8552cf160
commit 4e57e4c4f8
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backends/meta-monitor.c
View File

@ -203,13 +203,9 @@ meta_monitor_get_main_output (MetaMonitor *monitor)
gboolean gboolean
meta_monitor_is_active (MetaMonitor *monitor) meta_monitor_is_active (MetaMonitor *monitor)
{ {
MetaOutput *output; MetaMonitorPrivate *priv = meta_monitor_get_instance_private (monitor);
MetaCrtc *crtc;
output = meta_monitor_get_main_output (monitor); return !!priv->current_mode;
crtc = meta_output_get_assigned_crtc (output);
return crtc && crtc->current_mode;
} }
gboolean gboolean
@ -1411,6 +1407,18 @@ meta_monitor_get_current_mode (MetaMonitor *monitor)
return priv->current_mode; return priv->current_mode;
} }
static gboolean
is_current_mode_known (MetaMonitor *monitor)
{
MetaOutput *output;
MetaCrtc *crtc;
output = meta_monitor_get_main_output (monitor);
crtc = meta_output_get_assigned_crtc (output);
return meta_monitor_is_active (monitor) == (crtc && crtc->current_mode);
}
void void
meta_monitor_derive_current_mode (MetaMonitor *monitor) meta_monitor_derive_current_mode (MetaMonitor *monitor)
{ {
@ -1430,6 +1438,8 @@ meta_monitor_derive_current_mode (MetaMonitor *monitor)
} }
priv->current_mode = current_mode; priv->current_mode = current_mode;
g_warn_if_fail (is_current_mode_known (monitor));
} }
void void