From patchwork Thu Dec 21 09:42:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "He, Hongbo" X-Patchwork-Id: 10127241 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 93491603B5 for ; Thu, 21 Dec 2017 09:43:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A67729B77 for ; Thu, 21 Dec 2017 09:43:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F21629B87; Thu, 21 Dec 2017 09:43:58 +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=BAD_ENC_HEADER,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 019E329B77 for ; Thu, 21 Dec 2017 09:43:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 652AA6E5D7; Thu, 21 Dec 2017 09:43:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0064.outbound.protection.outlook.com [104.47.33.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id BCDEC6E5D7 for ; Thu, 21 Dec 2017 09:43:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=EGWmdvgJrb+Eir8E9lHlrrZgGHfL3+38rkib6AUHN00=; b=TJiYiHU40MXRjKERlpJsjNw86m31squAHUyIEUKbme9U5IHzOkKXEeOMPb/nvJGwdYsUC12VtKaImVcrl5Whci8gdG/JYnZhlY5m5V6RM9o6DhW0nxEryq4FI7tdtRRGNP3kjNLTLeePWZb1bKGgCchpyUZvCqodm62gYSMrXuo= Received: from MWHPR1201CA0007.namprd12.prod.outlook.com (10.174.253.17) by CY4PR12MB1447.namprd12.prod.outlook.com (10.172.71.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.323.15; Thu, 21 Dec 2017 09:43:54 +0000 Received: from BY2NAM03FT033.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::209) by MWHPR1201CA0007.outlook.office365.com (2603:10b6:301:4a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.345.14 via Frontend Transport; Thu, 21 Dec 2017 09:43:54 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT033.mail.protection.outlook.com (10.152.84.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.302.6 via Frontend Transport; Thu, 21 Dec 2017 09:43:53 +0000 Received: from roger-build-server.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.361.1; Thu, 21 Dec 2017 03:43:49 -0600 From: Roger He To: Subject: [PATCH 3/5] drm/ttm: use an operation ctx for ttm_tt_bind Date: Thu, 21 Dec 2017 17:42:51 +0800 Message-ID: <1513849373-7970-3-git-send-email-Hongbo.He@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513849373-7970-1-git-send-email-Hongbo.He@amd.com> References: <1513849373-7970-1-git-send-email-Hongbo.He@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(376002)(346002)(396003)(39860400002)(39380400002)(2980300002)(428003)(199004)(189003)(2351001)(16586007)(68736007)(72206003)(478600001)(4326008)(105586002)(106466001)(305945005)(356003)(316002)(8676002)(81156014)(51416003)(6666003)(7696005)(86362001)(36756003)(48376002)(104016004)(81166006)(53416004)(97736004)(47776003)(53936002)(2906002)(8936002)(50466002)(5660300001)(76176011)(77096006)(6916009)(2950100002)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1447; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT033; 1:QScBdO+sTM5csg4olxSOBm7HHz6c01azaeKcTGQzz4+OnwM5XiJl6WN9vCgwiv5GOiDQY30L4ujOys9S+mv9dt1YNikQUc4X/NJPhggAeYDK8nPvL8OE29Ys690u7Gmi X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b46b8925-d2ea-4aa2-5163-08d548575985 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060); SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1447; 3:41282ymzsYvvNc4OYTlqWRD9cUnJ80x/jxJLK8xkXwMd6j0fmN7aEGDwJK5h0EOaeum+BQOM2h6/j/OXhWuhzRmhVJlolP0T+tLuJwGpjhA+YVp81NfZ99geVHNBsjZqe4w5kEwMm8VvULvV2aKh00cdB+x5Wi7OXWURgSl1kzGU4hvUjHadLGlq7f2lSKaxQpEHp2yImNigoNTD7F7GV2fJcz8BfPS3aYY9nlyXm0FvVJDAc5mhcCP0S+4SEvBisJ5OXn6KNrVDNz/vLnKyGGEz/C64UIfuRv0Evih5tHzQmUZHK6x7+g0KPD/PYXISpS7G/vBLhSwCvGx/u13HAEkeDxUiXVlLh6x2hqExeEo=; 25:o8Dkrob+M1pn9RXPBe0w8Nrsw2WsJII0IpascjIRhN2VX8ozVQTwjrzbcyxtOTpXNZ3yUAIvFRUcJi6YUBUrhgmT2usWjsadkyhxri/IxIsBv8TfwjtHUpiLBdrxgG5yBgThMYa3TflQDrVzqBZUwt/82+r+ZSyxFzaIKeoIhg53cQF2qWa4uaFDYoGyX4SV8LFk0PFf0WVXbok7faeGt5282PjR8AvlytX5QTT3bncybtFVWC4eFoJ8pD7Rpa/5Uxct8NNo9n2q2HoRpKQayLdjT4zdapC7AFduz+v/cUX9FHItZJc5+RsrvwBIRojr8b7fVSIjwSd5IJwCWwxIhQ== X-MS-TrafficTypeDiagnostic: CY4PR12MB1447: X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1447; 31:WenwAl/78MH0YgcsRi94NGOsMFa8Ny7bS4Co24ZC4PiIfzp8tNpzXH3ZbevF9IDhLoUo4QCBLIH1zhlzvyj7le9swV2LpDLU5NZhGhjdyBy9oVmkDkum3uJVmQLGwP1uTrAQN6wsGRnR3qv88AbroY+NdrVGIMcrACv4mxw4Ce3DVXXf3Ba1+dfW3530hUYA7PmXEZ1/hNdg9POdAh5NRs+ePpLOFisJcyrNoIk3c6g=; 20:rhWX2jJQQj3Hkb4thlLn9Wbb9zHS/jKoCARZPmBz6vuuf7QKT/YBslIaZvz0NH/pRag4e+S55Qm1FKXZdDPe4DHB9lFmC5If9Nryj0SfiR3bGONy33aELcjpvQ44HDB1jT1LQj1O7rsQraT111vZD2fZfJ7pNJrobG/j2huQXxApAqu+2Y6mbd8bIOpugLd1BhSCBOnIxeUlJ0vUgwJxeiWIQY32E6vRTWGK70R0XSrpz9vczIaFTcZN5f5t0WPHEoIL5rZJ5HC8BYvkxc3gWqkWEmfJOD2h1uhzF/lxCQqRyOAv01pjPiuwJhkSL9fGxW2ipKyapT3bXbopd+4xPSV7AlfkgVHXW4un09PvjPwwb5K/bd9GpTJBCzS08Fdr7Hj7o+R0IjoJZ2mAxj834Mg2wkMCa/J7hSO1qz3eqdqACnNlJzAlTTB9Rw812Y1ufDBRT7rtBmji9a5w8KIFpxmj/qj0uVgNZb4HEDLdTFDsPxWNI/z68zSHHJsfX1Bv X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(93006095)(93003095)(10201501046)(3231023)(6055026)(6041268)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:CY4PR12MB1447; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1447; 4:Vqyh6PhmgrTO3wrpS+gTDMwsb6Qa0xh/I2WbRqR708RQGToE6IMpxVu+2Q8xMm7wkEssFiBNqTRo0sMBhIsooGWPkxBkR2ba3xc9cW1lryB2KBSJXS8q5P8ys+MyErbfjRvQU91jt0GL4HjlSn5b7Wyuykyj/DNOmX2eoi/1b+E56DoEOxcQOy+016LRLo/lMGzM+Mw4knBLeWUSrB4iu4Yuic0zq+ububedVzKy7OsJeoF/SMVlWVgceu//jre9DckNV3ix+Yvzm5LljTteJEjYDKIW3A22WZ94fHP4VU1A3c4CSH53offhdbKhL/Lo X-Forefront-PRVS: 0528942FD8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR12MB1447; 23:hnyg81gEunHgsP35dyXJXBJoZHj9+AP/z58Cquzra?= =?us-ascii?Q?eiZ/OXXmPpjXPFj4zzU0K18fZLCO3ehYgMZN6p0F1yGsZd/9HyoF1vq5stJt?= =?us-ascii?Q?olawXjpk1BJMvKZvKSQfg2J6ymV3eAgyUb+13RtSqYgg/vJfDp9UjXtUIQGo?= =?us-ascii?Q?skD18nbSdZoSqNp9z5xl8upft75LBQbR/7g6gStNiaOK5jtHBgTamH2skIe5?= =?us-ascii?Q?FjMYbSKSBiYLk+5ofYvzcyAnJqmoA8wc0PZNaFR7ikR93aY1zS17fpiaY2wM?= =?us-ascii?Q?pl9Mg+qaQztwYCuAbBQLcRJT4coNE7Lnf0v0fgO1q9WbYrgoN0Xek0bQD9zC?= =?us-ascii?Q?woj1e/39kArJZlh8AByOXVrMM95sIbdKH6rDdi1Cn1ivWutoTbq5oWbjlOEk?= =?us-ascii?Q?i1jIBxkoUxv+bDQd26VUEYPogn3IcCARfMPwJ93hOewjHrATNtoivEwzOpO+?= =?us-ascii?Q?nfSwvUyxTbljbNSp9wRcP24nmeWUXP+k0/U2EM/5DIBZ82mUJksHBF8sjyBx?= =?us-ascii?Q?iFGHPVfT/qrnhO1D1tLQwW+5emL1CLC7v1BWcm8ezjp+qv8hYBSmFgl5O1iY?= =?us-ascii?Q?OBRLsqh2c/NP9HcV63kM5YwYOda/5jsYrhGSgZKljXFTllZjbwN5JmHySQkm?= =?us-ascii?Q?dik3XyVrTHtRX9i2CL3u6nZtaUV3tDuKqh46wDygqXqFo42+JjWSW7uWDoNd?= =?us-ascii?Q?azi2CLeF0qyPvMJx0TWQf/tYklj45371yXYfO7RXcFaK4Qqia4P0jjl7sp0c?= =?us-ascii?Q?mFQQNJILsBLvfG7T9zOJYrAiHy+tHFzo8PW6sRzrsqH7ORqIRZOiw3WY1Gl6?= =?us-ascii?Q?BCQUOxD01DCLz7xaV5QdpW/tTVziDgbGRyE5LfMZ/J94JL+ozEqVIURHH5Nv?= =?us-ascii?Q?UAtoR+5W2UoOuqDp73JM99VaGtSiAs/R7v3+R0xxjTf0jXjZHIzTmQgrXFsg?= =?us-ascii?Q?9anZIMlhflkAifa22ptzoN2DUlkcVLY2vcqWwBDEOrEdObm5eZfjQlNkf5xU?= =?us-ascii?Q?/G/IhHcUw0xhxEqKYat4Mn3?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1447; 6:sITUvYwEiF4LQFy37NYuE0XkiVqag4MT3lnQG7bSsPa6gOYnTv2492rzgcw2sugIk6vcuyPd/rbFDxHoiL/Q8yx5e5OEKbX4L/3SZWKqrpOTTZimaMhlLagjuLW72rbYcJwWjD9qtqmoRBrKQ3nfAdZYpHRHhRTlVmzt1N+VRDu3BJlMe8mc82zuBKdTsZHgdRHBBM6wwL5ZHaa1PBh27inNylU+jVcArLMlj3LX1IBbEbkVBAswpDqdG8987swJ/9GTlYo7Huko6bYkP1KawweKv18eZhnwu/VkJW7BEkAys+E3pYL+JwJVcfhS5kITbUTTtQyD/Gz1u6PMb2QmgHCcuckgmrdUXC57IyizNh8=; 5:J9mYpUDRhTQR6YxO2Ao6pYWqWv98d/HtVf3e/WKVSfheneZrBuqex1bgOhTn0iALOA6czpmd/NyF8nnZLUJ5QxzH5B3h7e1b6oms7nPz39BED6Itm8QZnnyXMSkof8DpOt0fHiwfFQ6TwYMU96utFP9i0tTsHx30RfOZq1hHpmk=; 24:jgADbEmOrMiptxY3oSuS70Xxq6XK5tYyBgCMsixmRhWhqIuUScP2jY5DZgFVeAr9qrQmcUDT/6s+3h9tEJp8l1qggx8tLOes98aV0bPdEYU=; 7:XUS1le0p/wx8INHUCCzJ/uMdFvvKGBZxHRVgC7yxFmJEF4247myXKlRr2GC5IPALrd7O/ZkAOjjtybBXhE2EK/c2i2Qh86PJFvoKG/gDbAJAWo9dd75s7iCirmjoyUonLFWhrUiPZfb4+H/JBFr0O3EYD3tmCpuoZOcE6yc2CmwCxOxh35/ycweXRXQpBF50JGXx2a4ACGe2mwOZZJO3FzCNQK8q/E8lgDNn/fCIEZinuPljnaJ357jFdHfRzamw SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1447; 20:ItRScE6Gsey6d2mP5NTgC0lNDZixT8gfFOWGIVblwKHjUudFHsms4U228jgo/W4Ajjaax5psxpbWpa6ZFapA9KyF0onfcL6Pkr06GjRvKjNAjjkVUFo+McGujuYCprNHk1q/4Rcja8inMqu/rUS57yW0CKux0/AM1FwoiMKMoLeDFYOCp2Ybm5Ox1GA0F1KYpDLD/ihheuov793FtVcroDjTZ4GTITPOHrgPhJcZImBRnSbPWTGtGfIGQX6j0pDS X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2017 09:43:53.9994 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b46b8925-d2ea-4aa2-5163-08d548575985 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1447 Cc: Roger He 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 forward the operation context to ttm_tt_bind as well, and the ultimate goal is swapout enablement for per vm BOs. Change-Id: I42a7df8c50e1ce3b527ee9cb78809f8e58136f07 Signed-off-by: Roger He --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/gpu/drm/ttm/ttm_bo.c | 2 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +- drivers/gpu/drm/ttm/ttm_tt.c | 9 +++------ include/drm/ttm/ttm_bo_driver.h | 3 ++- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 044f5b5..e4bb435 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -497,7 +497,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict, goto out_cleanup; } - r = ttm_tt_bind(bo->ttm, &tmp_mem); + r = ttm_tt_bind(bo->ttm, &tmp_mem, ctx); if (unlikely(r)) { goto out_cleanup; } diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index b141c27..a83ba6a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1218,7 +1218,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, if (ret) return ret; - ret = ttm_tt_bind(bo->ttm, &tmp_reg); + ret = ttm_tt_bind(bo->ttm, &tmp_reg, &ctx); if (ret) goto out; diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 9424b81..2b74ba1b 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -339,7 +339,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo, goto out_cleanup; } - r = ttm_tt_bind(bo->ttm, &tmp_mem); + r = ttm_tt_bind(bo->ttm, &tmp_mem, &ctx); if (unlikely(r)) { goto out_cleanup; } diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index c59f572..e7595b4 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -300,7 +300,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, goto out_err; if (mem->mem_type != TTM_PL_SYSTEM) { - ret = ttm_tt_bind(bo->ttm, mem); + ret = ttm_tt_bind(bo->ttm, mem, ctx); if (ret) goto out_err; } diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index b7eb507..153de1b 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -73,7 +73,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, return ret; if (new_mem->mem_type != TTM_PL_SYSTEM) { - ret = ttm_tt_bind(ttm, new_mem); + ret = ttm_tt_bind(ttm, new_mem, ctx); if (unlikely(ret != 0)) return ret; } diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index b48d7a0..5a046a3 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -261,12 +261,9 @@ void ttm_tt_unbind(struct ttm_tt *ttm) } } -int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem) +int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem, + struct ttm_operation_ctx *ctx) { - struct ttm_operation_ctx ctx = { - .interruptible = false, - .no_wait_gpu = false - }; int ret = 0; if (!ttm) @@ -275,7 +272,7 @@ int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem) if (ttm->state == tt_bound) return 0; - ret = ttm->bdev->driver->ttm_tt_populate(ttm, &ctx); + ret = ttm->bdev->driver->ttm_tt_populate(ttm, ctx); if (ret) return ret; diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 84860ec..94064b1 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -650,7 +650,8 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma); * * Bind the pages of @ttm to an aperture location identified by @bo_mem */ -int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem); +int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem, + struct ttm_operation_ctx *ctx); /** * ttm_ttm_destroy: