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

[Eric Anholt]

 src/Makefile.am   |    3 +--
 src/i830_driver.c |    3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 9d8e5c21a1688b915bf39261d4c3b0bf2906daef
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Feb 24 14:05:15 2009 -0800

    Fix distcheck from drmmode_display.h deletion.

diff --git a/src/Makefile.am b/src/Makefile.am
index 3fb30ff..cbe9fb1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -136,8 +136,7 @@ intel_drv_la_SOURCES = \
 	 i830_render.c \
 	 i915_render.c \
 	 i965_render.c \
-	 drmmode_display.c \
-	 drmmode_display.h
+	 drmmode_display.c
 
 INTEL_G4A =				\
 	packed_yuv_sf.g4a		\
commit f4e2f522a5c5b03ea530b9eb67e9d1a9a96274ce
Author: Eric Anholt <eric at anholt.net>
Date:   Sat Feb 21 20:36:58 2009 -0800

    Don't do AdjustFrame in KMS mode.
    
    This was hit by xv86vm's SwitchMode path, and for that the CRTC offsets
    get set at mode setting time anyway.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 0a8a9c6..2461e8a 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3488,6 +3488,9 @@ i830AdjustFrame(int scrnIndex, int x, int y, int flags)
    DPRINTF(PFX, "i830AdjustFrame: y = %d (+ %d), x = %d (+ %d)\n",
 	   x, pI830->xoffset, y, pI830->yoffset);
 
+   if (pI830->use_drm_mode)
+      return;
+
    if (crtc && crtc->enabled)
    {
       /* Sync the engine before adjust frame */