@@ -492,8 +492,6 @@ static int i915_drm_freeze(struct drm_device *dev)
cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work);
- intel_modeset_disable(dev);
-
drm_irq_uninstall(dev);
}
@@ -569,9 +567,14 @@ static int __i915_drm_thaw(struct drm_device *dev)
mutex_unlock(&dev->struct_mutex);
intel_modeset_init_hw(dev);
- intel_modeset_setup_hw_state(dev, false);
+
drm_irq_install(dev);
intel_hpd_init(dev);
+
+ /* Resume the modeset for every activated CRTC */
+ drm_modeset_lock_all(dev);
+ intel_modeset_setup_hw_state(dev, true);
+ drm_modeset_unlock_all(dev);
}
intel_opregion_init(dev);
@@ -149,6 +149,9 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
}
info->screen_size = size;
+ /* This driver doesn't need a VT switch to restore the mode on resume */
+ info->skip_vt_switch = true;
+
// memset(info->screen_base, 0, size);
drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
With the other bits in place, we can do this safely. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/i915_drv.c | 9 ++++++--- drivers/gpu/drm/i915/intel_fb.c | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-)