OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-intel-next-2015-09-11' of git://anongit.freedesktop.org/drm-intel...
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_drv.c
diff --git
a/drivers/gpu/drm/i915/i915_drv.c
b/drivers/gpu/drm/i915/i915_drv.c
index
bdec64c
..
e2bf9e2
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_drv.c
+++ b/
drivers/gpu/drm/i915/i915_drv.c
@@
-733,7
+733,7
@@
static int i915_drm_resume(struct drm_device *dev)
mutex_lock(&dev->struct_mutex);
if (i915_gem_init_hw(dev)) {
DRM_ERROR("failed to re-initialize GPU, declaring wedged!\n");
mutex_lock(&dev->struct_mutex);
if (i915_gem_init_hw(dev)) {
DRM_ERROR("failed to re-initialize GPU, declaring wedged!\n");
-
atomic_set_mask
(I915_WEDGED, &dev_priv->gpu_error.reset_counter);
+
atomic_or
(I915_WEDGED, &dev_priv->gpu_error.reset_counter);
}
mutex_unlock(&dev->struct_mutex);
}
mutex_unlock(&dev->struct_mutex);