From fbc74c338d2c957d383f9f577be0d62e1a5481ec Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Fri, 27 Apr 2012 15:17:46 +0200 Subject: [PATCH] --- yaml --- r: 307365 b: refs/heads/master c: 523bcb28c3fb92baecda6daa60560f67eb4a6177 h: refs/heads/master i: 307363: 0b435a232f173a54bf88c4e7fe44569e78a08c54 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index def5335cf54e..ed6b6351fb34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ccce180fe6d484454650d8b2a71fde22d311013 +refs/heads/master: 523bcb28c3fb92baecda6daa60560f67eb4a6177 diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c index 45c9430cf629..133f1014ed90 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.c +++ b/trunk/drivers/gpu/drm/i915/i915_drv.c @@ -904,21 +904,11 @@ int i915_reset(struct drm_device *dev) intel_modeset_init_hw(dev); drm_irq_uninstall(dev); - drm_mode_config_reset(dev); drm_irq_install(dev); } else { mutex_unlock(&dev->struct_mutex); } - /* - * Perform a full modeset as on later generations, e.g. Ironlake, we may - * need to retrain the display link and cannot just restore the register - * values. - */ - mutex_lock(&dev->mode_config.mutex); - drm_helper_resume_force_mode(dev); - mutex_unlock(&dev->mode_config.mutex); - return 0; }