From 07cdc60be8ebe5d0c21149f3cd2aeb8fed05022a Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Wed, 4 Oct 2006 11:05:30 +0100 Subject: Fix bug #5795, VT switching fails because of a bad test on some platforms. --- src/i830_driver.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) (limited to 'src') diff --git a/src/i830_driver.c b/src/i830_driver.c index 9c86fe53..a69a9a3a 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2620,37 +2620,15 @@ static Bool I830Set640x480(ScrnInfoPtr pScrn) { I830Ptr pI830 = I830PTR(pScrn); - int m = 0x30; /* 640x480 8bpp */ + int m; - switch (pScrn->depth) { - case 15: - m = 0x40; - break; - case 16: - m = 0x41; - break; - case 24: - m = 0x50; - break; - } - - m |= (1 << 15) | (1 << 14); + /* 640x480 8bpp */ + m = 0x30 | (1 << 15) | (1 << 14); if (VBESetVBEMode(pI830->pVbe, m, NULL)) return TRUE; - /* if the first failed, let's try the next - usually 800x600 */ - m = 0x32; - switch (pScrn->depth) { - case 15: - case 16: - m = 0x42; - break; - case 24: - m = 0x52; - break; - } - m |= (1 << 15) | (1 << 14); + m = 0x32 | (1 << 15) | (1 << 14); if (VBESetVBEMode(pI830->pVbe, m, NULL)) return TRUE; -- cgit v1.2.3