From patchwork Tue Dec 12 09:33:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "He, Hongbo" X-Patchwork-Id: 10106567 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 C8947602C2 for ; Tue, 12 Dec 2017 09:36:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C17C929B64 for ; Tue, 12 Dec 2017 09:36:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B67EA29B6B; Tue, 12 Dec 2017 09:36:03 +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 BC93C29B64 for ; Tue, 12 Dec 2017 09:36:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1BB7189F97; Tue, 12 Dec 2017 09:36:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0065.outbound.protection.outlook.com [104.47.34.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7587F89F97; Tue, 12 Dec 2017 09:36:00 +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=81EUFkJOMJ2M4AQjSd+KjUXi8Fb5v3+RWGEkng97K+E=; b=dACo/VG5UwisigkVf0SL8zsXtPcMJDHetnNnyYlT1B6VXhJv1Bs0rea/X0sOmh6Df6NrhmVCyAaQXRAisvdmygTCDMj3JDfoI+5EfAfnn8zs6h8aRzD24dAWtNCD/OjTCBC6jg7msD4ROFWDR7myKFeKTWrJ5BPYC6PDitiOODQ= Received: from SN1PR12CA0033.namprd12.prod.outlook.com (10.162.96.171) by DM5PR12MB1451.namprd12.prod.outlook.com (10.172.38.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Tue, 12 Dec 2017 09:35:58 +0000 Received: from CO1NAM03FT044.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::207) by SN1PR12CA0033.outlook.office365.com (2a01:111:e400:5174::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.302.9 via Frontend Transport; Tue, 12 Dec 2017 09:35:58 +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 SATLEXCHOV01.amd.com (165.204.84.17) by CO1NAM03FT044.mail.protection.outlook.com (10.152.81.108) 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; Tue, 12 Dec 2017 09:35:58 +0000 Received: from roger-build-server.amd.com (10.34.1.3) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.361.1; Tue, 12 Dec 2017 03:35:56 -0600 From: Roger He To: , Subject: [PATCH 6/6] drm/ttm: remove parameter reservation since it is moved into ttm context Date: Tue, 12 Dec 2017 17:33:48 +0800 Message-ID: <1513071228-29551-6-git-send-email-Hongbo.He@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513071228-29551-1-git-send-email-Hongbo.He@amd.com> References: <1513071228-29551-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)(7966004)(39860400002)(346002)(376002)(2980300002)(428003)(199004)(189003)(356003)(8676002)(105586002)(106466001)(53416004)(51416003)(68736007)(2906002)(104016004)(48376002)(36756003)(50226002)(81166006)(81156014)(305945005)(110136005)(4326008)(450100002)(7696005)(316002)(16586007)(53936002)(97736004)(77096006)(86362001)(76176011)(72206003)(508600001)(50466002)(47776003)(2950100002)(6666003)(59450400001)(8936002)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1451; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM03FT044; 1:0gTlGkU5lmJkm0yJLJpYfp+bcKUNpkzQE3PlZkngj7BaAXAtwkwHcETBQAzGE+kqt752CySQoLtMa47N78DMPWLZo+HcZC0qrF2cH5fbCuvtnc+W5Fc/sNkpZ0gGg3wk X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bf5fb630-0fb1-467a-aeb7-08d54143c020 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603307); SRVR:DM5PR12MB1451; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1451; 3:okTi/BUd49SFUVUuIljPwFT3TOmUI68E2Y69naEyL429yFCBNk/uON0u6YXjnAKsLydRzI1arWNABZEoIY53aI0XEpiCVN4F4rKLH/ZysCKKCyXjNEJCBvGXwmbsamcqG1PgXyfOKZSRXP5wJm56+3r2T9KaHZJOyytG3tDT6jkXKp2K2+M+aPKDFscru+7/fSvD6JR1e7ruCvw7c4Up/mg3QrgJzPw82cARg4tHcBdT+MaxG9wAUmN5Bbx7GIPSxcDd3Wrh5NvCJmgrom2jfr39DZgognoSZdsC5sDh8JV7sU2ksqDt4u91pO4wWkRO5JfvWnC8bEXWygmcHU06/4VFjKv+J7H2ZyL9cq1Qge4=; 25:6B0H1y03sRTIiwcj9M0ZSBMIukB2/WZh16MW8PG7lxyYPSxop9HUaVntaxN3O71L3nuyP8HAdeJ30HOY8Lx0surzubvZFW3HkuEK8echpVTkLFvudTBCeRxNd5Sw5oV+3kwmsMKr9L98F8rhoBIGkEPGGHBDEDHHveWe1/2q1+F9KKOxFjKYUG33pkfYV0F4xqgEInFuYo3irx5BS+7vRdDLAjQ5pJCQqu0KZXFGn1rv97zIc1sG3VDCBucJz80o1cGbFf8OikpesJ0zLofRNM1wZEr59OxR6cMMXrJRHmNPhRriTiI9aKqeCy+eILnQ6vYMH+6Gmbj6r7W1PzYViQ== X-MS-TrafficTypeDiagnostic: DM5PR12MB1451: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1451; 31:lOy3sqIJY0jbLWVg44CszfgqZ/BripSWexP75wY0AS2xtqhQjNebg8gD6HfQwsqCdbQeJp3v61BF5DgtQG0mw7cUSwz/t429BD99zMcv8OkVxqbCwIfJgwQxxD7+hiwyTpdACdnRR6vNTcqRvJUgA9vL12KSu4ZzhlPVhsRGG+MkU34uI/gYZ5cqHp+bzwm73CbTTjMyT5w84lkzvVLXcP6XpiRrg2j7XQ3ebgXkSMk=; 20:6nJ3SZ5iugkH6+nAk7PptouguHdzFoGfPK8z4SRK3Y46Xi5SDgb9orIF4bfhx3z/pjjoRFrG/Yx/F387hZbGkxaJKNLRsqK6AGOF6uGsKYuKodmrtT/kQSqIJvMb0zudvFnee9PnyAsllXxcpKG4voX9wGEjmL5kw1JBEoKf/QHTbhR2IqHq4/yN1prKMf3Lk585/A9KeqJ1BGqCUl3gKGrvNhV5kwkyo0KhEgfHk6gp6RNNFcuBx5R0NpMRYuiqk0JE1AL7B7q8/n6YGPh9c4evnnsGlMAzyVCmmAe4fLF4y5rMM4TNUgFRrSHbABOdBHmmyYBH+56kK/f3x/mtg+6bMsLcjsLI0xfvGvDiwOD0jTtz0w/mQeZSCv73/6iLpAuuXBRdIisozadHdizvxIf+7eh/nA1APylHdF2TuoynaMZd6fUsgxr/RmOEMJMS/e4QmmG56de6/Y9P/wvzIgFw1+lfAbDbGiEffnBTKm6uQujaMLfm+r9i38Cz3exy X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(3002001)(93006095)(93003095)(3231023)(10201501046)(6055026)(6041248)(20161123558100)(20161123555025)(20161123560025)(20161123562025)(20161123564025)(201703131423075)(201703011903075)(201702281528075)(201703061421075)(6072148)(201708071742011); SRVR:DM5PR12MB1451; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DM5PR12MB1451; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1451; 4:fDBafTnC/gl1D3Xt82MxesqQcs86UIzP92T439A0jO70XrwcIYqvDRXkvY05U6LNV5STvzbZQ2UDfqihaCyKG+89W4lTBruC470IcTOlc+b28mo/IoOeWK7YI82v7FuZwNZz4mkrzHVtgtSGheDx1DzzrJ6ns7GAvJx5VAvbHViogbHKksEWylSRKtZJ5UvN1cYT2kDT1eaUZ7moD0aYZWaMq8LaO4EUy5/0U9xfduF4S+0UtKTJeX86jCnbodeePRGyycXasOcL2A5RZIUa4uWkWJ730rtbEfZPvN2IWYgANbVeytcSO7mE4OHIW1JI X-Forefront-PRVS: 051900244E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR12MB1451; 23:2c8q6F0lFjS5jFpDXJer03MCX04DpMEY/wBGiKZgg?= =?us-ascii?Q?2pWLmy7ScYMGiRzm5/80w/4iQWaqIxxYa/oYOlYD46EOoBv8HKVOlSR/N01h?= =?us-ascii?Q?2DfXTSy7Hzhft+UQr4zHEZm1DThBOes320CVmS3u1gXReQukn7sSuMgdacnG?= =?us-ascii?Q?ggcf91qecMy/pSy/KsJVnyC6inslas3ql5PkAXfG7lXAoX23roKpRBkAz68f?= =?us-ascii?Q?RJ/tT+VKCniLgzOcBPlHZMo0/2vl097/VSlqsxWeFCcbyWXStWpgJKEB3+Pt?= =?us-ascii?Q?KzoQLghMCjJh8U1kCCoSQ43MulU3mOpHAdBPmuZ8Of86aDbvH6Qrd8Pr9238?= =?us-ascii?Q?vqWjBDwxf3/modBPqP7enGrev1qjD257DXWw8iHIL9uOo+ZUWLE59u1TxvFX?= =?us-ascii?Q?DsXSACGxeuX1A6ggqLstYGfil1LXC9JqiDFsljlBgVY7tHtHcs1T8m4Y41CX?= =?us-ascii?Q?SZ5mSD8PZb9J+qzY0IwY2xRwxsGAl7D9RXW4mb/flVuwQQ1IwdguSAKoTk8E?= =?us-ascii?Q?pMbSa8hOJ9YsCXmP1+sMOgEtFaJ07i6hqtOT41HWicsJJsOIv9ZKDHv1afhl?= =?us-ascii?Q?sbdfCG/zkkwwyNFDC+SMnuByuy+B9tH8ysYenHHINn3+vA/Z6PFxDt6OSHWd?= =?us-ascii?Q?sVtN0FTsfMDp9DNUg5lNJM/8E+Lqs/9rRTHmlEente9ApVyxjBE7lQ1Mkbwy?= =?us-ascii?Q?sYDlhYX02WBxQiqJhagM1AJ0MGOZEYZfcqqvwec2SQlJ4qSxnCw541beutVj?= =?us-ascii?Q?ebx6Y/QXRJyx0kD5OEk6gKFABUYvBkMgqvWm4gFwrc/pKP76f+oo/3+xfNHl?= =?us-ascii?Q?A/bgeAcvj0YEWz9KwYl0BNJ6wcZGMD1/6LSOUgVgXWbhPxPUYPEGdqAL9IZE?= =?us-ascii?Q?NR2/4J32a6L9yiaGZ6yocS8xzOKD/ZzKcc2My/k6BRNH0QLsmkhAzayc6w06?= =?us-ascii?Q?LQM4iHyPQ+V6qqiSLwXbf8Ny66yHI8LpVQczF8gPMS3xpWb8IPQ3gIZW2olE?= =?us-ascii?Q?9cnbCBH94EFvKN55/wgvieAKXbE8mv1PxrHOLCFU9A/aQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1451; 6:PwFm9ji9ntj0oF7JYY7F7eqbVI+o/FyVXGY3yDzA8o06Guog6B3b60tsfBRqqBfhpjRoH9f2XjBNPcZIEVcXFeZ+QaGjpGEa+URzZOgnSXUASsr93pfBV9xMpDCC1jLbCBlbmmWMLaeVBAajrdIGzxRmiWiT0HCehxlCYXqhy6j86uTR3rOmQ9uqdkZUWyN1DvIN5YOJku+Qpk/SGdAatEqT/v9S0EiFlFZ4/civXa/iCx54Ns7JUn1ag5aY7A9QjQhRFjfQh/cPt6ztdJegh7hLYK9pOZl+kBqUZqdENNkBkmuhHHwmWlyKJ0AXZ0AYAgDmDs+jRo3ijYH01nT/HuOxTj+FFKB+wQRYVJpAMoM=; 5:wMFMLs43+0MDMFFcU+o75zi8LCLM1I8kPcm/VkhjPfvVhPCwng/xPsQ/WgLGckOz9tBBucfRJBUPYlY0yO1IcYpYTvu0GhBHeJkovMA2g4xzFtZvn1UWh/1tBGRabIkMTSmWSiHGqkHCx0iRpGIJE34/wvtysJajnyN5aVj2vVI=; 24:SA/hxr9tgcwm4tWDrsR0KjGc0kinNd26lcqtPInnJESJDRAZnDU7DFRjoGlCPRuSKNaHm9EWCDsVFQCgtNNSBk8CtrZG/NWVcpwt2K6hz1g=; 7:ZSW9dDUSxKxSwDS3eGqy1cmkkX8yiO1/DnVcGDiJcyxwfC3pomv7pGWmqe3BM0W637PCBlGAtpEK0WhKP+gcaL+i+ZXBqtyFe+LST0DgiGQQATsCQc8UzY8DaD+xEBobd1LmFK37je0KpOGJUALRp4HddJq7y2YiaX4awHsBAB8a5jRBXBe7XNu+D7jADFeKcz1wXdCRDbG6X/8seXoMRghiTzcWlyK+gOMNfgCAx//G5YlrfnPjjMOwSagbXc5h SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1451; 20:wYTurAawSJYJZxiEQDsjjdQSsYhsd0dShe9rQZ8z7h0ju3ApWBA3R80hM9k6OYQxfGPvFDUWK5L66KDvrsiVpZ/q9dPSabflYzwDP63rVFJvLjX9qXV2dFu3SRgUKMYuxJzp3P5usuFq8wPCQLQQim0roFfTwL6vxLLjEoVtcKvF75VDqMX1falZZDeoQon7WOGrwpOLXaP9YDogba9bqw0pTWFCoHtrQWWIHwpNVermdt0K5wVGXk0bAocOLh7u X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2017 09:35:58.2899 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bf5fb630-0fb1-467a-aeb7-08d54143c020 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=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1451 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 Change-Id: I83ac6a77f24e14698aa386a497a262e24c5bbdb6 Signed-off-by: Roger He --- drivers/gpu/drm/ttm/ttm_bo.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 22b6ca5..f138e95 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -707,7 +707,6 @@ bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo, EXPORT_SYMBOL(ttm_bo_eviction_valuable); static int ttm_mem_evict_first(struct ttm_bo_device *bdev, - struct reservation_object *resv, uint32_t mem_type, const struct ttm_place *place, struct ttm_operation_ctx *ctx) @@ -834,7 +833,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo, return ret; if (mem->mm_node) break; - ret = ttm_mem_evict_first(bdev, bo->resv, mem_type, place, ctx); + ret = ttm_mem_evict_first(bdev, mem_type, place, ctx); if (unlikely(ret != 0)) return ret; } while (1); @@ -1332,8 +1331,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev, for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) { while (!list_empty(&man->lru[i])) { spin_unlock(&glob->lru_lock); - ret = ttm_mem_evict_first(bdev, NULL, mem_type, - NULL, &ctx); + ret = ttm_mem_evict_first(bdev, mem_type, NULL, &ctx); if (ret) return ret; spin_lock(&glob->lru_lock);