xf86-video-intel: src/drmmode_display.c

[Chris Wilson]

 src/drmmode_display.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit e1b7e8bf1d475b3d00adcb96e6002c20c9e70d1c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue May 11 15:50:23 2010 +0100

    drmmode: Reorder i830_set_pixmap_bo() so that the correct stride is used.
    
    The pitch needs to be set on the pixmap prior to the private
    intel_pixmap structure being created so that it can record the correct
    value from the pixmap.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index cd0787e..d4cf367 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1290,10 +1290,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
 		goto fail;
 
 	pixmap = screen->GetScreenPixmap(screen);
-	i830_set_pixmap_bo(pixmap, intel->front_buffer);
-	assert (i830_get_pixmap_intel(pixmap)->stride == pitch);
-
 	screen->ModifyPixmapHeader(pixmap, width, height, -1, -1, pitch, NULL);
+	i830_set_pixmap_bo(pixmap, intel->front_buffer);
 
 	for (i = 0; i < xf86_config->num_crtc; i++) {
 		xf86CrtcPtr crtc = xf86_config->crtc[i];