32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From e262c8ae0039710422c11ae254ddb4ae7e6fac02 Mon Sep 17 00:00:00 2001
|
|
From: Adam Jackson <ajax@redhat.com>
|
|
Date: Fri, 5 Oct 2018 14:03:54 -0400
|
|
Subject: [PATCH xserver 2/4] modesetting: Propagate more failure in
|
|
drmmode_set_mode_major
|
|
|
|
It's possible that actually setting the mode would fail even though the
|
|
check succeeded. We would throw away the error in this case, which would
|
|
probably make recovery a bit difficult.
|
|
|
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
---
|
|
hw/xfree86/drivers/modesetting/drmmode_display.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
|
|
index a8d989a24..33f6cea3b 100644
|
|
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
|
|
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
|
|
@@ -1540,7 +1540,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
|
|
|
|
/* if we only tested the mode previously, really set it now */
|
|
if (can_test)
|
|
- drmmode_crtc_set_mode(crtc, FALSE);
|
|
+ ret = drmmode_crtc_set_mode(crtc, FALSE);
|
|
ms->pending_modeset = FALSE;
|
|
}
|
|
|
|
--
|
|
2.20.1
|
|
|