Commit 33d30a9c authored by Simona Vetter's avatar Simona Vetter
Browse files

drm/i915: Remove DRIVER_MODESET checks in the gpu reset code 



Again, good riddance to UMS!

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d5818938

drivers/gpu/drm/i915/i915_drv.c

+23 −26
Original line number Diff line number Diff line
@@ -863,7 +863,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)) {



	/* Used to prevent gem_check_wedged returning -EAGAIN during gpu reset */

	dev_priv->gpu_error.reload_in_reset = true;
@@ -891,9 +891,6 @@ int i915_reset(struct drm_device *dev) 
	 */

	if (INTEL_INFO(dev)->gen > 5)

		intel_enable_gt_powersave(dev);

	} else {

		mutex_unlock(&dev->struct_mutex);

	}



	return 0;

}