Skip to content

L
linux
Commit 6fe5a7e3 authored by Keith Packard's avatar Keith Packard
Browse files
Options

Merge branch 'drm-intel-fixes' into drm-intel-next

parents bc67f799 1083694a
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
drivers/gpu/drm/i915/i915_drv.c
View file @ 6fe5a7e3
...@@ -580,6 +580,7 @@ int i915_reset(struct drm_device *dev, u8 flags) ...@@ -580,6 +580,7 @@ int i915_reset(struct drm_device *dev, u8 flags)
if (get_seconds() - dev_priv->last_gpu_reset < 5) { if (get_seconds() - dev_priv->last_gpu_reset < 5) {
DRM_ERROR("GPU hanging too fast, declaring wedged!\n"); DRM_ERROR("GPU hanging too fast, declaring wedged!\n");
} else switch (INTEL_INFO(dev)->gen) { } else switch (INTEL_INFO(dev)->gen) {
case 7:
case 6: case 6:
ret = gen6_do_reset(dev, flags); ret = gen6_do_reset(dev, flags);
/* If reset with a user forcewake, try to restore */ /* If reset with a user forcewake, try to restore */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7