ChangeLog | 9 +++++++++
debian/changelog | 7 +++++++
src/i830_display.c | 3 ++-
3 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 19f97da808295502fde09a14f0200fb64795188e
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Wed Feb 6 21:30:36 2008 +0100
Prepare changelog for new upload
diff --git a/ChangeLog b/ChangeLog
index 2523b7e..d94a5bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+commit 2c8f87be99957e0e18d8bcda46bd8706ab374253
+Author: Jesse Barnes <[EMAIL PROTECTED]>
+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.
+
commit 0516e708abf01d1f83e2e8af9abe4c835ed79444
Author: Jesse Barnes <[EMAIL PROTECTED]>
Date: Tue Feb 5 17:39:26 2008 -0800
diff --git a/debian/changelog b/debian/changelog
index 39ed355..850e76c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.2.0.90-3) unstable; urgency=low
+
+ * Grab upstream commit 2c8f87be99957e0e18d8bcda46bd8706ab374253
+ to unbreak FramebufferCompression on i965.
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Wed, 06 Feb 2008 21:29:44 +0100
+
xserver-xorg-video-intel (2:2.2.0.90-2) unstable; urgency=low
* Actually pull the new upstream release candidate.
commit 2c8f87be99957e0e18d8bcda46bd8706ab374253
Author: Jesse Barnes <[EMAIL PROTECTED]>
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;
}
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
