From b65f67b74ff99aea1490d52f170ef4fe80cef6c7 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 5 Jun 2008 13:40:55 -0700
Subject: [PATCH] Move the remaining two lines of SetHWOperatingState to the
 caller.

---
 src/i830_driver.c | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/i830_driver.c b/src/i830_driver.c
index ba0b8a78..efc3630c 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1965,22 +1965,6 @@ i830_set_dsparb(ScrnInfoPtr pScrn)
    }
 }
 
-/*
- * This should be called everytime the X server gains control of the screen,
- * before any video modes are programmed (ScreenInit, EnterVT).
- */
-static void
-SetHWOperatingState(ScrnInfoPtr pScrn)
-{
-   I830Ptr pI830 = I830PTR(pScrn);
-
-   DPRINTF(PFX, "SetHWOperatingState\n");
-
-   i830_start_ring(pScrn);
-   if (!pI830->SWCursor)
-      I830InitHWCursor(pScrn);
-}
-
 enum pipe {
     PIPE_A = 0,
     PIPE_B,
@@ -3380,7 +3364,9 @@ I830EnterVT(int scrnIndex, int flags)
    }
 
    i830_stop_ring(pScrn, FALSE);
-   SetHWOperatingState(pScrn);
+   i830_start_ring(pScrn);
+   if (!pI830->SWCursor)
+      I830InitHWCursor(pScrn);
 
    /* Set the DSPARB register.  This disables the outputs, which is about to
     * happen (likely) in xf86SetDesiredModes anyway.