xf86-video-intel: 3 commits - src/i830_driver.c src/i830_exa.c src/i830_memory.c

[Dave Airlie]

 src/i830_driver.c |    4 ++--
 src/i830_exa.c    |    2 +-
 src/i830_memory.c |    5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit b710a688a7383df320f9d4e765b48331310a4d1d
Author: Dave Airlie <airlied at linux.ie>
Date:   Mon Dec 29 12:50:25 2008 +1000

    intel/kms: disable overlay when it needs physical address
    
    We can't do phy address allocations, need kernel support for this.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/i830_memory.c b/src/i830_memory.c
index ca15964..2053d06 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -1074,8 +1074,11 @@ i830_allocate_overlay(ScrnInfoPtr pScrn)
     if (OVERLAY_NOEXIST(pI830))
 	return TRUE;
 
-    if (!OVERLAY_NOPHYSICAL(pI830))
+    if (!OVERLAY_NOPHYSICAL(pI830)) {
+	if (pI830->use_drm_mode)
+            return TRUE;
 	flags |= NEED_PHYSICAL_ADDR;
+    }
 
     pI830->overlay_regs = i830_allocate_memory(pScrn, "overlay registers",
 					       OVERLAY_SIZE, GTT_PAGE_SIZE,
commit 649374b88b330838133d78be1953ce8b18ddd2c6
Author: Dave Airlie <airlied at linux.ie>
Date:   Mon Dec 29 12:48:11 2008 +1000

    intel: don't call enter/leave VT for KMS enabled systems
    
    Signed-off-by: Dave Airlie <airlied at linux.ie>

diff --git a/src/i830_driver.c b/src/i830_driver.c
index d3b539a..6fed32d 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3587,7 +3587,7 @@ I830LeaveVT(int scrnIndex, int flags)
       i830_unbind_all_memory(pScrn);
 
 #ifdef XF86DRI
-   if (pI830->memory_manager) {
+   if (pI830->memory_manager && !pI830->use_drm_mode) {
       int ret;
 
       /* Tell the kernel to evict all buffer objects and block GTT usage while
@@ -3630,7 +3630,7 @@ I830EnterVT(int scrnIndex, int flags)
    pI830->leaving = FALSE;
 
 #ifdef XF86DRI
-   if (pI830->memory_manager) {
+   if (pI830->memory_manager && !pI830->use_drm_mode) {
       int ret;
 
       /* Tell the kernel that we're back in control and ready for GTT
commit 408f7139354a942f29334795b5480a0b6bb6142a
Author: Dave Airlie <airlied at linux.ie>
Date:   Mon Dec 29 12:47:30 2008 +1000

    exa: fix map gtt call to use current API

diff --git a/src/i830_exa.c b/src/i830_exa.c
index df2a5ab..636aa0a 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -540,7 +540,7 @@ static Bool I830EXAPrepareAccess(PixmapPtr pPix, int index)
 	I830Sync(scrn);
 	i830->need_sync = FALSE;
     }
-    if (dri_gem_bo_map_gtt(driver_priv->bo)) {
+    if (drm_intel_gem_bo_map_gtt(driver_priv->bo)) {
 	xf86DrvMsg(scrn->scrnIndex, X_WARNING, "%s: bo map failed\n",
 		   __FUNCTION__);
 	return FALSE;