xf86-video-intel: Branch 'intel-kernelmode' - 3 commits - src/i830_driver.c

[Jesse Barnes]

 src/i830_driver.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

New commits:
commit 7c83e843b1b96052009a13903cb2fdec0d66419d
Author: Jesse Barnes <jbarnes at jbarnes-t61.(none)>
Date:   Wed Jun 18 14:07:15 2008 -0700

    Use KD_TEXT mode with kernel mode setting
    
    This allows messages to be printed to the hidden fbcon while X is running.
    That way of a panic or other switch back to the fbcon occurs, we'll see what
    happened.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 4109d88..f1f798f 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -178,6 +178,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
 #include "xf86RAC.h"
+#include "xf86Priv.h"
 #include "xf86cmap.h"
 #include "compiler.h"
 #include "mibstore.h"
@@ -1044,6 +1045,12 @@ i830SetHotkeyControl(ScrnInfoPtr pScrn, int mode)
 }
 
 #ifdef XF86DRM_MODE
+/*
+ * DRM mode setting Linux only at this point... later on we could
+ * add a wrapper here.
+ */
+#include <linux/kd.h>
+
 static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
 {
 #if XSERVER_LIBPCIACCESS
@@ -1068,6 +1075,8 @@ static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
    if (ret)
      return FALSE;
 
+   ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
+
    return TRUE;
 }
 #else
@@ -2682,6 +2691,10 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	   pI830->fb_compression = FALSE;
    }
 
+#ifdef XF86DRM_MODE
+	   pI830->fb_compression = FALSE;
+#endif
+
    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Framebuffer compression %sabled\n",
 	      pI830->fb_compression ? "en" : "dis");
    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Tiling %sabled\n", pI830->tiling ?
commit c36125b82fe8e72964c2ccab3c3dc35bacb28768
Merge: b61e1ec... 95fb4ac...
Author: Jesse Barnes <jbarnes at jbarnes-t61.(none)>
Date:   Wed Jun 18 11:09:41 2008 -0700

    Merge branch 'intel-kernelmode' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel into intel-kernelmode

commit b61e1ec4a7c6a1a2ce4e9fc833866ffb124b8955
Author: Hong Liu <hong.liu at intel.com>
Date:   Fri May 9 10:32:27 2008 +0800

    fix G33 hw status page alloc
    
    driver can only use TTM to allocate gfx memory in drm modeset, so we have to
    setup G33 hw status page in drm kernel module.

diff --git a/src/common.h b/src/common.h
index 7100b4e..47bcf92 100644
--- a/src/common.h
+++ b/src/common.h
@@ -450,7 +450,8 @@ extern int I810_DEBUG;
 /* mark chipsets for using gfx VM offset for overlay */
 #define OVERLAY_NOPHYSICAL(pI810) (IS_G33CLASS(pI810))
 /* chipsets require graphics mem for hardware status page */
-#define HWS_NEED_GFX(pI810) (IS_G33CLASS(pI810) || IS_IGD_GM(pI810))
+#define HWS_NEED_GFX(pI810) (!pI810->use_drm_mode &&\
+			     (IS_G33CLASS(pI810) || IS_IGD_GM(pI810)))
 
 #define GTT_PAGE_SIZE			KB(4)
 #define ROUND_TO(x, y)			(((x) + (y) - 1) / (y) * (y))