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

[Keith Packard]

 src/i830_tv.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree c28075e1d70c98b39fc9829a6a01da171a9b9426 (from 2ef4c5e8f6444aad192304e5a2f7a0c77bfb917d)
Author: Keith Packard <keithp at guitar.keithp.com>
Date:   Tue Dec 19 21:53:10 2006 -0800

    TV output I830OutputPrivate had wrong type (crashed in SetMode).
    
    TV output private type field was set to I830_OUTPUT_SDVO instead of
    I830_OUTPUT_TVOUT. When DGA mode setting occurred, the sdvo output debug
    code would be invoked and attempt to dereference sdvo-specific bits of the
    private structure leading to a segfault.

diff --git a/src/i830_tv.c b/src/i830_tv.c
index af9826b..6852793 100644
--- a/src/i830_tv.c
+++ b/src/i830_tv.c
@@ -774,7 +774,7 @@ i830_tv_init(ScrnInfoPtr pScrn)
 	return;
     }
     dev_priv = (struct i830_tv_priv *) (intel_output + 1);
-    intel_output->type = I830_OUTPUT_SDVO;
+    intel_output->type = I830_OUTPUT_TVOUT;
     intel_output->dev_priv = dev_priv;
     dev_priv->type = TV_TYPE_UNKNOWN;