drm/i915: Ditch dev_priv->ums.mm_suspend

Again just complicates gem init functions and makes a general mess out
of everything.

Good riddance!

v2: In my enthusiasm to start removing dri1/ums crud I went overboard a
bit and killed parts of hangcheck. Resurrect it.

Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c9f248acbd69..1df407941700 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -852,10 +852,7 @@ int i915_reset(struct drm_device *dev)
          * was running at the time of the reset (i.e. we weren't VT
          * switched away).
          */
-        if (drm_core_check_feature(dev, DRIVER_MODESET) ||
-                        !dev_priv->ums.mm_suspended) {
-                dev_priv->ums.mm_suspended = 0;
-
+        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
                 /* Used to prevent gem_check_wedged returning -EAGAIN during gpu reset */
                 dev_priv->gpu_error.reload_in_reset = true;