summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@guitar.keithp.com>2006-12-19 21:53:10 -0800
committerKeith Packard <keithp@guitar.keithp.com>2006-12-19 21:53:10 -0800
commitc28075e1d70c98b39fc9829a6a01da171a9b9426 (patch)
treeaee2eb4bac5ae35aa58247a21ccbf219aa4f591a
parent2ef4c5e8f6444aad192304e5a2f7a0c77bfb917d (diff)
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.
-rw-r--r--src/i830_tv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_tv.c b/src/i830_tv.c
index af9826b0..68527934 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;