From: Daniel Vetter <daniel@ffwll.ch>
To: Imre Deak <imre.deak@intel.com>
Cc: intel-gfx@lists.freedesktop.org, shuang.he@linux.intel.com
Subject: Re: [PATCH v2 09/14] drm/i915: disable/re-enable PCI device around S4 freeze/thaw
Date: Fri, 24 Oct 2014 10:51:53 +0200 [thread overview]
Message-ID: <20141024085153.GZ26941@phenom.ffwll.local> (raw)
In-Reply-To: <1414081408-20498-10-git-send-email-imre.deak@intel.com>
On Thu, Oct 23, 2014 at 07:23:23PM +0300, Imre Deak wrote:
> We already disable everything during S4 freeze, except the PCI device
> itself. There is no reason why we couldn't disable that too and doing
> so allows us to unify these handlers in the next patch with the
> corresponding S3 suspend/resume handlers.
>
> Signed-off-by: Imre Deak <imre.deak@intel.com>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
It feels like I've asked you this already, but could this perhaps fix the
ominous S4 issues we're seeing on hsw+? There should be a few QA reports
in bugzilla about it.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_drv.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 4524c61..be4cb1d 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1019,12 +1019,11 @@ static int i915_pm_freeze_late(struct device *dev)
> {
> struct pci_dev *pdev = to_pci_dev(dev);
> struct drm_device *drm_dev = pci_get_drvdata(pdev);
> - struct drm_i915_private *dev_priv = drm_dev->dev_private;
>
> if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)
> return 0;
>
> - return intel_suspend_complete(dev_priv);
> + return i915_drm_suspend_late(drm_dev);
> }
>
> static int i915_pm_thaw_early(struct device *dev)
> @@ -1035,7 +1034,7 @@ static int i915_pm_thaw_early(struct device *dev)
> if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)
> return 0;
>
> - return i915_drm_thaw_early(drm_dev);
> + return i915_resume_early(drm_dev);
> }
>
> static int i915_pm_thaw(struct device *dev)
> --
> 1.8.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
next prev parent reply other threads:[~2014-10-24 8:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-23 16:23 [PATCH v2 00/14] fix VLV S4 suspend/resume, unify S3/S4 handlers Imre Deak
2014-10-23 16:23 ` [PATCH v2 01/14] drm/i915: factor out i915_drm_suspend_late Imre Deak
2014-10-23 16:23 ` [PATCH v2 02/14] drm/i915: unify legacy S3 suspend and S4 freeze handlers Imre Deak
2014-10-23 16:23 ` [PATCH v2 03/14] drm/i915: propagate error from legacy resume handler Imre Deak
2014-10-23 16:23 ` [PATCH v2 04/14] drm/i915: vlv: fix switcheroo/legacy suspend/resume Imre Deak
2014-10-23 16:23 ` [PATCH v2 05/14] drm/i915: fix S4 suspend while switcheroo state is off Imre Deak
2014-10-23 16:23 ` [PATCH v2 06/14] drm/i915: remove unused restore_gtt_mappings optimization during suspend Imre Deak
2014-10-23 16:23 ` [PATCH v2 07/14] drm/i915: check for GT faults in all resume handlers and driver load time Imre Deak
2014-10-23 16:23 ` [PATCH v2 08/14] drm/i915: enable output polling during S4 thaw Imre Deak
2014-10-23 16:23 ` [PATCH v2 09/14] drm/i915: disable/re-enable PCI device around S4 freeze/thaw Imre Deak
2014-10-24 8:51 ` Daniel Vetter [this message]
2014-10-24 9:48 ` Imre Deak
2014-10-23 16:23 ` [PATCH v2 10/14] drm/i915: unify S3 and S4 suspend/resume handlers Imre Deak
2014-10-23 16:23 ` [PATCH v2 11/14] drm/i915: sanitize suspend/resume helper function names Imre Deak
2014-10-23 16:23 ` [PATCH v2 12/14] drm/i915: add poweroff_late handler Imre Deak
2014-10-23 16:23 ` [PATCH v2 13/14] drm/i915: unify switcheroo and legacy suspend/resume handlers Imre Deak
2014-10-23 16:23 ` [PATCH v2 14/14] drm/i915: add comments on what stage a given PM handler is called Imre Deak
2014-10-24 8:54 ` [PATCH v2 00/14] fix VLV S4 suspend/resume, unify S3/S4 handlers Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141024085153.GZ26941@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=shuang.he@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox