From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 2/3] drm/i915: cancel RPS work before disabling RPS Date: Wed, 24 Apr 2013 11:09:02 +0200 Message-ID: <20130424090902.GN6169@phenom.ffwll.local> References: <1366736968-15227-1-git-send-email-jbarnes@virtuousgeek.org> <1366736968-15227-2-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ea0-f170.google.com (mail-ea0-f170.google.com [209.85.215.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C5CFE60E0 for ; Wed, 24 Apr 2013 02:06:00 -0700 (PDT) Received: by mail-ea0-f170.google.com with SMTP id z7so606313eaf.15 for ; Wed, 24 Apr 2013 02:05:59 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1366736968-15227-2-git-send-email-jbarnes@virtuousgeek.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, Apr 23, 2013 at 10:09:27AM -0700, Jesse Barnes wrote: > Ville noticed this while doing another review; we may as well cancel > this work just to make sure we don't try anything fancy after disabling > the RPS interfaces. > = > Reported-by: Ville Syrj=E4l=E4 > Signed-off-by: Jesse Barnes > --- > drivers/gpu/drm/i915/intel_pm.c | 1 + > 1 file changed, 1 insertion(+) > = > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel= _pm.c > index 93b01e1..72ad817 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -3657,6 +3657,7 @@ void intel_disable_gt_powersave(struct drm_device *= dev) > ironlake_disable_rc6(dev); > } else if (INTEL_INFO(dev)->gen >=3D 6) { > cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work); > + cancel_work_sync(&dev_priv->rps.work); Module unload is a bit a mess around this area here: We disable irqs too late, so the work item could easily rearm between the canceling here nad the disable_rps below. I'll throw a patch on top to remedy that. -Daniel = > if (IS_VALLEYVIEW(dev)) > cancel_delayed_work_sync(&dev_priv->rps.vlv_work); > mutex_lock(&dev_priv->rps.hw_lock); > -- = > 1.7.10.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