diff options
author | Jonas Ådahl <jadahl@gmail.com> | 2017-07-24 11:44:57 +0800 |
---|---|---|
committer | Jonas Ådahl <jadahl@gmail.com> | 2017-10-05 18:08:09 -0400 |
commit | 3244ed37a9f7666c6d74ab9158f768a73e1068df (patch) | |
tree | 691177874442908ae80e13933e9cd169d2888dbc | |
parent | 406359bba154e60aab2a14666eb5e183c1c0e1cf (diff) | |
download | mutter-3244ed37a9f7666c6d74ab9158f768a73e1068df.tar.gz |
cursor-rendere-native: Don't declare HW cursors broken on EACCES
Don't permanently fall back to OpenGL based cursor rendering when
setting the HW cursor fails with EACCES as that may happen on VT
switching and other things temporarily revoking fd access.
https://bugzilla.gnome.org/show_bug.cgi?id=785381
-rw-r--r-- | src/backends/native/meta-cursor-renderer-native.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/backends/native/meta-cursor-renderer-native.c b/src/backends/native/meta-cursor-renderer-native.c index 4ce7592b0..a12e706b4 100644 --- a/src/backends/native/meta-cursor-renderer-native.c +++ b/src/backends/native/meta-cursor-renderer-native.c @@ -201,11 +201,14 @@ set_crtc_cursor (MetaCursorRendererNative *native, priv->cursor_width, priv->cursor_height, hot_x, hot_y) < 0) { - g_warning ("drmModeSetCursor2 failed with (%s), " - "drawing cursor with OpenGL from now on", - strerror (errno)); - priv->has_hw_cursor = FALSE; - priv->hw_cursor_broken = TRUE; + if (errno != EACCES) + { + g_warning ("drmModeSetCursor2 failed with (%s), " + "drawing cursor with OpenGL from now on", + strerror (errno)); + priv->has_hw_cursor = FALSE; + priv->hw_cursor_broken = TRUE; + } } if (cursor_priv->pending_bo_state == META_CURSOR_GBM_BO_STATE_SET) |