xf86-video-intel: Branch 'modesetting' - src/i830_driver.c

[Eric Anholt]

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

New commits:
diff-tree 854ff826c0031a44e874239c0b0a3533f4d9e14b (from d51555fba4e57c059fd184c1e54822d7e5b62a2f)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Nov 14 09:14:24 2006 -0800

    Disable setup of the second SDVO device until we fix it.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 1f3ff0a..344f4c0 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -651,7 +651,13 @@ I830SetupOutputs(ScrnInfoPtr pScrn)
 
    if (IS_I9XX(pI830)) {
       i830_sdvo_init(pScrn, SDVOB);
-      i830_sdvo_init(pScrn, SDVOC);
+
+      /* Don't initialize the second SDVO port for now.  We have issues with
+       * dealing with two ports, where we stomp both SDVO channels' registers
+       * when interacting with each, channel, and commands to one SDVO
+       * device appear to be affecting the other.
+       */
+      /* i830_sdvo_init(pScrn, SDVOC); */
    } else {
       i830_dvo_init(pScrn);
    }