diff options
| author | Eric Anholt <eric@anholt.net> | 2007-02-13 13:10:08 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-02-13 13:10:08 -0800 |
| commit | 699fa88d2570de6173e2d866e11b7437f4842d74 (patch) | |
| tree | 9fada28156ca1da9e3846e328d77e07da4491c4c /src/i830_driver.c | |
| parent | 681b91924c364a1c00732f548539f2767929ba0e (diff) | |
| parent | 6641aec0a1cbc869fba1956c556cdd204631545a (diff) | |
Merge branch 'modesetting-origin' into modesetting
Diffstat (limited to 'src/i830_driver.c')
| -rw-r--r-- | src/i830_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 0f663115..cb3dd878 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1332,10 +1332,10 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) } I830PreInitDDC(pScrn); - I830SetupOutputs(pScrn); for (i = 0; i < num_pipe; i++) { i830_crtc_init(pScrn, i); } + I830SetupOutputs(pScrn); SaveHWState(pScrn); /* Do an initial detection of the outputs while none are configured on yet. |