summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2017-06-22 12:38:55 +0900
committerMichel Dänzer <michel@daenzer.net>2017-06-27 11:59:08 +0900
commitc9dd28cb0c9c3de676eadac61e727732510f6b9b (patch)
tree11b0fa175933f4f6d52fa27b817f9a032d450abc
parent78fad9ca1635cca04b89807e3db029477cf46681 (diff)
Only call drmmode_scanout_free for non-GPU screens in LeaveVT
Destroying the scanout buffers of GPU screens resulted in a crash when switching back to the Xorg VT. Fixes: 4cfa4615f79f ("Use drmmode_crtc_scanout_* helpers for RandR 1.4 scanout pixmaps") Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--src/radeon_kms.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index c4bdfcfa..5637e7f8 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -2478,7 +2478,8 @@ void RADEONLeaveVT_KMS(VT_FUNC_ARGS_DECL)
radeon_drop_drm_master(pScrn);
xf86RotateFreeShadow(pScrn);
- drmmode_scanout_free(pScrn);
+ if (!pScrn->is_gpu)
+ drmmode_scanout_free(pScrn);
xf86_hide_cursors (pScrn);
info->accel_state->XInited3D = FALSE;