xf86-video-intel: src/i830_driver.c

[Alan Hourihane]

 src/i830_driver.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

New commits:
diff-tree 995b142f510d1daab3914d336f3c0d017a043b41 (from 8e5844bbf9c8880c9eb6eff29b6db2db06b01933)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Tue Aug 8 12:01:39 2006 +0100

    Disable detecting of new monitors on VT switch.
    It's doesn't always work. The modesetting
    branch will deal with hotplug displays correctly.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 84fb21a..94a2c8f 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -7765,9 +7765,13 @@ I830BIOSEnterVT(int scrnIndex, int flags
    ResetState(pScrn, FALSE);
    SetHWOperatingState(pScrn);
 
-   /* Detect monitor change and switch to suitable mode */
+#if 0
+   /* Disable this as it's clunky, and doesn't always work.
+    * The modesetting branch will deal with hotplug displays much better.
+    */
    if (!pI830->starting)
       I830DetectMonitorChange(pScrn);
+#endif
 	    
    if (!I830VESASetMode(pScrn, pScrn->currentMode))
       return FALSE;