[mutter] backends: Use fallback rotation if native DRM plane rotation failed
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] backends: Use fallback rotation if native DRM plane rotation failed
- Date: Fri, 7 Oct 2016 15:29:34 +0000 (UTC)
commit e3dab707542cf3e528e4b4aa816d39e5cab0360a
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Oct 7 16:52:43 2016 +0200
backends: Use fallback rotation if native DRM plane rotation failed
Blacklist the HW mode so we fallback gracefully to our own paths.
https://bugzilla.gnome.org/show_bug.cgi?id=772512
src/backends/native/meta-monitor-manager-kms.c | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/src/backends/native/meta-monitor-manager-kms.c b/src/backends/native/meta-monitor-manager-kms.c
index 2db7495..9daa010 100644
--- a/src/backends/native/meta-monitor-manager-kms.c
+++ b/src/backends/native/meta-monitor-manager-kms.c
@@ -1357,11 +1357,19 @@ meta_monitor_manager_kms_apply_configuration (MetaMonitorManager *manager,
else
hw_transform = META_MONITOR_TRANSFORM_NORMAL;
- drmModeObjectSetProperty (manager_kms->fd,
- crtc_kms->primary_plane_id,
- DRM_MODE_OBJECT_PLANE,
- crtc_kms->rotation_prop_id,
- crtc_kms->rotation_map[hw_transform]);
+ if (drmModeObjectSetProperty (manager_kms->fd,
+ crtc_kms->primary_plane_id,
+ DRM_MODE_OBJECT_PLANE,
+ crtc_kms->rotation_prop_id,
+ crtc_kms->rotation_map[hw_transform]) != 0)
+ {
+ g_warning ("Failed to apply DRM plane transform: %m", hw_transform);
+
+ /* Blacklist this HW transform, we want to fallback to our
+ * fallbacks in this case.
+ */
+ crtc_kms->all_hw_transforms &= ~(1 << hw_transform);
+ }
}
/* Disable CRTCs not mentioned in the list (they have is_dirty == FALSE,
because they weren't seen in the first loop) */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]