From: Daniel Vetter Subject: Re: [PATCH] drm/i915/bdw: cancel the SW turbo tasks before runtime suspending Date: Fri, 5 Sep 2014 10:46:00 +0200 Message-ID: <20140905084600.GG15520@phenom.ffwll.local> References: <1409864822-1924-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f181.google.com (mail-we0-f181.google.com [74.125.82.181]) by gabe.freedesktop.org (Postfix) with ESMTP id E9FB96E80F for ; Fri, 5 Sep 2014 01:45:37 -0700 (PDT) Received: by mail-we0-f181.google.com with SMTP id x48so11564740wes.12 for ; Fri, 05 Sep 2014 01:45:37 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1409864822-1924-1-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Paulo Zanoni Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org On Thu, Sep 04, 2014 at 06:07:02PM -0300, Paulo Zanoni wrote: > From: Paulo Zanoni > > If we don't cancel them, we may end up running them while the device > is runtime suspended, which will trigger lots and lots of WARNs on > dmesg. > > Regression introduced by: > commit c76bb61a71083b2d90504cc6d0dda2047c5d63ca > Author: Daisy Sun > Date: Mon Aug 11 11:08:38 2014 -0700 > drm/i915/bdw: BDW Software Turbo > > Testcase: igt/pm_rpm/gem-execbuf (you may have to run it a few times) > Signed-off-by: Paulo Zanoni Please don't forget to cc relevant people when you fix a regression. -Daniel > --- > drivers/gpu/drm/i915/i915_drv.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 8ff3755..4ce217b 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -1448,6 +1448,10 @@ static int intel_runtime_suspend(struct device *device) > * intel_mark_idle(). > */ > cancel_work_sync(&dev_priv->rps.work); > + if (dev_priv->rps.is_bdw_sw_turbo) { > + del_timer_sync(&dev_priv->rps.sw_turbo.flip_timer); > + cancel_work_sync(&dev_priv->rps.sw_turbo.work_max_freq); > + } > intel_runtime_pm_disable_interrupts(dev); > > ret = intel_suspend_complete(dev_priv); > -- > 2.1.0 > > _______________________________________________ > 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