From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 04/16] drm/i915: unify legacy S3 suspend and S4 freeze handlers Date: Thu, 11 Sep 2014 11:00:02 +0200 Message-ID: <20140911090002.GG15520@phenom.ffwll.local> References: <1410362229-814-1-git-send-email-imre.deak@intel.com> <1410362229-814-5-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 10EB66E515 for ; Thu, 11 Sep 2014 01:59:37 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id x12so6452543wgg.14 for ; Thu, 11 Sep 2014 01:59:36 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1410362229-814-5-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Imre Deak Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, Sep 10, 2014 at 06:16:57PM +0300, Imre Deak wrote: > i915_suspend() is called from the DRM legacy S3 suspend/S4 freeze paths > and the switcheroo suspend path. For switcheroo we only ever need to > perform a full suspend (PM_EVENT_SUSPEND) and for the DRM legacy path > we can handle the S4 freeze (PM_EVENT_FREEZE) the same way as S3 > suspend. The only difference atm between suspend and freeze is that > during freeze we don't disable the PCI device, but there is no reason > why we can't do so. So unify the two cases to reduce complexity. > > Note that for the DRM legacy case the thaw event is not handled, so > we disable the display before creating the hibernation image and it > won't get re-enabled until reboot. We could fix this leaving the > display enabled for the image creation/writing (if we care enough > about UMS), but this can be done as a follow-up. UMS doesn't even get compiled any more, please don't try to fix it ;-) My plan is to garbage-collect it all around when 3.17 is out the door. -Daniel > > Signed-off-by: Imre Deak > --- > drivers/gpu/drm/i915/i915_drv.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 7fa34bd..bf4ff5e 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -648,11 +648,9 @@ int i915_suspend(struct drm_device *dev, pm_message_t state) > if (error) > return error; > > - if (state.event == PM_EVENT_SUSPEND) { > - /* Shut down the device */ > - pci_disable_device(dev->pdev); > - pci_set_power_state(dev->pdev, PCI_D3hot); > - } > + /* Shut down the device */ > + pci_disable_device(dev->pdev); > + pci_set_power_state(dev->pdev, PCI_D3hot); > > return 0; > } > -- > 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