From patchwork Thu Jan 19 19:26:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9526697 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 D29E560437 for ; Thu, 19 Jan 2017 19:27:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C48D1204C1 for ; Thu, 19 Jan 2017 19:27:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B961528641; Thu, 19 Jan 2017 19:27:15 +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 8B690204C1 for ; Thu, 19 Jan 2017 19:27:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A9CDC6EAC9; Thu, 19 Jan 2017 19:27:12 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id D654E6EABC for ; Thu, 19 Jan 2017 19:27:06 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id d140so1264728wmd.2 for ; Thu, 19 Jan 2017 11:27:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=jrpIFicRrcu1uVCVW2kbTNwFUuagSIfT3iNCNFD82a4=; b=TlZRqRJKiIg+Wzk59qSnA6moxiyMSV3jHSYNKS67bRpr2uXHYnEDf5ax6NPkYN+0Wa HJyxU+uoCfyx/3Dyn2doJPF4KLVaOTmcD5BFUVC/ydRqxw49iII+XC7+xpsbAQ/jXa66 mGO2/czf0bithKa/JKxhhHpYj93gq67D0KLPf0Zv/49bGdKDAA9/RYhMt9rNoi+Y0Wsk BWu91mOPeEzu7EwRh1CJ1ImMgwP7Zkp8I8WzsO9poKs26rQTEP+A0XfoDq42aEPoNaqb M6ZssGLU9AO17OFi54HQaglpMWwG5K9z4C3ulg9okKA4q7T0KnqTv1Mn+tesSwc55uY9 4Zow== 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:cc:subject:date:message-id :in-reply-to:references; bh=jrpIFicRrcu1uVCVW2kbTNwFUuagSIfT3iNCNFD82a4=; b=TSzWnIKNgobO2AAyQ3+/BsG0TgWNaPODWPrBvds0aeENH6Ypkro/0IVNSx5HHHsjnf 7wacNuX9LmAD/LJUhH0Pxl4eHLtjHQ1xABcgRc98NXHzyNFH/fKWt24MsAqUQmjQ0fZM iATiTulqWMYV/2KmlUdkbVVr6LLxLp7YvaUdmD7iseqwlyspTz4HoNOvuqbxv32yyity 4aJ+p3y71nPFYqXrwY5yMp2i+OdJfqvtn71xrRfxB8nSqNXkdSokPKs48xSGJ9RNN74Q eRdYOqYzbP9rOJBeD87TwIM0bnDDC64zKPXIEXDA3WvFHHNRIHI9HZe35JjuU3L0e8Ce tung== X-Gm-Message-State: AIkVDXJsJTvYiLN+nE7Ia7i+4YwWzwea2RhtHBnYjXbOF2brqF9sPeqeZTMdb+Di/6sKYw== X-Received: by 10.28.17.20 with SMTP id 20mr177485wmr.106.1484854025263; Thu, 19 Jan 2017 11:27:05 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id r129sm326222wmd.8.2017.01.19.11.27.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jan 2017 11:27:04 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 19 Jan 2017 19:26:57 +0000 Message-Id: <20170119192659.31789-4-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170119192659.31789-1-chris@chris-wilson.co.uk> References: <20170119192659.31789-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 4/6] drm/i915: Treat an error from i915_vma_instance() as unlikely 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 When pinning into the global GTT, an error from creating the VMA is unlikely, so mark it so. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index fdb6e0ece18c..ae13450fcbe2 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3680,7 +3680,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, lockdep_assert_held(&obj->base.dev->struct_mutex); vma = i915_vma_instance(obj, vm, view); - if (IS_ERR(vma)) + if (unlikely(IS_ERR(vma))) return vma; if (i915_vma_misplaced(vma, size, alignment, flags)) {