xf86-video-intel: Branch 'xf86-video-intel-2.3-branch' - 3 commits - configure.ac src/i830_bios.c src/i830_display.c

[Zhenyu Wang]

 configure.ac       |    2 +-
 src/i830_bios.c    |    8 ++++----
 src/i830_display.c |    3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 21783ec9dfad9aae0837fd2d8eb313a77f031046
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Mon Mar 31 10:03:24 2008 +0800

    Bump version 2.2.99.902
    
    2.3-rc2

diff --git a/configure.ac b/configure.ac
index 871cd26..4439bca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-intel],
-        2.2.99.901,
+        2.2.99.902,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-intel)
 
commit ead2e3ff2b3f3c961d4d7a5b4c64ccd2f754d275
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Mon Mar 31 10:02:52 2008 +0800

    Use xfree() for bios memory

diff --git a/src/i830_bios.c b/src/i830_bios.c
index 0a28fb4..02837d2 100644
--- a/src/i830_bios.c
+++ b/src/i830_bios.c
@@ -270,7 +270,7 @@ i830_bios_get_aim_data_block (ScrnInfoPtr pScrn, int aim, int data_block)
     aim_off = vbt->aim_offset[aim];
     if (!aim_off)
     {
-	free (bios);
+	xfree (bios);
 	return NULL;
     }
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "aim_off %d\n", aim_off);
@@ -284,15 +284,15 @@ i830_bios_get_aim_data_block (ScrnInfoPtr pScrn, int aim, int data_block)
 	    unsigned char   *aim = malloc (aimdb_block->aimdb_size + sizeof (struct aimdb_block));
 	    if (!aim)
 	    {
-		free (bios);
+		xfree (bios);
 		return NULL;
 	    }
 	    memcpy (aim, aimdb_block, aimdb_block->aimdb_size + sizeof (struct aimdb_block));
-	    free (bios);
+	    xfree (bios);
 	    return aim;
 	}
 	bdb_off += aimdb_block->aimdb_size + sizeof (struct aimdb_block);
     }
-    free (bios);
+    xfree (bios);
     return NULL;
 }
commit 9835c2e987f4544206591f2f9c43e5a08e2e51bf
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Mar 29 14:27:35 2008 -0700

    Disable cursors while switching modes
    (cherry picked from commit 7dcb6e627449c80cea9812462ce6a3e125bd1240)

diff --git a/src/i830_display.c b/src/i830_display.c
index 5e52aac..6a2d1d7 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -901,9 +901,12 @@ i830_crtc_unlock (xf86CrtcPtr crtc)
 static void
 i830_crtc_prepare (xf86CrtcPtr crtc)
 {
+    I830CrtcPrivatePtr	intel_crtc = crtc->driver_private;
     /* Temporarily turn off FB compression during modeset */
     if (i830_use_fb_compression(crtc))
         i830_disable_fb_compression(crtc);
+    if (intel_crtc->enabled)
+	crtc->funcs->hide_cursor (crtc);
     crtc->funcs->dpms (crtc, DPMSModeOff);
 }