From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: Re: [PATCH] drm/i915: Don't del_timer_sync uninitialized timer Date: Sat, 15 Mar 2014 11:30:18 -0700 Message-ID: <20140315183018.GA9156@bwidawsk.net> References: <1394842896-25175-1-git-send-email-benjamin.widawsky@intel.com> <20140315114722.GJ30571@phenom.ffwll.local> <20140315152023.GI17305@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.bwidawsk.net (bwidawsk.net [166.78.191.112]) by gabe.freedesktop.org (Postfix) with ESMTP id 1084A88FE2 for ; Sat, 15 Mar 2014 11:30:32 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20140315152023.GI17305@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , Daniel Vetter , Ben Widawsky , Intel GFX , Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org On Sat, Mar 15, 2014 at 03:20:23PM +0000, Chris Wilson wrote: > On Sat, Mar 15, 2014 at 12:47:22PM +0100, Daniel Vetter wrote: > > On Fri, Mar 14, 2014 at 05:21:36PM -0700, Ben Widawsky wrote: > > > Broken by: > > > commit 0294ae7b44bba7ab0d4cef9a8736287f38bdb4fd > > > Author: Chris Wilson > > > Date: Thu Mar 13 12:00:29 2014 +0000 > > > > > > drm/i915: Consolidate forcewake resetting to a single function > > > > > > Cc: Chris Wilson > > > Cc: Mika Kuoppala > > > Signed-off-by: Ben Widawsky > > > --- > > > drivers/gpu/drm/i915/intel_uncore.c | 6 +++--- > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c > > > index e6bb421..7e55ceb 100644 > > > --- a/drivers/gpu/drm/i915/intel_uncore.c > > > +++ b/drivers/gpu/drm/i915/intel_uncore.c > > > @@ -362,6 +362,9 @@ void intel_uncore_early_sanitize(struct drm_device *dev) > > > { > > > struct drm_i915_private *dev_priv = dev->dev_private; > > > > > > + setup_timer(&dev_priv->uncore.force_wake_timer, > > > + gen6_force_wake_timer, (unsigned long)dev_priv); > > > > We call early_sanitize also from our resume code, so this will now > > re-setup the timer again. We generally don't do that since if we ever leak > > the timer to here in an enabled state it causes havoc. > > Gah, really? intel_uncore_early_init()! There must be a clean way to > break this up. > -Chris At least in the code base I was looking at, we currently do this also, so I didn't think this was any worse. With lockdep turned on, the module will not even load, so please either revert the original, or merge this. -- Ben Widawsky, Intel Open Source Technology Center