xf86-video-intel: 2 commits - src/i830_display.c src/i830_driver.c

[Zhenyu Wang]

 src/i830_display.c |    1 +
 src/i830_driver.c  |   19 +++++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 7e79fc8aa93df4df37c25cf37ee0ec6c7caca1d9
Author: Zhenyu Wang <zhenyuw at linux.intel.com>
Date:   Tue Jun 30 15:40:34 2009 +0800

    Fix 945GM VT switch in UMS
    
    Bug #19578. We should set private intel_crtc state according
    to current, as fail to do so pipe A needs active won't be taken
    care of. Also make sure pipe swap operation always set during
    VT switch.
    
    Signed-off-by: Zhenyu Wang <zhenyuw at linux.intel.com>

diff --git a/src/i830_display.c b/src/i830_display.c
index a7eafb9..26874c5 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -1257,6 +1257,7 @@ i830_crtc_dpms(xf86CrtcPtr crtc, int mode)
 	if ((pipe == 0) && (pI830->quirk_flag & QUIRK_PIPEA_FORCE))
 	    disable_pipe = FALSE;
 	i830_crtc_disable(crtc, disable_pipe);
+	intel_crtc->enabled = FALSE;
 	break;
     }
 
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 45a8aee..c125a73 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2786,9 +2786,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
    }
    i830_init_bufmgr(pScrn);
 
-   if (!pI830->use_drm_mode)
-       I830SwapPipes(pScrn);
-
    pScrn->fbOffset = pI830->front_buffer->offset;
 
    if (!pI830->use_drm_mode) {
@@ -3077,6 +3074,9 @@ I830EnterVT(int scrnIndex, int flags)
 
    /* Get the hardware into a known state if needed */
    if (!pI830->use_drm_mode) {
+
+       I830SwapPipes(pScrn);
+
        /* Disable outputs */
        for (i = 0; i < xf86_config->num_output; i++) {
 	   xf86OutputPtr   output = xf86_config->output[i];
commit 50392ac8234d643c8a99e1753bdb196c0062a891
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Mon May 18 13:53:33 2009 +0800

    Load fbcon too if kernel mode setting is checked on
    
    If i915 module has already been loaded and kms check is true,
    it would be nice to load fbcon module too.
    
    Signed-off-by: Zhenyu Wang <zhenyu.z.wang at intel.com>

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 40255cd..45a8aee 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1012,14 +1012,13 @@ static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
     busIdString = DRICreatePCIBusID(PciInfo);
 
     ret = drmCheckModesettingSupported(busIdString);
-    if (ret)
-	if (xf86LoadKernelModule("i915")) {
+    if (ret) {
+	if (xf86LoadKernelModule("i915"))
 	    ret = drmCheckModesettingSupported(busIdString);
-
-	    /* Be nice to the user and load fbcon too */
-	    if (!ret)
-		(void) xf86LoadKernelModule("fbcon");
-	}
+    }
+    /* Be nice to the user and load fbcon too */
+    if (!ret)
+	(void) xf86LoadKernelModule("fbcon");
     xfree(busIdString);
     if (ret)
 	return FALSE;