[PATCH] Fix Xorg abort on exit in RHEL 7.7+

Grigorev, Slava Slava.Grigorev at amd.com
Tue Sep 10 19:47:30 UTC 2019


RHEL adds an extra LeaveVT calls to xf86CrtcCloseScreen when they build X server
for the purpose to drop drm master.

Signed-off-by: Slava Grigorev <slava.grigorev at amd.com>
---
 src/amdgpu_kms.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 3280972..9efc482 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -2285,7 +2285,9 @@ void AMDGPULeaveVT_KMS(ScrnInfoPtr pScrn)
 				struct drmmode_fb *black_fb =
 					amdgpu_pixmap_get_fb(black_scanout.pixmap);
 
-				amdgpu_pixmap_clear(black_scanout.pixmap);
+				if (!dixPrivateKeyRegistered(rrPrivKey))
+					amdgpu_pixmap_clear(black_scanout.pixmap);
+
 				amdgpu_glamor_finish(pScrn);
 
 				for (i = 0; i < xf86_config->num_crtc; i++) {
-- 
2.17.1



More information about the amd-gfx mailing list