From patchwork Wed Feb 8 14:09:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9562615 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 97F8560434 for ; Wed, 8 Feb 2017 14:09:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8671E284DA for ; Wed, 8 Feb 2017 14:09:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B631284F6; Wed, 8 Feb 2017 14:09:42 +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 44E66284DA for ; Wed, 8 Feb 2017 14:09:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7E59C6E8B4; Wed, 8 Feb 2017 14:09:41 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 808E06E896 for ; Wed, 8 Feb 2017 14:09:38 +0000 (UTC) Received: by mail-wr0-x242.google.com with SMTP id k90so8821662wrc.3 for ; Wed, 08 Feb 2017 06:09:38 -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:in-reply-to:references; bh=vEVTgecjwBpsmZYgqIfsBsmysYOnboT/VhIhHkFAQN8=; b=WmdEszsKfScxwNqLq08ZWtm+v4ZrDEeaTwUsM5AqRT7yWGtwP2HAMPaK7iA8zs6Mz4 BzhyOTL1RPcs5mzZqY9OxFkB6FEnJOgKaWEhdqQXPTaRkYhHg+lqPVxPMLbPsX7GMiWl c+IajwUdJb1Bag5CMV3/P8JxFO0zBCLUjKjaqc1AZIuvzZXukepJymElZ7pFPsKJwt7u QiDySKDESaOww7ix2EK1NNu1EAUkpCgGs6d06Bj7nt6gOPbaRxemp56d0xpHxm+rhurV Q+khNKegELnKtchEUdp7cZ4eHNZaHUvvnXB/gRhvRaZ6mVhnTAvPCC6nDaYmCrbJ4xfN Iikw== 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 :in-reply-to:references; bh=vEVTgecjwBpsmZYgqIfsBsmysYOnboT/VhIhHkFAQN8=; b=Ya3t0JJWMSrtWr5a9PyUf7GcdzMNPLaBZKTjK7fWPO3wUYQKvfI/4qGPN5KTOBs0xj C9HbSxcTIQWU9+PQUT16zomo5cdy353IqWByUIqUGof21W4JYVQvfdzslncIYxU3c6P/ CVR1/1arJJkx7uXwVRl4EmB4sDvhwPrBXiCLL6Ld0uJvZaaYWAQ6+33NUNNeZBJUGzO4 ad+EOI/uLL1eqPg2xMl1MIuhj3tE5CM/mKZzhb/fbBBKWsI6Rd2FFUsHBkueA5sTPveZ 9oe/c3ZT+2siKBgxIHDjXwIM08G5WPCb276vgblV/26GD2gezVWqJNajaA1Je47oqWYj lxvQ== X-Gm-Message-State: AIkVDXJbVO8SAqF1gi2no9OOHE1Ql4kCQD/Y4uXdN4oVSR7Jyc546qimnXY0jZ/L8d3AeQ== X-Received: by 10.223.166.80 with SMTP id k74mr19111333wrc.171.1486562976915; Wed, 08 Feb 2017 06:09:36 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id u47sm13239835wrb.15.2017.02.08.06.09.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Feb 2017 06:09:36 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 8 Feb 2017 14:09:33 +0000 Message-Id: <20170208140934.14057-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170208140934.14057-1-chris@chris-wilson.co.uk> References: <20170208140934.14057-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 2/3] drm/i915: Unbind any residual objects/vma from the Global GTT on shutdown 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 We may unload the PCI device before all users (such as dma-buf) are completely shutdown. This may leave VMA in the global GTT which we want to revoke, whilst keeping the objects themselves around to service the dma-buf. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_gem_gtt.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 22b3374096e8..00dd2ef11e43 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -2817,6 +2817,15 @@ int i915_gem_init_ggtt(struct drm_i915_private *dev_priv) void i915_ggtt_cleanup_hw(struct drm_i915_private *dev_priv) { struct i915_ggtt *ggtt = &dev_priv->ggtt; + struct i915_vma *vma, *vn; + + ggtt->base.closed = true; + + mutex_lock(&dev_priv->drm.struct_mutex); + WARN_ON(!list_empty(&ggtt->base.active_list)); + list_for_each_entry_safe(vma, vn, &ggtt->base.inactive_list, vm_link) + WARN_ON(i915_vma_unbind(vma)); + mutex_unlock(&dev_priv->drm.struct_mutex); if (dev_priv->mm.aliasing_ppgtt) { struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;