Commit d5818938 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Remove DRIVER_MODESET checks from suspend/resume code 



UMS is dead, yay!

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 17fa6463

drivers/gpu/drm/i915/i915_drv.c

+52 −61
Original line number Diff line number Diff line
@@ -574,6 +574,7 @@ static int i915_drm_suspend(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc;

	pci_power_t opregion_target_state;

	int error;



	/* ignore lid events during suspend */

	mutex_lock(&dev_priv->modeset_restore_lock);
@@ -588,10 +589,6 @@ static int i915_drm_suspend(struct drm_device *dev) 


	pci_save_state(dev->pdev);



	/* If KMS is active, we do the leavevt stuff here */

	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		int error;



	error = i915_gem_suspend(dev);

	if (error) {

		dev_err(&dev->pdev->dev,
@@ -618,7 +615,6 @@ static int i915_drm_suspend(struct drm_device *dev) 
	intel_suspend_encoders(dev_priv);



	intel_suspend_hw(dev);

	}



	i915_gem_suspend_gtt_mappings(dev);
@@ -690,17 +686,13 @@ static int i915_drm_resume(struct drm_device *dev) 
{

	struct drm_i915_private *dev_priv = dev->dev_private;



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

	mutex_lock(&dev->struct_mutex);

	i915_gem_restore_gtt_mappings(dev);

	mutex_unlock(&dev->struct_mutex);

	}



	i915_restore_state(dev);

	intel_opregion_setup(dev);



	/* KMS EnterVT equivalent */

	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

	intel_init_pch_refclk(dev);

	drm_mode_config_reset(dev);
@@ -736,7 +728,6 @@ static int i915_drm_resume(struct drm_device *dev) 
	intel_hpd_init(dev_priv);

	/* Config may have changed between suspend and resume */

	drm_helper_hpd_irq_event(dev);

	}



	intel_opregion_init(dev);