From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH 3/4] drm/i915: send proper opregion notifications on suspend/resume Date: Fri, 30 May 2014 16:47:13 +0300 Message-ID: <1401457633.24060.55.camel@intelbox> References: <1401397897-4655-1-git-send-email-jbarnes@virtuousgeek.org> <1401397897-4655-3-git-send-email-jbarnes@virtuousgeek.org> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2108921580==" Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C6336E169 for ; Fri, 30 May 2014 06:47:20 -0700 (PDT) In-Reply-To: <1401397897-4655-3-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: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org, kristen@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org --===============2108921580== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-uh6KFxPXh/YuRkBpeHzq" --=-uh6KFxPXh/YuRkBpeHzq Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2014-05-29 at 14:11 -0700, Jesse Barnes wrote: > From: Kristen Carlson Accardi >=20 > This indicates to the firmware that it can power down various other > components or bring them back up, depending on the target system state. >=20 > 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(+) >=20 > 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); > =20 > static bool pwr_btn_event_pending; > =20 > 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 @@ > */ > =20 > #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 =3D dev->dev_private; > struct drm_crtc *crtc; > + pci_power_t opregion_target_state; > =20 > intel_runtime_pm_get(dev_priv); > =20 > @@ -540,6 +542,12 @@ static int i915_drm_freeze(struct drm_device *dev) > =20 > i915_save_state(dev); > =20 > + if (acpi_target_system_state() >=3D ACPI_STATE_S3) > + opregion_target_state =3D PCI_D3cold; > + else > + opregion_target_state =3D PCI_D1; > + intel_opregion_notify_adapter(dev, opregion_target_state); > + > intel_opregion_fini(dev); > =20 > console_lock(); > @@ -671,6 +679,8 @@ static int __i915_drm_thaw(struct drm_device *dev, bo= ol restore_gtt_mappings) > dev_priv->modeset_restore =3D MODESET_DONE; > mutex_unlock(&dev_priv->modeset_restore_lock); > =20 > + intel_opregion_notify_adapter(dev, PCI_D0); > + This could be moved after intel_opregion_init() just for clarity, but I'm also fine keeping it here. This patch depends on Rafael's change in his PM tree to export acpi_target_system_state(), other than that this is: Reviewed-by: Imre Deak =20 > intel_runtime_pm_put(dev_priv); > return 0; > } --=-uh6KFxPXh/YuRkBpeHzq Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQEcBAABAgAGBQJTiIvhAAoJEORIIAnNuWDFPUwH/0W+loJjHq14Q9wbCbjwsWqK qjo5AfXZhLrAzpIwinrzrZqW+RimjXqE0wWeX993vETMn6gn4uWMPSw+MbKE4YfU 6yqM8oI5FFfaHJb4d7SJENHJCQqKpwuQNFEIUkLksYSLBgVl10FOsj+GbgF7EShi y9UjPAbFWMSEI65VMFJMZ0f2myshqDnG/Rmk9hNxKPCkyZyf0L4gEi3S04yktCrq +5IhZUZIz4W8rd56cD6UFGSz5iljFMsNnmnqvBt6VgqYPQt5Yt5Fvx5Ibn0S8DHu JsvGcjlxC9RGP35F2VJBrAvnzhC9B+cPwKkGcBp+hIc+i9DJVZSQNREbCeRx29E= =5UOZ -----END PGP SIGNATURE----- --=-uh6KFxPXh/YuRkBpeHzq-- --===============2108921580== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============2108921580==--