summaryrefslogtreecommitdiff
path: root/src/i830_sdvo.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@mandolin.keithp.com>2007-01-03 00:38:34 -0800
committerKeith Packard <keithp@mandolin.keithp.com>2007-01-03 00:38:34 -0800
commit232e2094321dbcdd6a67ef230eb50494a1c7d6df (patch)
tree175ad81e2fb8c21084d030156e00fd5a67c232ff /src/i830_sdvo.c
parent58e797b2caa6effa5455fc1f13dc4c58d0658744 (diff)
Allow initial position to be set in config file. Increase 965 max size.
Add relative and absolute position configuration code, using per-output monitor sections. Options include: PreferredMode selects a preferred mode for this output by name Position absolute position, x and y in a single string. Below relative positions; argument names other monitor. RightOf Above LeftOf Enable force the monitor to be disabled by setting Disable enable to no or disable to yes. MinClock Set valid clock ranges MaxClock Monitor sections can also include sync ranges, physical size and mode lines as documented in xorg.conf(5). Monitors are associated with outputs through options in the Device section: Option "monitor-VGA" "My VGA Monitor" Output named 'VGA' will use monitor section "My VGA Monitor".
Diffstat (limited to 'src/i830_sdvo.c')
-rw-r--r--src/i830_sdvo.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index b5116be0..19b4b934 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -1207,7 +1207,12 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int output_device)
}
strcpy (name, name_prefix);
strcat (name, name_suffix);
- xf86OutputRename (output, name);
+ if (!xf86OutputRename (output, name))
+ {
+ xf86OutputDestroy (output);
+ return;
+ }
+
/* Set the input timing to the screen. Assume always input 0. */
i830_sdvo_set_target_input(output, TRUE, FALSE);