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

[Jesse Barnes]

 src/i830_driver.c |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 253b8db298f38676e47dc902534465054f7b58b8
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Wed Jan 21 09:02:13 2009 -0800

    Don't run in KD_TEXT mode even with KMS
    
    Leaving the VT in KD_TEXT mode keeps the kernel's blanking code active,
    so when a DPMS event happens, the fb console is restored rather than X's
    configuration.  On the downside it means the kernel won't print messages
    in the background, which would be visible if a panic or emergency switch
    occurred.  The proper fix here is a new kernel mode, which we can move
    to when ready.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 4a9b9d0..bf5ecc4 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1226,10 +1226,6 @@ i830SetHotkeyControl(ScrnInfoPtr pScrn, int mode)
  * DRM mode setting Linux only at this point... later on we could
  * add a wrapper here.
  */
-#ifdef __linux__
-#include <linux/kd.h>
-#endif
-
 static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
 {
 #if XSERVER_LIBPCIACCESS
@@ -1254,10 +1250,6 @@ static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
     if (ret)
 	return FALSE;
 
-#ifdef __linux__
-    ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
-#endif
-
     return TRUE;
 }
 #else
commit 131b414feb2ecabe31b538d65725ac4427a4387a
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Wed Jan 21 09:01:05 2009 -0800

    Tear down batchbuffers unconditionally on LeaveVT
    
    Even if KMS is enabled we should do this, to avoid running batches that
    depend on other state we tear down in LeaveVT.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 7b66a53..4a9b9d0 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3581,7 +3581,6 @@ I830LeaveVT(int scrnIndex, int flags)
 	*/
        if (!pI830->memory_manager)
 	   intel_bufmgr_fake_evict_all(pI830->bufmgr);
-       intel_batch_teardown(pScrn);
 
        if (!pI830->memory_manager)
 	   i830_stop_ring(pScrn, TRUE);
@@ -3592,6 +3591,8 @@ I830LeaveVT(int scrnIndex, int flags)
        }
    }
 
+   intel_batch_teardown(pScrn);
+
    if (I830IsPrimary(pScrn))
       i830_unbind_all_memory(pScrn);