From patchwork Thu Jun 21 15:33:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Grodzovsky X-Patchwork-Id: 10480069 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 5781A60365 for ; Thu, 21 Jun 2018 15:33:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C871827FB7 for ; Thu, 21 Jun 2018 15:33:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCCB8285CD; Thu, 21 Jun 2018 15:33:46 +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=-5.2 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 556B127FB7 for ; Thu, 21 Jun 2018 15:33:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A872894EB; Thu, 21 Jun 2018 15:33:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-eopbgr680057.outbound.protection.outlook.com [40.107.68.57]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5ECBB894EA; Thu, 21 Jun 2018 15:33:44 +0000 (UTC) Received: from SN1PR12CA0099.namprd12.prod.outlook.com (2603:10b6:802:21::34) by CY4PR12MB1927.namprd12.prod.outlook.com (2603:10b6:903:128::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.17; Thu, 21 Jun 2018 15:33:42 +0000 Received: from CO1NAM03FT062.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::205) by SN1PR12CA0099.outlook.office365.com (2603:10b6:802:21::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.863.17 via Frontend Transport; Thu, 21 Jun 2018 15:33:42 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by CO1NAM03FT062.mail.protection.outlook.com (10.152.81.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.884.17 via Frontend Transport; Thu, 21 Jun 2018 15:33:41 +0000 Received: from agrodzovsky-All-Series.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Thu, 21 Jun 2018 10:33:39 -0500 From: Andrey Grodzovsky To: , Subject: [PATCH v2 2/2] drm/amdgpu: Rename entity cleanup finctions. Date: Thu, 21 Jun 2018 11:33:09 -0400 Message-ID: <1529595189-3459-2-git-send-email-andrey.grodzovsky@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529595189-3459-1-git-send-email-andrey.grodzovsky@amd.com> References: <1529595189-3459-1-git-send-email-andrey.grodzovsky@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)(396003)(39380400002)(346002)(39860400002)(376002)(2980300002)(428003)(189003)(199004)(44832011)(50466002)(81166006)(50226002)(8936002)(5820100001)(53416004)(11346002)(316002)(446003)(8676002)(4326008)(356003)(426003)(53936002)(305945005)(72206003)(478600001)(81156014)(486006)(2616005)(54906003)(126002)(476003)(110136005)(86362001)(7696005)(104016004)(5660300001)(2906002)(26005)(97736004)(575784001)(336012)(23676004)(106466001)(59450400001)(36756003)(77096007)(186003)(6666003)(2870700001)(105586002)(68736007)(47776003)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1927; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM03FT062; 1:o0bM5aVDYn53dZv/qNgRmDVsWnlb2R3r7majOAnY9a/kC26qY4U+JkO3xEvJVZobTLDrYDlm3/zCFH8r1pw6lu4DGAkHDjeJ3+I+0HeV1UDrtLpf56s1YSAiCXCCJ1JV X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d6c11cf4-6bc2-4b41-c085-08d5d78c5e0f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(2017052603328)(7153060); SRVR:CY4PR12MB1927; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1927; 3:tk786OJ6Z/Bojv/7hBEfTuAKICUIoIpChzfFSjYHCslLdERduVAfzRDhaGSFt6J3z8Opse7KUFwcKtJIQk4LN6oZjCrzYqB2XWkdTVizVPseJAUgXa9w6CC6skdzu1f8SKyM1Z8aIk+vehpkJEKtUxDM6JqGxW1Dn4pBguq2dm1JGpn6Ho0DJPAqLbjiqeU60H1ggoL733+LFrQOba1sC6UV/FI3v3GIo1GqErTmoXuEOvNt1AFmOlcU5qFSgnpGdmolTpnyMscr7LEtGEwfu8vBJpZc/r2/upMI1noN2b2GfehJnjTY7bH4XCs2uWgkJiA1XYSAKGXrQIrnlaPfcGZQWdFjO07bO539j1klLjs=; 25:O5H1wXlLg7N5tz5yX+is4jM5ZWbvTGxtTOr75XAVqIPjoarhoywjFn7JaAIgbOAaUrmNWvFErJOVNbN7DUIU3eXlVgQYkYeaT0n8UtkFIkVGbRYpLWmgGSHRMOVI5HI1tQx0wdNm/b1wXi6KuAGtBQK4FxZR0o8/7FBiLxcqbSS+BnBf+x13noi0rQ6ABZI3Y2wXPl0edVTDdz9Lw+ynDkFQQ0qv6SuJmkhIkN9TZl52kc9Eo2DIdCgGUMbeJFC6msmN6zKp9pK6UxKXir2YtlaGQvj59xCIOVwbkec8ra6pObHFmS9PZ903TwMfkozzgpVxzZ6JjsgGhAOpZV8Gtg== X-MS-TrafficTypeDiagnostic: CY4PR12MB1927: X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1927; 31:p96M5cPEPu8sY3YAxzZNok1T9UYAB5mU1udvwixA5imdjXXThFYaxL1Za2hUpCdeJat0a2WvR/9Ja4phEIKiSUji8YfdMG/FyN2HKCBTitss6NWW1zSBs7GH8Frd+ksEdpjti21JT3/h2FC9++D1q40XxxvjvYaaoo0nvtncaIRO0sS9G1kSKhK2eX3wHfgZwixy+2QMLBMNfiQvirB9Ote7cxfpTrrppyu/9uk4HLA=; 20:EhZPkoBJjLWtKqO+ESSamq3piPCkPCuZ4Boy4Lzb2lzsJDX3kbbFyupwc3cX5+iyhbyDpQwyhX1JFVxSmFm3UCrSBYsq5eA9/FKffwJOUGGLXeDjwniyIS/H1xzz78zuGYN3Ax+nLlhPOf+YH2NNPCjMf7Zy4MNaTpYVwbhocAg8gKVCGsa6qhHHdzAEhw++kOJqBjjFpnzuPPsUup+lXeYFzAvPn4i1FmzYMN3GwwpVmSdMwNTLQtFPfzZkXxOR4AnqJIz/RPvZA+jaB+IMFX0AuBRQ9mjPYDVeVfl3TShRoicoXrL4MUZfq1pIMoEo7vjN4VPtEox0YANtQprAntZjZjVWjdLJIcObE7/meujSS8fPGs12ZxwFKzzcLKD+AfjlKKtwnssKta66C1zHjXR4Pu1ca2HqAIxIeb4cIl9Gqp8fcNGTO7b/gEZSKsY3D5J8DI9S4bB5ZyNQYIM3RutRSibKAlIhI+BvATKvQG9+/M0VNVf/1omOXEdgfjM+ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93003095)(3231254)(944501410)(52105095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:CY4PR12MB1927; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1927; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1927; 4:v+/qmow7FejiYt8telTQLnK7tXR4b/l+ejc55q4u5SGf91DlFFko8cDjCykyxzR4FGeJxxZbzwrGkFmldZuxdawb7TOp7lpLVjjjdeNmq3++mPQWepqwzLepSuJq/B+HvZjUcwQnDH3omaUT59PZNt7K+iF0BXD4uMSQmZWDrHs2GHUnEK1swiMoJYfzHZOT8FlzlUnDsZhMBN4uE6og7hBLINjHf91zziuOuDrURc8fqjCfFefNBxQ0zq830HVMDkyQP/wloOQzQGzFVjufF5iZid9IPKLjL9hx5oRK0g7BqhKKo3YKpmdOmh935AoM X-Forefront-PRVS: 07106EF9B9 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjEyTUIxOTI3OzIzOmRoMms4TEhvZFlDYm5IOGNDVGtkUFNuWVhW?= =?utf-8?B?RWNhQ3Y3Q1RtZzFkZ2wvRGpsRE1iaGhmT2xyMXhNSWo4RGtqR1V2Qzc3TFZ3?= =?utf-8?B?ckNIUGxqaEJnNlF5bTdJTUg3aGNkTFRuL3MrVXA5aGNIYkJvVjR4Q3pVZm9t?= =?utf-8?B?b1ZqS0FIWHBndk5JdW9vU0k5M2tteW1KYzN1WGFwcFBaREhJNWYvL1ZVWllC?= =?utf-8?B?R1hJMkNKYkxMMm9PT0w2QWRsSEVlL2VTZmxnMFR1WGFrK2IzbHZyZGJSSnIz?= =?utf-8?B?aGRQU3NzdW50ZldzaGMzSEtEVExTYW1UYTFJSktuYnJJMGQ0LzJ0SkMxcmk3?= =?utf-8?B?dlFVVWhhaVhtNGVPa3FiWjhXajY1ZG5FYVlzZVh3MnNzbnBOOUVoaHo5YmFQ?= =?utf-8?B?ZTZ0TGhvNjBsWlg1YzdxWVhvSGdvNXJRN3U1Q1dsbEFPNENTQzVzcmVXQzBl?= =?utf-8?B?Sm9Ub2JEeFlQbXJSbDVPYTdnc0hsaHZZZmFaVEd2R3dmNUs4ckpLRVZPaHY3?= =?utf-8?B?VDBjdXV0T2IraWl6Z05yZUFwNlBCdk81WkJOcXhROUx1aVZJaTlMUDB5cW5u?= =?utf-8?B?cUY1ZXVJVGVIenRxaTNScWlsaUlmZGVBRytQcWVXTjFMLzFRV0tlOEd3cTdn?= =?utf-8?B?SE84QUJRNkc1a2xkVE9ScmM5eGUvTVVBYVJ5a3dBYkY2QmpQUjh4aEJQNXZs?= =?utf-8?B?bHdsRWVLK2YxUXdjTzJzK1BUSERjZlB5b1lET1JmMVEzT3BNR2swMi9LYVpx?= =?utf-8?B?TFEyTHByWmJaSXZ4Nys4RWRWTzFZdGVRaWsvaGcxV3d4ZTlqcWpucGFzbldp?= =?utf-8?B?WTlKSGRQbjI1bVl1RC9YdC9VazJqbDNkZWtXZ0tBVERDTXVSanBISlZ5Z3ox?= =?utf-8?B?WHJOTkdBUVo0ZVZrbkw3azV5dXB0aVJLUkpBQmI3dUVIZDZiK2x2elFzS2ps?= =?utf-8?B?NS93OGpIWDFVaWVIVWZ2V1NSRFVHbXV5czBCUGVyUGYzQVJMZ05rUW12U21l?= =?utf-8?B?YjM1VGRIVEhSeWtScjB3TnlESGp5RW1UWktaaWtxVXNZSEhDZCtpYjN5RDJJ?= =?utf-8?B?eHJZSjB5a3ZScEM5SjVWNktNOWszZmxSNFR6emN2YitwT3lXR3BOTjEwdTJZ?= =?utf-8?B?Yit2WWxNS0dncmFQSUwyU0ZmcWhpVDZNSGIrdzBzMk5OUTRjemV3ZzlubUkz?= =?utf-8?B?djJyZU10cUlsU1IzYlJpb2U1NGRVbXB6ZFhQT1BNdmtlaGcwUVF0Z3p6MUZX?= =?utf-8?B?SEpaazlPNGNzNkZ3UFhuMWtRTWhNVzlnSjByM0w3YzF2RUkrMlVPenA0R2li?= =?utf-8?B?MzFPcUlVNHhwSmhISzczWCsrRGxpdHZFVzRwbHZhTE44T2NId05xZ1Z0am00?= =?utf-8?B?TEhtcUhNV0t1cHo4ckRpbUZJTTZUUXN0a3AwVURwbGo4MXRYQy95ei9aamJY?= =?utf-8?B?RlRGQ3Ntd2ZvT2gzR0gvQkMwU1VhNVg4ZXg4L2NBbWFrY2ZpMjdxYnkvNERm?= =?utf-8?B?NEV4bU5iekNweVlrZUttazFONXV3QUZTM3VKbWFKYWI1NTlOTWFWRk5LRktL?= =?utf-8?B?eWFUaHozT1BWd1hoTzV2VlVhSzE0YmxYelRYWW1WQ3lnUlNnbk9sUHNxMHdj?= =?utf-8?B?Z2MvcGdNZlpEMFBLQ0hKWnBwZ09tUG90UDhhN0RQbVJVQWI5ZC9TSG4wYkZB?= =?utf-8?Q?lBPk0Y2lbrPt3mpIu0=3D?= X-Microsoft-Antispam-Message-Info: QbrwQ+bPlQNfQjeT7WeP5Xzagn4+41t5VK4t/tiM8fFgOC75Ey4teXxwqkm7vze7XaYTeveBmEyvIjDEqFGbnhqP25wAje+ye5arTmcKxp0S+Oj7U097TYuxY8BF6vL0o1/Uo8B0E+BAdhRo8w9oYcWj1DgWdwzio2/4rq6ih9z93I//pmny2lvQR9yeXp+pwTeMWZOhjwDzmjkoL6h7ehqXddGaqPkZOQoUwF5sF6sc64+YL+fWUZjDmJOVw7L2XgzOGjLPH8LFd8vM67utwHvr6DmmTpV9R94CkapULnJh2oe+qJAfv882FkCSUvCQ0VuhduOrg5FLY11raXpstw== X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1927; 6:g0J0AIH5ZI4vaWmFjioEzbaSoMGIAlhBxfuLQm7ApNV+Cx3xZoza3FDa/WpF0ercFeFg9lGp1VRf0zJL93+MS4PiJJFW6HbQTjtzNSRQLnCMkNkbIfijQogbwiK+nGCODDRpUkMvqjXmJcBkERjY7vkOW0VLRSLUHK6dJozU7bCRpAdsbtFOb2zjmJF4BU3RNwMKV01CBrQSiKVGKuQbT5K1c4X3xZ9MOXZJuJSbrG125TYgHbsk5KwnSwVHUaFaRDCLtDSc65wxDxceWUXnq8sJRfSHx+6kaUqmzNGZtj6I8tEcwMizpbZX6vQ4dUzBF6TRMTGE2BqT/sBjieYlgxqPXpIWNlfLalw4wAHDq1Cx34Tgd2OMWz9HSDPWd/1Kt8yO6as7oeHdmqdXGRsaU+fCSkUeaOeZoTmNY87onXHqnfIrLUVIguZmlgJYynVMk92GVrVE7nRTGaCoRL+Ibw==; 5:52VkmMR2am7I7NGyX6JcvveI7uvk63xpgLvO2zNuw+ALPZmQdzLwtWp5jCJJvs0CcY0EJWZ4KUGnxukAEJgN7tLtbGNZCP95fBwto2X6Q2zs6rvZvDOGM79aeuIZl5oJ0JAUDANZ/fngD5cBAXzIw3V2kslE0jeOGtjWYQGtcf0=; 24:CSobSBl0cFzemdMcRmpQC1ZGaPozSc7ve+zjRWal2XiMYEtHA3G0gCsBLsszv4RGhv5VG/k+LTIj9w9TKmXr8Y/Zj49AadTZwgZ3vSe5nGY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1927; 7:MlJwjFfUUFzqMv2x3Ju0rQi1+3w771iGeLNntyRQbHWpsjLj4krx6LxoNTRp8mLHNlnWcsSsYYrynSbjko7jEX/ugxiCFplBSirIvEX91V0yknXJJlvoztS9lMYM7CmfAar+nLRSj+dSy+uQkREUwBhhYai549cAUtROr9N98t9vdEec5D8qnyLHb7jjLAbmgfE01FaXkV0qbvdbtVqNrOxq2gkBh/A1HTOVsO+E9FC5Sb1GEDJhR61lIB+Pn9Ud; 20:Yid1Rv600EfLjA7yPNpueSgldxyickq8AD8uXJ9gESAUF8D0Qyf2baAvFN6dANibvDpYY+6kT9DR73sjAZGlGrk0rjVefANp8BQOGLlWjwmNT4rYSeWjhh2wAxN14awJpjnuBDvxKr93F1xYMbVPzr8YqII6LLA3DuHjSCY9d85F5jsg+r/2FHvt3DsVv4UrTEwWlAQQ1Dsct0BKzC8QQh5eraRwXfWmU/dgJxUOmWtaTtvkAlWqUkChdHzWuvNs X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2018 15:33:41.4245 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d6c11cf4-6bc2-4b41-c085-08d5d78c5e0f 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: CY4PR12MB1927 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: christian.koenig@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Everything in the flush code path (i.e. waiting for SW queue to become empty) names with *_flush() and everything in the release code path names *_fini() Signed-off-by: Andrey Grodzovsky Suggested-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index c328c39..e516077 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -683,8 +683,8 @@ int amdgpu_ctx_ioctl(struct drm_device *dev, void *data, int amdgpu_ctx_wait_prev_fence(struct amdgpu_ctx *ctx, unsigned ring_id); void amdgpu_ctx_mgr_init(struct amdgpu_ctx_mgr *mgr); -void amdgpu_ctx_mgr_entity_cleanup(struct amdgpu_ctx_mgr *mgr); void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr); +void amdgpu_ctx_mgr_entity_flush(struct amdgpu_ctx_mgr *mgr); void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c index c0f06c0..0120b24 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c @@ -444,7 +444,7 @@ void amdgpu_ctx_mgr_init(struct amdgpu_ctx_mgr *mgr) idr_init(&mgr->ctx_handles); } -void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr) +void amdgpu_ctx_mgr_entity_flush(struct amdgpu_ctx_mgr *mgr) { struct amdgpu_ctx *ctx; struct idr *idp; @@ -473,7 +473,7 @@ void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr) mutex_unlock(&mgr->lock); } -void amdgpu_ctx_mgr_entity_cleanup(struct amdgpu_ctx_mgr *mgr) +void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr) { struct amdgpu_ctx *ctx; struct idr *idp; @@ -506,7 +506,7 @@ void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr) struct idr *idp; uint32_t id; - amdgpu_ctx_mgr_entity_cleanup(mgr); + amdgpu_ctx_mgr_entity_fini(mgr); idp = &mgr->ctx_handles; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index a549483..6841497 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -860,7 +860,7 @@ static int amdgpu_flush(struct file *f, fl_owner_t id) struct drm_file *file_priv = f->private_data; struct amdgpu_fpriv *fpriv = file_priv->driver_priv; - amdgpu_ctx_mgr_entity_fini(&fpriv->ctx_mgr); + amdgpu_ctx_mgr_entity_flush(&fpriv->ctx_mgr); return 0; }