[Precise] (pre-stable) SRU: #974830 -- GPU lockup using Oracle sqldeveloper (et al)

[Timo Aaltonen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


SRU justification:

Impact: fixes hangs with sandybridge

Fix: framebuffer compression for sandybridge got disabled upstream in
v3.3, and is queued for 3.2 stable

Testcase: many Java apps (like Oracle sqldeveloper) can trigger a
hang, but there are a number of freeze bugs filed, no idea how many of
those get fixed by disabling FBC

so, please cherry-pick this upstream commit, and if in any way
possible consider adding it to the one currently in -proposed, since
this has been upstream for two releases now and our SNB users are
suffering..

Buglink: https://bugs.launchpad.net/bugs/974830
Signed-off-by: Timo Aaltonen <tjaalton at ubuntu.com>

- ---
commit d56d8b28e9247e7e35e02fbb12b12239a2c33ad1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Nov 8 23:17:34 2011 +0000

    drm/i915:: Disable FBC on SandyBridge

    Enabling FBC is causing the BLT ring to run between 10-100x slower
than
    normal and frequently lockup. The interim solution is disable FBC once
    more until we know why.

    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index b3b51c4..19f35ec 100644
- --- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1872,7 +1872,7 @@ static void intel_update_fbc(struct drm_device *dev)
        if (enable_fbc < 0) {
                DRM_DEBUG_KMS("fbc set to per-chip default\n");
                enable_fbc = 1;
- -               if (INTEL_INFO(dev)->gen <= 5)
+               if (INTEL_INFO(dev)->gen <= 6)
                        enable_fbc = 0;
        }
        if (!enable_fbc) {


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJP0Kp/AAoJEMtwMWWoiYTciNgP/39l6WHp2k/ZymDf0mx+b28b
SMH6xGYGsRwQU21ekcsXp1tFYfDUl5uTm9JgtK+DXW+oHcWUBea7lp5nxJc+jdLT
idXMB290vo2/qKlbUbXSMt9VY7QRQqBJ2rU9W+rd+dvp83NNJ2knUiB3TOu5NOxf
jdbqcs79eWrae9o53Wp2eqh2fHMCRFEL6+eGG/ViGQuSGOAmmGfqzmJiT3yEKQWV
5kOMPeSSvPZ85feV2X0sdeCzGAEu17H5qTf0iZrjnr7OPfYdUArLli41xjCXteov
/KS105BnbeD0/zLJZFuR9VaRfyZzgCAc5MZ8uYAr++NjYdnT/xniGN8PNmcHD33v
CCnn6oc/c1xbl8wSk8GK17isD8GG6Y02Y5n410sNLc4ftTSwJX1zJ8fCQ3wyjTIz
Z8NN8rFFBD+Vw6gzwmUPioOXtJJ0EYfNDXzrboMx0rKHi7zAgzLf2kgK1cyAkwCC
6y2qUzD1yA/zLrlS0GGR12ZIvW377qHa03+9vAb1HpXMC+PPFhfU9A8Cr6mi2oSE
TDKpesUBx5xgFLHQGIL4XXsYH82ZmIrZB83DeHSFGMLgvdgY5+odrv69z3skKUjk
K7i64w2OGy84CN5alNjsYC2b58Mm6rtpsu6x3FbCOuHCCJ+l+t5Tig08ATWXzcYc
xDH1cPRZUJ1byhjNJ5v5
=e3ba
-----END PGP SIGNATURE-----