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

[Brad Figg]

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

On 06/07/2012 06:19 AM, Timo Aaltonen wrote:
> 
> 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) {
> 
> 
> 

- -- 
Brad Figg brad.figg at canonical.com http://www.canonical.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJP0QnTAAoJEAx7WJsQW+f3oqEP/22EAlmjhEBDquA6lhMuKx93
bD2YMmIHgqJL2eB47yZ9uHfqjNPCHHSMotvh48LLDL/+6k/v7p+w5j90W7d13hu/
7+zIlgiMCLchPvIWSA4JZlUNS5/0rgk6IDhICVzEuGPF3RsOCkd/Nh5hwU6OwjAl
t11T6+ix1un+zysBimaEm9Hgf9QygsfKA2L2bigFBZpQop10qQrWc9LK9lN6sjTL
+PNY+Wh7iF9ZGtfeSEavOLxunOZleDKNvf5xJmBIAwqn2tQ1FqR5K2IFKO8zM/VK
a+Esh0dCnCY4dy8rkziLfm/xBnoyoR0pF/vLddHoqMD/s+pJCTG5fqLzy1Ln9qWx
mMKpoel9SyiWHZpATsj6AgAgOogwevnLmOZvnuXq/Zbdnf1lG8j3RhW2nxMDVkeb
+T4657kOGp7ddrYc4sIXhtT+fJg+R9mRW2Ox9VJVFRKcHzrOlIp55EGtKELbVM2L
pmxuOIjHrhGOWDM+pzm5kc0MY4FS3ogbd+ITL/CurfM8iB2XN5dEp5tMOQ8Spxy2
Y5hpF/9fJsu/KoQGaotEPuaBPDdAQjzP/GDZrpDXfp6wxMHSf6Lp6jITXumCrfML
4sKgLHRw3uNuD7dNka4IPBmSOyCJ4PuByHyV30RmSPpsXbrj+3iAGEmfvKm4o4eW
YfZVCdDqaOZMx7Qi+YS0
=4dZa
-----END PGP SIGNATURE-----