xserver-xorg-video-intel: Changes to 'upstream-unstable'

[Brice Goglin <bgoglin@alioth.debian.org>]

 src/i830_display.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2c8f87be99957e0e18d8bcda46bd8706ab374253
Author: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date:   Wed Feb 6 09:35:43 2008 -0800

    Only disable FBC if registers are available
    
    The call to disable FBC should only occur if the FBC feature is actually
    present or we may end up hanging on a read from a non-existent register.

diff --git a/src/i830_display.c b/src/i830_display.c
index b8c7226..7a2520d 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -637,7 +637,8 @@ i830_use_fb_compression(xf86CrtcPtr crtc)
 
     /* Here we disable it to catch one->two pipe enabled configs */
     if (count > 1) {
-	i830_disable_fb_compression(crtc);
+	if (i830_fb_compression_supported(pI830))
+	    i830_disable_fb_compression(crtc);
 	return FALSE;
     }