xf86-video-intel: 2 commits - configure.ac src/i830_driver.c src/i830_exa.c

[Eric Anholt]

 configure.ac      |    2 +-
 src/i830_driver.c |    6 +++---
 src/i830_exa.c    |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 81c652e9a666a7459bcc5217c8a5ec518b6e00da
Author: Helge Bahmann <helge.bahmann at secunet.com>
Date:   Sat Feb 21 10:10:04 2009 -0800

    Move disable_render_standby to EnterVT instead of startup.
    
    Otherwise, with a pre-2.6.28 older kernel the disable would be lost at
    resume time and cause hangs.
    
    Bug #20214

diff --git a/src/i830_driver.c b/src/i830_driver.c
index e7ca6b0..0a8a9c6 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3304,9 +3304,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	   return FALSE;
    }
 
-   if (!pI830->use_drm_mode)
-       i830_disable_render_standby(pScrn);
-
    DPRINTF(PFX, "assert( if(!I830EnterVT(scrnIndex, 0)) )\n");
 
    if (pI830->accel <= ACCEL_XAA) {
@@ -3638,6 +3635,9 @@ I830EnterVT(int scrnIndex, int flags)
 
    pI830->leaving = FALSE;
 
+   if (!pI830->use_drm_mode)
+       i830_disable_render_standby(pScrn);
+
 #ifdef XF86DRI
    if (pI830->memory_manager && !pI830->use_drm_mode) {
       int ret;
commit 0621ba12a3b694720e67a49b25ca52f0e09b3802
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Feb 18 13:32:44 2009 -0800

    uxa: Ask for BOs ready for rendering for pixmaps.
    
    The assumption is that we're almost always accelerating our drawing to
    new pixmaps (fill, copy, etc.).

diff --git a/configure.ac b/configure.ac
index 38d373e..a6ced67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,7 +207,7 @@ if test "x$GCC" = "xyes"; then
 	-Wnested-externs -fno-strict-aliasing"
 fi
 
-PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.3])
+PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.5])
 AM_CONDITIONAL(DRI, test x$DRI = xyes)
 if test "$DRI" = yes; then
         PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
diff --git a/src/i830_exa.c b/src/i830_exa.c
index ebc6624..b878402 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -900,7 +900,7 @@ i830_uxa_create_pixmap (ScreenPtr screen, int w, int h, int depth, unsigned usag
 	 */
 	size = i830_get_fence_size(i830, stride * h);
 
-	bo = dri_bo_alloc (i830->bufmgr, "pixmap", size, 0);
+	bo = drm_intel_bo_alloc_for_render(i830->bufmgr, "pixmap", size, 0);
 	if (!bo) {
 	    fbDestroyPixmap (pixmap);
 	    return NullPixmap;