diff options
author | Dave Airlie | 2014-09-16 03:28:52 +0200 |
---|---|---|
committer | Dave Airlie | 2014-09-16 03:38:04 +0200 |
commit | b2efb3f0a1db62aff5e824125785ec6731143b6d (patch) | |
tree | 67510cec69e18e55d82bed803428b2a5027d92bb /drivers/gpu/drm/i915/i915_gem.c | |
parent | Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-... (diff) | |
parent | Linux 3.17-rc5 (diff) | |
download | kernel-qcow2-linux-b2efb3f0a1db62aff5e824125785ec6731143b6d.tar.gz kernel-qcow2-linux-b2efb3f0a1db62aff5e824125785ec6731143b6d.tar.xz kernel-qcow2-linux-b2efb3f0a1db62aff5e824125785ec6731143b6d.zip |
drm: backmerge tag 'v3.17-rc5' into drm-next
This is requested to get the fixes for intel and radeon into the
same tree for future development work.
i915_display.c: fix missing dev_priv conflict.
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index f1bb69377a35..1133bb3b2766 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1590,10 +1590,13 @@ unlock: out: switch (ret) { case -EIO: - /* If this -EIO is due to a gpu hang, give the reset code a - * chance to clean up the mess. Otherwise return the proper - * SIGBUS. */ - if (i915_terminally_wedged(&dev_priv->gpu_error)) { + /* + * We eat errors when the gpu is terminally wedged to avoid + * userspace unduly crashing (gl has no provisions for mmaps to + * fail). But any other -EIO isn't ours (e.g. swap in failure) + * and so needs to be reported. + */ + if (!i915_terminally_wedged(&dev_priv->gpu_error)) { ret = VM_FAULT_SIGBUS; break; } |