summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2009-01-21 09:02:13 -0800
committerEric Anholt <eric@anholt.net>2009-01-21 11:50:19 -0800
commit52d3c64f2b896966b934d647765674303a8dfa29 (patch)
tree598cd98886d520cda2ea8740ba629e366697864e
parent11c23dd22a737aaa52ef18cd65164da9c5115d3f (diff)
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. (cherry picked from commit 253b8db298f38676e47dc902534465054f7b58b8)
-rw-r--r--src/i830_driver.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 247425c1..92f1554f 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1131,10 +1131,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
@@ -1159,10 +1155,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