From patchwork Sun Dec 18 15:37:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9479331 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 4F665601C2 for ; Sun, 18 Dec 2016 15:37:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37003282ED for ; Sun, 18 Dec 2016 15:37:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 28A5628527; Sun, 18 Dec 2016 15:37:33 +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 B47BD282ED for ; Sun, 18 Dec 2016 15:37:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3BDDE6E0C8; Sun, 18 Dec 2016 15:37:29 +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 F37376E0C8 for ; Sun, 18 Dec 2016 15:37:27 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id u144so14276456wmu.0 for ; Sun, 18 Dec 2016 07:37:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id; bh=TV9yaIFeiNc4dzX5kLVh+gBHUZy0kKJwX9n/SdEmmMc=; b=fyIazkCSD4xPyAxAqQJ+zMnCFUuBlvjMuKDXyJX2MYM++bi9OPJtZPClIiIMy1TwP4 NEhJkBhATKEaeyfAtL5sIhjFv1NnTomfbDT/irL31W8QhpqWM4tpYUTXtKZAQMZP1IxW P3ed5eet+N4+NXVuHv9beRBknK3JU4K8bzjHPI/tzm0yZOhuC8i4BcY3cbgRNC0Du66P 4ejqFXkXEUEzp69/L4AKpO5UqTzSLlG80RV1dFTa8ClP8swDXDzJ3B1A63IaFndZwSg9 9fpSwyCQ+XqwHGrlcaiZnVhOP4J/2hOwnGAB53n7kJv0kdSOkeFyiPxmIWhwTIsVfIML yOAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id; bh=TV9yaIFeiNc4dzX5kLVh+gBHUZy0kKJwX9n/SdEmmMc=; b=NS0kWYVohNcI9bkREu0WdfY+bRuvGRGsDxG7wAwtFLirk6c/SGIOHGxTzql9dlwcDt r/SKsvXoECz7h46ZbVE7uRS86rF5PLiLYT1BmObOhh0PzraYUgWjEtrJWlYLTeAHRn6s CKtpVDktWvl4cWzYXdMOxrY0dGQw440tyr45VeEkuvqNyP1Bq3NBlQZpsMRAV9pPch7U 0QbyEAcRyd1a0uvc74NnBxNBTLGYzzhdJTDraycbTNDB4KfSDTglCQrRlYLNLbUCIHNc cfWyldEOEAPvBfZyn8qroK82MzJmtvXklpW8Ss6bwqlqnxyPJBenR9Q1dY+B4H+7htc7 3x5g== X-Gm-Message-State: AIkVDXKSD/vpqfrCmsqSGs6tCqBdefTTv3OhOxkPMMZwoR1FM7tJLhJ0H6XNsp2BaDkcKA== X-Received: by 10.28.40.67 with SMTP id o64mr9810649wmo.40.1482075446038; Sun, 18 Dec 2016 07:37:26 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id b3sm16437831wjy.40.2016.12.18.07.37.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Dec 2016 07:37:25 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Sun, 18 Dec 2016 15:37:18 +0000 Message-Id: <20161218153724.8439-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 Subject: [Intel-gfx] [CI 1/7] drm/i915: Add a reminder that i915_vma_move_to_active() requires struct_mutex 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 i915_vma_move_to_active() requires the struct_mutex for serialisation with retirement, so mark it up with lockdep_assert_held(). Signed-off-by: Chris Wilson Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index d665a33229bd..c64438f8171c 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1259,6 +1259,7 @@ void i915_vma_move_to_active(struct i915_vma *vma, struct drm_i915_gem_object *obj = vma->obj; const unsigned int idx = req->engine->id; + lockdep_assert_held(&req->i915->drm.struct_mutex); GEM_BUG_ON(!drm_mm_node_allocated(&vma->node)); /* Add a reference if we're newly entering the active list.