summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2008-02-06 09:35:43 -0800
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2008-02-06 09:37:07 -0800
commit2c8f87be99957e0e18d8bcda46bd8706ab374253 (patch)
tree48cd75a155284136f82e1ce36bed882c31f4776c
parent0516e708abf01d1f83e2e8af9abe4c835ed79444 (diff)
downloadxorg-driver-xf86-video-intel-2c8f87be99957e0e18d8bcda46bd8706ab374253.tar.gz
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.
-rw-r--r--src/i830_display.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/i830_display.c b/src/i830_display.c
index b8c72260..7a2520d7 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;
}