From patchwork Thu Nov 9 08:59:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 10050525 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 6F38660381 for ; Thu, 9 Nov 2017 08:59:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F4E42ABB0 for ; Thu, 9 Nov 2017 08:59:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 52BB72ABE7; Thu, 9 Nov 2017 08:59:54 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 16C862ABB0 for ; Thu, 9 Nov 2017 08:59:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C2BF8968D; Thu, 9 Nov 2017 08:59:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 640646E876; Thu, 9 Nov 2017 08:59:19 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id 4so4892322wrt.0; Thu, 09 Nov 2017 00:59:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GRUNDIDE7+YR8zS9J1NARMZLQJ639SlpLI9lyIibkNQ=; b=kaKM0vuL1EmnxqX7wZndLwzFCWwgvJyn34LBhwps1mWwDFmQ2+XCwp4qQzAFm3TnKg B+Q2nlgcCMOyVDEGtZmUiwwKHpCUIiy6D7QmqcWkUr5CAcgI4rxFOaxUQyfDnM1Me7RH dBkQLDognQuF82ZfpOD+tbEEYy2H1KlVZuX4WDm2pbZaVK16Hon2YhIiKY0HouBYYzYZ r/SqQpmM5RlyQhpNgKQ8JCKpGQYHHqz74kafbfh4LMmautM3hj+QLndZeMCujWuT4W9D vHD+P8KXvnthec9HPd5Q6rfuLj93cHbOPj98o9CTKhMiqWkZ18BqpyfMbbKRBuUrSCYH 2hfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GRUNDIDE7+YR8zS9J1NARMZLQJ639SlpLI9lyIibkNQ=; b=crvD1iP7TmGp6hODIJOFqAnup7ND3WsJ6N47agJHz9jbNbD3sHXwS4OzPFjcZbUBpO 99nmVkdY0Tz5wTka9+iGyYoNDbMnQX/veBmJ9kpZvK0ann9QhEoJMwxb0nJjyr9Jf6Gc SPBO/Vw2w3NGV8761Y+0xWMcNCdOzw6wglRUrKW6cUgKX3t1+6R68pAbVVOw1Q2d+0w1 LNSqc4lpTDtBMib7HKbqufr3ESxq81bRPelophc35x/gEsMpk7wFs2N/MyWezG0VB2br TiFHp7SadbwYoUCLGTQa21o4sQgpvLtD5p+Z5AiEe8I0w+nnf/dKpxBNKZC4OwkWl34i 0Pww== X-Gm-Message-State: AJaThX7Po5IE47nIMBzoajwPlYpDf7D9pj7Jd7FMX8OJ+6cE9gflur5m LydLjU+NDcqeMl33P+x3SNOPzg== X-Google-Smtp-Source: ABhQp+RvaN3U0r+6BAmWEPqkvQ8MMFsdUcxBrznmWsSuwoZ+FIm79LCbyziQPW1XMjwcObBG3nLOPQ== X-Received: by 10.223.164.72 with SMTP id e8mr2372012wra.225.1510217957884; Thu, 09 Nov 2017 00:59:17 -0800 (PST) Received: from localhost.localdomain ([2a02:908:1251:7981:61f0:1658:ce3b:16a3]) by smtp.gmail.com with ESMTPSA id 69sm8893723wmp.37.2017.11.09.00.59.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Nov 2017 00:59:17 -0800 (PST) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Hongbo.He@amd.com, michel@daenzer.net Subject: [PATCH 5/7] drm/ttm: remove ttm_bo_unreserve_ticket Date: Thu, 9 Nov 2017 09:59:07 +0100 Message-Id: <20171109085909.1653-5-christian.koenig@amd.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171109085909.1653-1-christian.koenig@amd.com> References: <20171109085909.1653-1-christian.koenig@amd.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Just another alias for ttm_bo_unreserve. Signed-off-by: Christian König --- drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- include/drm/ttm/ttm_bo_driver.h | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index 2170534101ca..dedd58fee67b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -349,7 +349,7 @@ validate_fini_no_ticket(struct validate_op *op, struct nouveau_fence *fence, list_del(&nvbo->entry); nvbo->reserved_by = NULL; - ttm_bo_unreserve_ticket(&nvbo->bo, &op->ticket); + ttm_bo_unreserve(&nvbo->bo); drm_gem_object_unreference_unlocked(&nvbo->gem); } } diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 3659cf6150d2..cba1477aa983 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -957,19 +957,6 @@ static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo) reservation_object_unlock(bo->resv); } -/** - * ttm_bo_unreserve_ticket - * @bo: A pointer to a struct ttm_buffer_object. - * @ticket: ww_acquire_ctx used for reserving - * - * Unreserve a previous reservation of @bo made with @ticket. - */ -static inline void ttm_bo_unreserve_ticket(struct ttm_buffer_object *bo, - struct ww_acquire_ctx *t) -{ - ttm_bo_unreserve(bo); -} - /* * ttm_bo_util.c */