From patchwork Fri Feb 21 21:13:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 3700151 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 0308C9F382 for ; Fri, 21 Feb 2014 21:13:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 245B620149 for ; Fri, 21 Feb 2014 21:13:48 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4AC4020145 for ; Fri, 21 Feb 2014 21:13:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 646B7FB678; Fri, 21 Feb 2014 13:13:45 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from alt-proxy45.mail.unifiedlayer.com (alt-proxy45.mail.unifiedlayer.com [70.40.201.10]) by gabe.freedesktop.org (Postfix) with SMTP id A469AFB678 for ; Fri, 21 Feb 2014 13:13:43 -0800 (PST) Received: (qmail 11549 invoked by uid 0); 21 Feb 2014 21:13:42 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy18.mail.unifiedlayer.com with SMTP; 21 Feb 2014 21:13:42 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-Id:Date:Subject:To:From; bh=HCU6kMNneN7A4vL42bdy1mJMpfM1LskljRew3FGCxvU=; b=WUfToiEPcPd/a9mwxj9cNkR66F9ujQ/BU9xntiAwJ97LErLzuT73yjAFS6iZ2qiDYpzE/wluimFCr4fkWW2CaNtMGqOx4IDEZ0Ycq4Smi6IwKwX4//ErV2oocG2n2rQn; Received: from [67.161.37.189] (port=39911 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (UNKNOWN:CAMELLIA256-SHA:256) (Exim 4.80) (envelope-from ) id 1WGxPi-0007w2-2o for intel-gfx@lists.freedesktop.org; Fri, 21 Feb 2014 14:13:42 -0700 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Fri, 21 Feb 2014 13:13:39 -0800 Message-Id: <1393017219-2121-1-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH] drm/i915: re-add locking around hw state readout 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 To silence locking complaints. This was a rebase failure on my part in commit fa9fa083d0606cb323f6105c17702460ea0a6780 Author: Jesse Barnes Date: Tue Feb 11 15:28:56 2014 -0800 drm/i915: read out hw state earlier v2 Reported-by: Ville Syrjälä Signed-off-by: Jesse Barnes Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/i915/intel_display.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 13ad064..69cade7 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11282,7 +11282,9 @@ void intel_modeset_init(struct drm_device *dev) /* Just in case the BIOS is doing something questionable. */ intel_disable_fbc(dev); + mutex_lock(&dev->mode_config.mutex); intel_modeset_setup_hw_state(dev, false); + mutex_unlock(&dev->mode_config.mutex); list_for_each_entry(crtc, &dev->mode_config.crtc_list, base.head) {