xf86-video-intel: Branch '2.7' - 3 commits - src/i830_memory.c src/i830_sdvo.c src/xvmc/Makefile.am

[Carl Worth]

 src/i830_memory.c    |    2 +-
 src/i830_sdvo.c      |    7 ++++++-
 src/xvmc/Makefile.am |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 490cb578aef761e3fdd0a559bec36cdab96e6b2a
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Tue Mar 10 20:16:03 2009 -0700

    Fix dist of xvmc sources
    
    The XVMC AM_CONDITIONAL is only needed around the library expression.
    None of the other definitons will cause anything to be built without
    libXvMC, but they're needed for 'make dist'.
    
    Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
    (cherry picked from commit 28e7f0d71fa09e15a68ab4f0de169474b6235093)

diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am
index 9e62683..a376eb7 100644
--- a/src/xvmc/Makefile.am
+++ b/src/xvmc/Makefile.am
@@ -1,5 +1,6 @@
 if XVMC
 lib_LTLIBRARIES=libI810XvMC.la libIntelXvMC.la
+endif
 
 libI810XvMC_la_SOURCES = I810XvMC.c \
 			 I810XvMC.h
@@ -123,4 +124,3 @@ BUILT_SOURCES= $(INTEL_G4B)
 clean-local:
 	-rm -f $(INTEL_G4B)
 endif
-endif
commit af97292c9df4e5178d5c8742f87ea8123d6e2243
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Tue Mar 10 14:21:36 2009 +0800

    SDVO: fix pixel multiplier setting for TV
    
    We should use preferred input timing's clock for correct
    pixel multiplier setting, otherwise we might get inconsistent
    multiplier setting on pipe and SDVO device for some modes.
    (cherry picked from commit 2fcf4fcccfe7cfa1425985d21a144137eca07f4e)

diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 1f2578e..baba007 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -1039,8 +1039,13 @@ i830_sdvo_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
 
 	    ErrorF("input modeline:\n");
 	    xf86PrintModeline(0, adjusted_mode);
+
+	    /* adjust origin mode's clock for current input,
+	       for correct pixel mulitiplier setting. */
+	    mode->Clock = adjusted_mode->Clock;
+
 	    /* Clock range is required to be in 100-200Mhz */
-	    adjusted_mode->Clock *= i830_sdvo_get_pixel_multiplier(adjusted_mode);
+	    adjusted_mode->Clock *= i830_sdvo_get_pixel_multiplier(mode);
 	} else {
 	    return FALSE;
 	}
commit 419499d622ba10177b760da5324f0507ac146e9a
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Mar 9 20:06:30 2009 -0700

    Fix XV with non-GEM kernels by allocating a larger fake bufmgr.
    
    Ideally we'd not be using the EXA offscreen memory manager and just hand all
    that memory to the fake bufmgr for non-GEM, but the fake bufmgr's too slow for
    that, at least currently.  So compromise and take enough memory that it will
    succeed at XV allocations but hopefully not anger tiny-aperture systems too
    much.
    
    Bug #20563.
    (cherry picked from commit fb6e00f40f713a87c760fc7603159ed11ea9b0d5)

diff --git a/src/i830_memory.c b/src/i830_memory.c
index 361fff7..e98c914 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -1445,7 +1445,7 @@ i830_allocate_2d_memory(ScrnInfoPtr pScrn)
 
     if (pI830->memory_manager == NULL) {
 	pI830->fake_bufmgr_mem = i830_allocate_memory(pScrn, "fake bufmgr",
-						      MB(1), PITCH_NONE, GTT_PAGE_SIZE, 0,
+						      MB(8), PITCH_NONE, GTT_PAGE_SIZE, 0,
 						      TILE_NONE);
 	if (pI830->fake_bufmgr_mem == NULL) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,