diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-28 12:02:32 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-28 12:02:32 +0100 |
| commit | 93e77ee019248fe77483e83f2210d584bb5d1be2 (patch) | |
| tree | 57f859b6b19b98789a9a5cf47565927113f7d097 | |
| parent | 85e4f48a87ddbc227af8f4af5ea46ae17902b111 (diff) | |
sna: Quieten kernel debug complaints when disabling crtc
Even if we are obviously turning the crtc off, it still complains if the
number of connectors is non-zero. So make it so.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_display.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index b7c5a408..fed7411d 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -488,11 +488,12 @@ sna_crtc_apply(xf86CrtcPtr crtc) sna_crtc->kmode.vdisplay, sna_crtc->id, sna_crtc->pipe); - DBG(("%s: applying crtc [%d] mode=%dx%d@%d, fb=%d%s update to %d outputs\n", + DBG(("%s: applying crtc [%d] mode=%dx%d+%d+%d@%d, fb=%d%s update to %d outputs\n", __FUNCTION__, sna_crtc->id, - sna_crtc->kmode.hdisplay, - sna_crtc->kmode.vdisplay, - sna_crtc->kmode.clock, + arg.mode.hdisplay, + arg.mode.vdisplay, + arg.x, arg.y, + arg.mode.clock, arg.fb_id, sna_crtc->shadow ? " [shadow]" : "", output_count)); @@ -593,10 +594,8 @@ sna_crtc_disable(xf86CrtcPtr crtc) DBG(("%s: disabling crtc [%d]\n", __FUNCTION__, sna_crtc->id)); - VG_CLEAR(arg); + memset(&arg, 0, sizeof(arg)); arg.crtc_id = sna_crtc->id; - arg.fb_id = 0; - arg.mode_valid = 0; (void)drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_SETCRTC, &arg); sna_crtc_disable_shadow(sna, sna_crtc); |