From patchwork Thu Jul 25 09:44:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 2833300 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7A17F9F4E2 for ; Thu, 25 Jul 2013 09:45:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 729E620259 for ; Thu, 25 Jul 2013 09:45:08 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B20BC20237 for ; Thu, 25 Jul 2013 09:45:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 92C12436AE for ; Thu, 25 Jul 2013 02:45:02 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id C7464E5F35; Thu, 25 Jul 2013 02:43:09 -0700 (PDT) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 25 Jul 2013 02:43:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.89,742,1367996400"; d="scan'208";a="336544257" Received: from jnikula-mobl1.fi.intel.com (HELO localhost) ([10.237.72.185]) by azsmga001.ch.intel.com with ESMTP; 25 Jul 2013 02:43:03 -0700 From: Jani Nikula To: sedat.dilek@gmail.com, Stephen Rothwell In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: User-Agent: Notmuch/0.15.2+227~g0ff681e (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Thu, 25 Jul 2013 12:44:34 +0300 Message-ID: <87ehanx9bx.fsf@intel.com> MIME-Version: 1.0 Cc: Daniel Vetter , intel-gfx , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, DRI Subject: Re: [Intel-gfx] linux-next: Tree for Jul 25 [ call-trace: drm | drm-intel related? ] X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, 25 Jul 2013, Sedat Dilek wrote: > On Thu, Jul 25, 2013 at 7:12 AM, Stephen Rothwell wrote: >> Hi all, >> >> Changes since 20130724: >> >> Removed tree: >> arm-dt (at maintainer's request) >> >> The wireless-next tree lost its build failure and gained a conflict >> against Linus' tree. >> >> The tty tree lost its build failure. >> >> The staging tree gained a build failure for which I disabled a driver. >> >> ---------------------------------------------------------------------------- >> > > [ CCing drm and drm-intel folks ] > > With today's next-20130725 I see the following: Use of dev_priv->gt_lock in I915_WRITE through intel_disable_gt_powersave before spin lock init, caused by commit 181d1b9e31c668259d3798c521672afb8edd355c Author: Daniel Vetter Date: Sun Jul 21 13:16:24 2013 +0200 drm/i915: fix up gt init sequence fallout Daniel, how about just doing this (untested): Cheers, Jani. From a6b46053ba07d2e129691fd24ad2e43a1d8dfd10 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Thu, 25 Jul 2013 12:40:31 +0300 Subject: [PATCH] drm/i915: initialize gt_lock early with other spin locks Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Cc: Jani Nikula commit 181d1b9e31c668259d3798c521672afb8edd355c Author: Daniel Vetter Date: Sun Jul 21 13:16:24 2013 +0200 drm/i915: fix up gt init sequence fallout moved dev_priv->gt_lock initialization after use. Do the initialization much earlier with other spin lock initializations. Reported-by: Sedat Dilek Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/i915_dma.c | 1 + drivers/gpu/drm/i915/intel_pm.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 67ec54f..b064a5a 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1496,6 +1496,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) dev_priv->info = info; spin_lock_init(&dev_priv->irq_lock); + spin_lock_init(&dev_priv->gt_lock); spin_lock_init(&dev_priv->gpu_error.lock); spin_lock_init(&dev_priv->rps.lock); spin_lock_init(&dev_priv->backlight.lock); diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 6a347f5..51a2a60 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5497,8 +5497,6 @@ void intel_gt_init(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - spin_lock_init(&dev_priv->gt_lock); - if (IS_VALLEYVIEW(dev)) { dev_priv->gt.force_wake_get = vlv_force_wake_get; dev_priv->gt.force_wake_put = vlv_force_wake_put;