xf86-video-intel: src/intel_display.c

[Chris Wilson]

 src/intel_display.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 8abade8a2139b500251488be5d6390f149666fb2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Dec 5 09:55:43 2010 +0000

    display: Flush any pending batches before changing modes.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_display.c b/src/intel_display.c
index b5ccfe9..bb8d708 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -442,6 +442,8 @@ intel_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 	crtc->y = y;
 	crtc->rotation = rotation;
 
+	intel_batch_submit(crtc->scrn, TRUE);
+
 	mode_to_kmode(crtc->scrn, &intel_crtc->kmode, mode);
 	ret = intel_crtc_apply(crtc);
 	if (!ret) {
@@ -1349,6 +1351,8 @@ intel_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
 	if (scrn->virtualX == width && scrn->virtualY == height)
 		return TRUE;
 
+	intel_batch_submit(scrn, TRUE);
+
 	old_width = scrn->virtualX;
 	old_height = scrn->virtualY;
 	old_pitch = scrn->displayWidth;