summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2006-12-15 14:39:14 -0800
committerEric Anholt <eric@anholt.net>2006-12-19 09:46:35 -0800
commitd89e211b12ff715d7475421af69157b102accaca (patch)
tree9f1fa94eeb0a53d098b1b671da740e2e7c4f1cc9
parent3fc9feec7b29e0b908e3b90e0f6634117d66ba6d (diff)
Disable configure-disabled outputs before mode setting.
We're not supposed to turn off pipes/planes/dplls with outputs attached, which we could have done before this.
-rw-r--r--src/i830_driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 7da4bf55..09488ab6 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3173,6 +3173,8 @@ I830EnterVT(int scrnIndex, int flags)
ResetState(pScrn, FALSE);
SetHWOperatingState(pScrn);
+ i830DisableUnusedFunctions(pScrn);
+
for (i = 0; i < xf86_config->num_crtc; i++)
{
xf86CrtcPtr crtc = xf86_config->crtc[i];
@@ -3188,8 +3190,6 @@ I830EnterVT(int scrnIndex, int flags)
i830PipeSetBase(crtc, crtc->x, crtc->y);
}
- i830DisableUnusedFunctions(pScrn);
-
i830DumpRegs (pScrn);
i830DescribeOutputConfiguration(pScrn);