From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Don't del_timer_sync uninitialized timer Date: Sat, 15 Mar 2014 12:47:22 +0100 Message-ID: <20140315114722.GJ30571@phenom.ffwll.local> References: <1394842896-25175-1-git-send-email-benjamin.widawsky@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F8A5892C3 for ; Sat, 15 Mar 2014 04:47:27 -0700 (PDT) Received: by mail-ee0-f49.google.com with SMTP id c41so2292826eek.8 for ; Sat, 15 Mar 2014 04:47:26 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1394842896-25175-1-git-send-email-benjamin.widawsky@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ben Widawsky Cc: Intel GFX , Ben Widawsky , Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org 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. -Daniel > + > if (HAS_FPGA_DBG_UNCLAIMED(dev)) > __raw_i915_write32(dev_priv, FPGA_DBG, FPGA_DBG_RM_NOCLAIM); > > @@ -724,9 +727,6 @@ void intel_uncore_init(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); > - > if (IS_VALLEYVIEW(dev)) { > dev_priv->uncore.funcs.force_wake_get = __vlv_force_wake_get; > dev_priv->uncore.funcs.force_wake_put = __vlv_force_wake_put; > -- > 1.9.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