From patchwork Fri Sep 9 11:00:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9322949 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E184E60869 for ; Fri, 9 Sep 2016 11:01:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D57E029DE1 for ; Fri, 9 Sep 2016 11:01:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA2B129DE7; Fri, 9 Sep 2016 11:01:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6E3FF29DE4 for ; Fri, 9 Sep 2016 11:01:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C11516E78C; Fri, 9 Sep 2016 11:01:21 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8DFB46E785 for ; Fri, 9 Sep 2016 11:01:14 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id l65so2204524wmf.3 for ; Fri, 09 Sep 2016 04:01:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=rtlsOON32mIClkU1b+1uHz1v1swKprhsMcwR7J6C0F0=; b=PeBxTq6Gh0AW3VLur13JvICoGK0MqpUwN8Jq4+nqYsduXzPHqA2lEAh0X4KJbhGXv7 KLx+gFUnt3NDesmnzaDiUK7czbMtGBPuZLMnI65E7wl5qTqUCUVgdg2Wg3EfmGkOQpjV DiHhD4Q/96wJX07G3NU3+1t0Zg7BoevSkLFOd1459SHaVDXNwdGnEWvavgH8hl2QoxKk azYbQiwxWaBGERn4Rh5RnxEHCwmP6mnauplornPIdV73GcF7z8VPQnycoHYh7DTAMSqu aKGXo/vq+Hu3703iwuck65MCVlo3ncUg7si6ZNQdiDSTRmPSOQfUPOALpPxA7lm46wtd /J8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=rtlsOON32mIClkU1b+1uHz1v1swKprhsMcwR7J6C0F0=; b=LTwQp0HJqg67JdiXiQZwffnfOVR3Bj0uX7jjMR2CUNplpUR0aFACOEPVJ6be+zhqmq 1vcx0kYhj36eRTOaJY3SYerThUZpiuQ4kkB4HA6AmIA9otgp4tbd4dhzarYW4OpA2b5L D249IPMnPf/dUJxudMfIldBYp+6/fC+iw3iJZGVasmbAiaAjuqCtSyiIZEunD64evbkS mLZIwhi788d7kQHOipGAxh0odfN3mhWcJEhlF7jqB4pKgzK/NYzF3pi4j2SFH4gntGbr ewrCb6V27JQVTv0VWEwcuFe95+gXRSgqO2JOZjDT/Mrr0LmB43g5wb8w6SzQQg0Qf5ea /8TQ== X-Gm-Message-State: AE9vXwNzKjna6nlIR+K/o3CtbpLKUN1b3QIY7Hj2r+6z7vXm2/Of/vqyfIyaukgz9Apx1A== X-Received: by 10.28.141.6 with SMTP id p6mr2481512wmd.110.1473418873072; Fri, 09 Sep 2016 04:01:13 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id kq2sm2786494wjc.41.2016.09.09.04.01.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Sep 2016 04:01:12 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 9 Sep 2016 12:00:48 +0100 Message-Id: <20160909110101.31967-8-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160909110101.31967-1-chris@chris-wilson.co.uk> References: <20160909110101.31967-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 08/21] drm/i915: Drop local struct_mutex around intel_init_emon[ilk] X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Access to intel_init_emon() is strictly ordered by gt_powersave, using struct_mutex around it is overkill (and will conflict with the caller holding struct_mutex themselves). Signed-off-by: Chris Wilson Reviewed-by: Mika Kuoppala --- drivers/gpu/drm/i915/intel_pm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 4f833a077089..6af438ffef9a 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -6773,9 +6773,7 @@ void intel_autoenable_gt_powersave(struct drm_i915_private *dev_priv) if (IS_IRONLAKE_M(dev_priv)) { ironlake_enable_drps(dev_priv); - mutex_lock(&dev_priv->drm.struct_mutex); intel_init_emon(dev_priv); - mutex_unlock(&dev_priv->drm.struct_mutex); } else if (INTEL_INFO(dev_priv)->gen >= 6) { /* * PCU communication is slow and this doesn't need to be