From f9ce07e04e02166727d547a7f28c93d475d43ed5 Mon Sep 17 00:00:00 2001
From: Timo Aaltonen <tjaalton@debian.org>
Date: Wed, 17 Dec 2014 14:31:59 +0200
Subject: [PATCH 2/2] Revert "drm/i915: send proper opregion notifications on
 suspend/resume"

This reverts commit e5747e3adcd67ae27105003ec99fb58cba180105.

Conflicts:
	drivers/gpu/drm/i915/i915_drv.c
---
 drivers/gpu/drm/i915/i915_drv.c | 10 ----------
 1 file changed, 10 deletions(-)

--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -28,7 +28,6 @@
  */
 
 #include <linux/device.h>
-#include <linux/acpi.h>
 #include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
@@ -602,7 +601,6 @@ static int i915_drm_suspend(struct drm_d
 {
 	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 */
@@ -649,12 +647,6 @@ static int i915_drm_suspend(struct drm_d
 
 	i915_save_state(dev);
 
-	if (acpi_target_system_state() >= ACPI_STATE_S3)
-		opregion_target_state = PCI_D3cold;
-	else
-		opregion_target_state = PCI_D1;
-	intel_opregion_notify_adapter(dev, opregion_target_state);
-
 	intel_uncore_forcewake_reset(dev, false);
 	intel_opregion_fini(dev);
 
@@ -782,8 +774,6 @@ static int i915_drm_resume(struct drm_de
 	dev_priv->modeset_restore = MODESET_DONE;
 	mutex_unlock(&dev_priv->modeset_restore_lock);
 
-	intel_opregion_notify_adapter(dev, PCI_D0);
-
 	drm_kms_helper_poll_enable(dev);
 
 	return 0;
