xf86-video-intel: Branch 'intel-kernelmode' - src/drmmode_display.c src/i830_memory.c

[Dave Airlie]

 src/drmmode_display.c |    2 +-
 src/i830_memory.c     |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e3dc00196267ef4ffe9e03b0841f67b9650eb57f
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu May 8 16:43:44 2008 +1000

    intel: only set size for rotated buffer on non-modesetting driver
    
    also don't resize is size the same (not sure this will ever happen)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 1551691..e725a15 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -630,7 +630,7 @@ static Bool drmmode_resize_fb(ScrnInfoPtr scrn, drmmode_ptr drmmode, int width,
 
 	ErrorF("current width %d height %d\n", drmmode->mode_fb->width, drmmode->mode_fb->height);
 
-	if (drmmode->mode_fb->width == width)
+	if (drmmode->mode_fb->width == width && drmmode->mode_fb->height == height)
 		return TRUE;
 
 	if (!drmmode->create_new_fb)
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 54811ef..dda51ae 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -1165,7 +1165,8 @@ i830_allocate_framebuffer(ScrnInfoPtr pScrn, I830Ptr pI830, BoxPtr FbMemBox,
     /* We'll allocate the fb such that the root window will fit regardless of
      * rotation.
      */
-    if (pScrn->virtualX > pScrn->virtualY)
+
+    if (!pI830->use_drm_mode && pScrn->virtualX > pScrn->virtualY)
 	fb_height = pScrn->virtualX;
     else
 	fb_height = pScrn->virtualY;