From: Jonas Ådahl <jadahl@gmail.com>
Date: Tue, 24 Apr 2018 09:26:33 +0000 (+0000)
Subject: native/gpu: Handle drmModeSetCrtc() failing gracefully
X-Git-Tag: archive/raspbian/3.28.3-2+rpi1^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c619285b8d8fe31b69d7ae42766c8ed88f93c00c;p=mutter.git

native/gpu: Handle drmModeSetCrtc() failing gracefully

If drmModeSetCrtc() is called with no fb, mode or connectors for some
CRTC it may still fail, and we should handle that gracefully instead of
assuming it failed to set a non-disabled state.

Closes https://gitlab.gnome.org/GNOME/mutter/issues/70


(cherry picked from commit 6e953e2725d5d5b10d14c7bd479bd99f6853addc)

Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/70
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1754949
Applied-Upstream: https://gitlab.gnome.org/GNOME/mutter/commit/44682a2cc555

Gbp-Pq: Name native-gpu-Handle-drmModeSetCrtc-failing-gracefully.patch
---

diff --git a/src/backends/native/meta-gpu-kms.c b/src/backends/native/meta-gpu-kms.c
index 259cd71..1d1c288 100644
--- a/src/backends/native/meta-gpu-kms.c
+++ b/src/backends/native/meta-gpu-kms.c
@@ -143,7 +143,10 @@ meta_gpu_kms_apply_crtc_mode (MetaGpuKms *gpu_kms,
                       connectors, n_connectors,
                       mode) != 0)
     {
-      g_warning ("Failed to set CRTC mode %s: %m", crtc->current_mode->name);
+      if (mode)
+        g_warning ("Failed to set CRTC mode %s: %m", crtc->current_mode->name);
+      else
+        g_warning ("Failed to disable CRTC");
       g_free (connectors);
       return FALSE;
     }