From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: [PATCH 3/4] drm/i915: send proper opregion notifications on suspend/resume Date: Thu, 29 May 2014 14:11:36 -0700 Message-ID: <1401397897-4655-3-git-send-email-jbarnes@virtuousgeek.org> References: <1401397897-4655-1-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from gproxy4-pub.mail.unifiedlayer.com (gproxy4-pub.mail.unifiedlayer.com [69.89.23.142]) by gabe.freedesktop.org (Postfix) with SMTP id DA5596E0B3 for ; Thu, 29 May 2014 14:11:49 -0700 (PDT) In-Reply-To: <1401397897-4655-1-git-send-email-jbarnes@virtuousgeek.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: kristen@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org From: Kristen Carlson Accardi This indicates to the firmware that it can power down various other components or bring them back up, depending on the target system state. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Jesse Barnes --- drivers/acpi/sleep.c | 1 + drivers/gpu/drm/i915/i915_drv.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index c40fb2e..807f333 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -89,6 +89,7 @@ u32 acpi_target_system_state(void) { return acpi_target_sleep_state; } +EXPORT_SYMBOL(acpi_target_system_state); static bool pwr_btn_event_pending; diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 433bdfa..b6211d7 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -28,6 +28,7 @@ */ #include +#include #include #include #include "i915_drv.h" @@ -491,6 +492,7 @@ static int i915_drm_freeze(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc; + pci_power_t opregion_target_state; intel_runtime_pm_get(dev_priv); @@ -540,6 +542,12 @@ static int i915_drm_freeze(struct drm_device *dev) 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_opregion_fini(dev); console_lock(); @@ -671,6 +679,8 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) dev_priv->modeset_restore = MODESET_DONE; mutex_unlock(&dev_priv->modeset_restore_lock); + intel_opregion_notify_adapter(dev, PCI_D0); + intel_runtime_pm_put(dev_priv); return 0; } -- 1.9.1