diff options
| author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-07-07 10:15:32 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-07-07 10:15:32 -0700 |
| commit | bf831117b4659cc4f2774098dee938505f780a9b (patch) | |
| tree | 627823ca5638f14cc19bc6b2f815b1bcae1a6c40 /src/i830_display.c | |
| parent | b426866fe1be2ad3861559beff69186379a6afad (diff) | |
FBC fixes:
- allow FBC and Tiling to be forced off if configured to do so
- only touch FBC registers if pI830->fb_compression is true
Diffstat (limited to 'src/i830_display.c')
| -rw-r--r-- | src/i830_display.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/i830_display.c b/src/i830_display.c index 853f4e40..f3b5c50a 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -747,7 +747,7 @@ i830_disable_fb_compression(xf86CrtcPtr crtc) ScrnInfoPtr pScrn = crtc->scrn; I830Ptr pI830 = I830PTR(pScrn); uint32_t fbc_ctl; - char pipe = (INREG(FBC_CONTROL2) & 1) ? 'b' : 'a';; + char pipe = (INREG(FBC_CONTROL2) & 1) ? 'b' : 'a'; /* Disable compression */ fbc_ctl = INREG(FBC_CONTROL); @@ -764,7 +764,8 @@ static void i830_crtc_prepare (xf86CrtcPtr crtc) { /* Temporarily turn off FB compression during modeset */ - i830_disable_fb_compression(crtc); + if (i830_use_fb_compression(crtc)) + i830_disable_fb_compression(crtc); crtc->funcs->dpms (crtc, DPMSModeOff); } |