summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2015-06-16 17:34:57 +0900
committerMichel Dänzer <michel@daenzer.net>2015-06-25 16:46:44 +0900
commitacc11877423ecd81a6e0a7f38466f80e43efee20 (patch)
tree95aea0440f4880ddaf9d70635f4e0a079816fde8
parentfc9fadaebbc8aead6e030d93a9ccd84561f8f59e (diff)
Skip disabled CRTCs in radeon_scanout_(do_)update
The vblank / page flip ioctls don't work as expected for a disabled CRTC. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--src/radeon_kms.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 12658ca7..ec8f51cb 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -338,7 +338,8 @@ radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id)
RADEONInfoPtr info;
Bool force;
- if (drmmode_crtc->dpms_mode != DPMSModeOn ||
+ if (!xf86_crtc->enabled ||
+ drmmode_crtc->dpms_mode != DPMSModeOn ||
!drmmode_crtc->scanout[scanout_id].pixmap)
return FALSE;
@@ -409,7 +410,8 @@ radeon_scanout_update(xf86CrtcPtr xf86_crtc)
DrawablePtr pDraw;
BoxRec extents;
- if (drmmode_crtc->scanout_update_pending ||
+ if (!xf86_crtc->enabled ||
+ drmmode_crtc->scanout_update_pending ||
!drmmode_crtc->scanout[0].pixmap ||
drmmode_crtc->dpms_mode != DPMSModeOn)
return;