From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH 1/2] drm/i915: Created common handler for platform specific suspend/resume Date: Thu, 14 Aug 2014 14:51:15 +0300 Message-ID: <1408017075.25715.6.camel@intelbox> References: <1407937630.27091.42.camel@intelbox> <1407951426-27770-1-git-send-email-sagar.a.kamble@intel.com> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1669360859==" Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id B2BB16E690 for ; Thu, 14 Aug 2014 04:52:18 -0700 (PDT) In-Reply-To: <1407951426-27770-1-git-send-email-sagar.a.kamble@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: sagar.a.kamble@intel.com Cc: "Goel, Akash" , Daniel Vetter , intel-gfx@lists.freedesktop.org, Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org --===============1669360859== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-ddRFHhO4rsorSjvEM/Wn" --=-ddRFHhO4rsorSjvEM/Wn Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2014-08-13 at 23:07 +0530, sagar.a.kamble@intel.com wrote: > From: Sagar Kamble >=20 > With this change, intel_runtime_suspend and intel_runtime_resume function= s > become completely platform agnostic. Platform specific suspend/resume > changes are moved to intel_suspend_complete and intel_resume_prepare. >=20 > Cc: Imre Deak > Cc: Paulo Zanoni > Cc: Daniel Vetter > Cc: Jani Nikula > Cc: Goel, Akash For the future: it's not necessary to CC the above people, they all read the mailing list anyway. > Signed-off-by: Sagar Kamble Both patches look fine to me: Reviewed-by: Imre Deak > --- > drivers/gpu/drm/i915/i915_drv.c | 76 ++++++++++++++++++++++++++---------= ------ > 1 file changed, 49 insertions(+), 27 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_= drv.c > index ec96f9a..88464ad 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -494,6 +494,10 @@ bool i915_semaphore_is_enabled(struct drm_device *de= v) > return true; > } > =20 > + > +static int intel_suspend_complete(struct drm_i915_private *dev_priv); > +static int intel_resume_prepare(struct drm_i915_private *dev_priv); > + > static int i915_drm_freeze(struct drm_device *dev) > { > struct drm_i915_private *dev_priv =3D dev->dev_private; > @@ -983,14 +987,14 @@ static int i915_pm_poweroff(struct device *dev) > return i915_drm_freeze(drm_dev); > } > =20 > -static int hsw_runtime_suspend(struct drm_i915_private *dev_priv) > +static int hsw_suspend_complete(struct drm_i915_private *dev_priv) > { > hsw_enable_pc8(dev_priv); > =20 > return 0; > } > =20 > -static int snb_runtime_resume(struct drm_i915_private *dev_priv) > +static int snb_resume_prepare(struct drm_i915_private *dev_priv) > { > struct drm_device *dev =3D dev_priv->dev; > =20 > @@ -999,7 +1003,7 @@ static int snb_runtime_resume(struct drm_i915_privat= e *dev_priv) > return 0; > } > =20 > -static int hsw_runtime_resume(struct drm_i915_private *dev_priv) > +static int hsw_resume_prepare(struct drm_i915_private *dev_priv) > { > hsw_disable_pc8(dev_priv); > =20 > @@ -1295,7 +1299,7 @@ static void vlv_check_no_gt_access(struct drm_i915_= private *dev_priv) > I915_WRITE(VLV_GTLC_PW_STATUS, VLV_GTLC_ALLOWWAKEERR); > } > =20 > -static int vlv_runtime_suspend(struct drm_i915_private *dev_priv) > +static int vlv_suspend_complete(struct drm_i915_private *dev_priv) > { > u32 mask; > int err; > @@ -1335,7 +1339,7 @@ err1: > return err; > } > =20 > -static int vlv_runtime_resume(struct drm_i915_private *dev_priv) > +static int vlv_resume_prepare(struct drm_i915_private *dev_priv) > { > struct drm_device *dev =3D dev_priv->dev; > int err; > @@ -1413,17 +1417,7 @@ static int intel_runtime_suspend(struct device *de= vice) > cancel_work_sync(&dev_priv->rps.work); > intel_runtime_pm_disable_interrupts(dev); > =20 > - if (IS_GEN6(dev)) { > - ret =3D 0; > - } else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) { > - ret =3D hsw_runtime_suspend(dev_priv); > - } else if (IS_VALLEYVIEW(dev)) { > - ret =3D vlv_runtime_suspend(dev_priv); > - } else { > - ret =3D -ENODEV; > - WARN_ON(1); > - } > - > + ret =3D intel_suspend_complete(dev_priv); > if (ret) { > DRM_ERROR("Runtime suspend failed, disabling it (%d)\n", ret); > intel_runtime_pm_restore_interrupts(dev); > @@ -1461,17 +1455,7 @@ static int intel_runtime_resume(struct device *dev= ice) > intel_opregion_notify_adapter(dev, PCI_D0); > dev_priv->pm.suspended =3D false; > =20 > - if (IS_GEN6(dev)) { > - ret =3D snb_runtime_resume(dev_priv); > - } else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) { > - ret =3D hsw_runtime_resume(dev_priv); > - } else if (IS_VALLEYVIEW(dev)) { > - ret =3D vlv_runtime_resume(dev_priv); > - } else { > - WARN_ON(1); > - ret =3D -ENODEV; > - } > - > + ret =3D intel_resume_prepare(dev_priv); > /* > * No point of rolling back things in case of an error, as the best > * we can do is to hope that things will still work (and disable RPM). > @@ -1490,6 +1474,44 @@ static int intel_runtime_resume(struct device *dev= ice) > return ret; > } > =20 > +static int intel_suspend_complete(struct drm_i915_private *dev_priv) > +{ > + struct drm_device *dev =3D dev_priv->dev; > + int ret; > + > + if (IS_GEN6(dev)) { > + ret =3D 0; > + } else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) { > + ret =3D hsw_suspend_complete(dev_priv); > + } else if (IS_VALLEYVIEW(dev)) { > + ret =3D vlv_suspend_complete(dev_priv); > + } else { > + ret =3D -ENODEV; > + WARN_ON(1); > + } > + > + return ret; > +} > + > +static int intel_resume_prepare(struct drm_i915_private *dev_priv) > +{ > + struct drm_device *dev =3D dev_priv->dev; > + int ret; > + > + if (IS_GEN6(dev)) { > + ret =3D snb_resume_prepare(dev_priv); > + } else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) { > + ret =3D hsw_resume_prepare(dev_priv); > + } else if (IS_VALLEYVIEW(dev)) { > + ret =3D vlv_resume_prepare(dev_priv); > + } else { > + WARN_ON(1); > + ret =3D -ENODEV; > + } > + > + return ret; > +} > + > static const struct dev_pm_ops i915_pm_ops =3D { > .suspend =3D i915_pm_suspend, > .suspend_late =3D i915_pm_suspend_late, --=-ddRFHhO4rsorSjvEM/Wn 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) iQEcBAABAgAGBQJT7KKzAAoJEORIIAnNuWDFEhMIALI1WWVOJd2MYBTO34UnGQOm F7tzJDfR5Y2M8RoP9IrKejjcINlZLSOHYxusE+13dHpiy+ZVl0A3lXwxpZtHwQSp 09vtclp+eQ2yC38kTNAjJDT/Pwq9hy5aeEksY7cBhNRi8sSt7l1JZPIzf9eC3l0u cdlWzlN5noaFuFXbrdEGBqBcI1Wj5SbdCg+jyj5JZvjnn8tZURDWPnYwaVhP4Imm xDuuVoJ2fknzlR7l0IxeiYE4damBbJ4M2j1AbTXRNLZ0ouXNkeegWYFwnqV2oY2l 2Jr7+ol2XiuL4rGCzqB5E4DCx3eQqOGSh+62qQFI70z3p1lYeRj5D+oHNF6z6rY= =4xtF -----END PGP SIGNATURE----- --=-ddRFHhO4rsorSjvEM/Wn-- --===============1669360859== 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 --===============1669360859==--