From patchwork Sun Jul 3 17:29:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9211351 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 45F1E60752 for ; Sun, 3 Jul 2016 17:29:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29E66285F7 for ; Sun, 3 Jul 2016 17:29:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CAD12860C; Sun, 3 Jul 2016 17:29:47 +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]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB529285F7 for ; Sun, 3 Jul 2016 17:29:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 04B8D6E2CB; Sun, 3 Jul 2016 17:29:44 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 863A66E2CB for ; Sun, 3 Jul 2016 17:29:41 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id r201so16705648wme.0 for ; Sun, 03 Jul 2016 10:29:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=+LxrW6RPAIMQKoTA1UPY7gaZvSGJoMBeDuJF3joefCE=; b=KY6kDh5Svx8xgRMh9qqkIU+6jjc32Z86Po5OmVAJyUT2uUmTV8rvJRSSYXQQgrpWv5 YS6NAH4C6H/asnuJBROApkiCtDkd1LX8Rx+JS1wOTVZwCkBPrd2BJOp9Xt0Dz42MwJeL 0dCL3qlxS77l0uh06uIIXz8yTyWyXiuFBZM2zPtORawFN4d/qW+y7gKMdkIac3+zDdMY tTdlxAuDpG5crpo35smf38UaUgt2oa/dXa8tsk1gU97SWnunOIzXOQUXE1nC1qQ9JiZ3 JiQNGm4Hw6QfGlh6AaDBQd6eNox5+QZDLkeu388cwlcX1mqXPiwsjesD6SFA6+hn0jGm zpgw== 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:cc:subject:date:message-id; bh=+LxrW6RPAIMQKoTA1UPY7gaZvSGJoMBeDuJF3joefCE=; b=C4W0x/t63+fg+8f6Z8Gdg2vIHNMCSJKzUc/LPaQbWdIlkIAuUzy9dgL5FPmkBXWOmu ois/mCKyJs7lSW18ACFlYLEKbraLexYbM20ygPXSVmf1zbRnG/6xWWk+rXGw3hWOJ/VB 5TCDAez66hywovHCDan4Q+AVao0W/Kb1Eno5ebpF8a6tdbRaaTfNd7A9agL0MKjjjHyZ ih7rtbVy08+9aARgEQai9/IKyFbHxb4Elz4jSuc04VV/6B5FZkFv4vbjmXlrg+HU9Ra7 vLp/sMNovRjetiVQAxgx2aXK7HZPu6VGL1BcjHyAY8JbfcUdedi7hXtiuBGVpLwAiUpZ l7qw== X-Gm-Message-State: ALyK8tIZM/u1IOFwf8H7T43eyjGCm2WxQSwRoRXkL0U6/ctd+pjWaY/3GQhO1A8oUXSnow== X-Received: by 10.28.228.86 with SMTP id b83mr6786110wmh.11.1467566979886; Sun, 03 Jul 2016 10:29:39 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id w81sm613254wmg.20.2016.07.03.10.29.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Jul 2016 10:29:38 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Sun, 3 Jul 2016 18:29:33 +0100 Message-Id: <1467566973-13596-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 Cc: Mika Kuoppala Subject: [Intel-gfx] [PATCH] drm/i915: Hold irq uncore.lock when initialising fw_domains 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 Acquiring the forcewake domain asserts that it is in an atomic section (as we always expect to under the uncore.lock). This true expect for initialising the domains on Ivybridge, and so we generate a warning. Wrap the manual usage of fw_domains inside the spin_lock. Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Cc: Mika Kuoppala Reviewed-by: Tvrtko Ursulin Reviewed-by: Mika Kuoppala --- drivers/gpu/drm/i915/intel_uncore.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 7da3906badf3..1d65209c0998 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1299,9 +1299,11 @@ static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv) fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER, FORCEWAKE_MT, FORCEWAKE_MT_ACK); + spin_lock_irq(&dev_priv->uncore.lock); fw_domains_get_with_thread_status(dev_priv, FORCEWAKE_ALL); ecobus = __raw_i915_read32(dev_priv, ECOBUS); fw_domains_put_with_fifo(dev_priv, FORCEWAKE_ALL); + spin_unlock_irq(&dev_priv->uncore.lock); if (!(ecobus & FORCEWAKE_MT_ENABLE)) { DRM_INFO("No MT forcewake available on Ivybridge, this can result in issues\n");