From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B7F29D1D469 for ; Thu, 8 Jan 2026 14:49:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 57A4110E75F; Thu, 8 Jan 2026 14:49:19 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="drBrg1Mh"; dkim-atps=neutral Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010002.outbound.protection.outlook.com [52.101.46.2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0212110E75F for ; Thu, 8 Jan 2026 14:49:17 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iq/hlKzbM9rMVrrpHnFp6SdF1U+lA3RmmKP/R8wwx9MAMnIzVMeZVyQfJ5r1NbMG1XUjbiVLVQZCw0gByS0YR0wBsQ7TaPsNM1q/mlSFKNGqyUoVlAacjghn+kwhvX/sYDt0PZzSnUbpDdR2wZxSKxIgHltI2WgY2D9Z0hGx/GMlNQ8e8CWvg6mGj5KGgy/fMZXJonluM5UHnmYVU/qtgl82pwnbN/c55u/OpfMYOu5Cb7mqok0bVV+kUJsC7HXdBLjgrWV1OECSDjjIXoqNMJRYiacq9y5NZVw2rxj3NJcHYC9zEwbwyC83CBIXQ1VlIhFGmV2CbNOX+BnANqJDvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UH67xb65S1sTPnHjeqyjnpdT13lU/3GfqyoYRTJopPY=; b=DoYbVwVWlmKb6gmpiBpDt/Zcbmn/p/sMRLQ00OOMw+LIatgUl5HQR3zdio2jO1mjMhjEnpDNss9WXHsb5D730tp/LCTrNASMA56CNuTwS/jRmZEKWIy0I0v2XNfqIZD/nliT/NZJ5gCKG3AMYxfbuVYBtYxtvo4cZoHv5QaWLVBF6/Pgy1tl2+AOG/oxrUoh3rTczMjr4VyCjBEPBAVVZ3CMGRxAGZrOdkecMa25gPdzhocDQQndsE3AdG2Cvu1jIVe/+Awoz3eMUXp44QYjtcCbQ5wTDbcYe8E6LdWmrMaTXAEe5JIZIdRsfZYH1oRZwFG1xAYc8ITO1SIeHW1hKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UH67xb65S1sTPnHjeqyjnpdT13lU/3GfqyoYRTJopPY=; b=drBrg1MhyJYVPDz7JhzIqJa9CAAFpMngWOMql3yrjs/s8yZgKX3FuTmBKrIQ3A3TO5Aq3q7Zs85/L392JDrBZUTpQJvuiP4POxp6KBlSCYyK0tCfBIbcHKHPcILjE8m5DKY+1i14Ohpq+3RcFoUIjbaNeaboCT+UwJJIMc7KpKo= Received: from BL0PR02CA0133.namprd02.prod.outlook.com (2603:10b6:208:35::38) by DM4PR12MB9736.namprd12.prod.outlook.com (2603:10b6:8:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9478.4; Thu, 8 Jan 2026 14:49:13 +0000 Received: from MN1PEPF0000ECD7.namprd02.prod.outlook.com (2603:10b6:208:35:cafe::73) by BL0PR02CA0133.outlook.office365.com (2603:10b6:208:35::38) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9499.3 via Frontend Transport; Thu, 8 Jan 2026 14:49:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by MN1PEPF0000ECD7.mail.protection.outlook.com (10.167.242.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9520.1 via Frontend Transport; Thu, 8 Jan 2026 14:49:13 +0000 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 8 Jan 2026 08:49:04 -0600 Received: from p8.amd.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Thu, 8 Jan 2026 08:49:03 -0600 From: Alex Deucher To: CC: Alex Deucher Subject: [PATCH 31/42] drm/amdgpu: plumb timedout fence through to force completion Date: Thu, 8 Jan 2026 09:48:32 -0500 Message-ID: <20260108144843.493816-32-alexander.deucher@amd.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260108144843.493816-1-alexander.deucher@amd.com> References: <20260108144843.493816-1-alexander.deucher@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000ECD7:EE_|DM4PR12MB9736:EE_ X-MS-Office365-Filtering-Correlation-Id: b927df35-405b-412b-1365-08de4ec516f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9mgq2rHP4Ywpw4nIz6Qq5xBR1ePTOxLnvH7wteTuFUuRchkAvRFRDwLvFodm?= =?us-ascii?Q?UEEztXDcwcgKFMZWPol9KqeFrNO6xuNqCGzXtVxsOcYEZYdSZ2HnK7Nu/3KO?= =?us-ascii?Q?D5iDtXfICggwLQXv/EcE2nVOtL9IT/5wK9sZYoT9+GOFyONoH5M6e+kXWYBp?= =?us-ascii?Q?1koytxEK9ebZeFl6ovjz+x7rffOL0FCiJEtQrSLcWG5tjcQMjSN7KKoD9Gxy?= =?us-ascii?Q?vB7zgx4vqCASe5Mx9K0bxF+HbbAD3hwAQJ/LMldF4lFkzH4NvvF5wmH3z9VS?= =?us-ascii?Q?s1Gihw+VA//fc9vxyrf9I7hP/fGUgaoUuGqGT7sFQm9uaVO3e0yrAaJA+x0G?= =?us-ascii?Q?4zq21TFnFmYX8FMaHWAvz4HIrMV9cl8mmO0yyPdES2jLzmlg5znVU4AkLrBA?= =?us-ascii?Q?mYzD0/Ukw0+bHO2r52v1kCxA7PBTxYha9QiXf/UZ5m8KM1Y6nYL+uguPjC/c?= =?us-ascii?Q?cyyA+PzFvI75UEvg9HAlvXmQl928f3sOX6LA0QyS23mhFixRzyfRV04eGLHR?= =?us-ascii?Q?srpZjCfUB41VLZ4Ls4pQHwaMnwNGcykXCU6FEuy3qiP4L8u0JcsQgnqsvrwr?= =?us-ascii?Q?y9DlgRQ/9uyO67c7zlpWUZ5AAXwWqpZTlM/yf0zcF0HLymLa2AwGB4dk8mcD?= =?us-ascii?Q?0bUf6P0mCLl8A7DvrioUTJ5532qYmGwYP85doWk8W1KlItBmSSyXnGAD9YEj?= =?us-ascii?Q?WczEys2OLAmd5COIJyC/PvIDlJxfbcacah0iTR3Fjeb/GulARFPw/u0DZR2Y?= =?us-ascii?Q?3n743k2h0+RvwO3blrMHwaptRpHEDdE5996KLyyKMoR4PaD01ziwsOKQoC0k?= =?us-ascii?Q?Tzc+dpnu3x4wb9ZWNeDAj3OfwhQ6doknIhu1B3Q4LisAnKsfXK+DxCTEsH8s?= =?us-ascii?Q?UihbEosoVU/O+v2e3d0LtbmJ40bpKfcZnOX5B4nqRXd/N9T38kn1jqrBtwad?= =?us-ascii?Q?fxf+XZH1gtYtz/aiyQyJFzHjDD+8DKg306pBb3aQ6ph8sFzYu3wUm4DbPc1v?= =?us-ascii?Q?CIZNL1ZrxQksNWVMUPtH/ocyXVUnw13NLsQq0KSsFT2M5yDno6T/TxDgtNIo?= =?us-ascii?Q?pX5QEYlGEWV1VollsKLwNjR+ZVXxzm8TtWNEMnTVwy8Rmeewg5DOuhvwhKLR?= =?us-ascii?Q?7JaFoM8VEr/1+eJ757+zSb5RXO1r18XC6StdsPSEb1QTemGETSsHNeplcU8r?= =?us-ascii?Q?AAGkhBKxq9WTDr56OfJWk1eF4JHfd5IbO+vvcE45V7VWkTmi9jdUdn3BHNBy?= =?us-ascii?Q?4kVBYIKPLpnBP8rZWXys7qmYHXRkmFNJ9off7migr5dLNkmeGj8hsMNatliG?= =?us-ascii?Q?ntfX8vv1CShBrpGmLQ6C2nkQRuZ91gb3+lpduciiNajYoqqBcVjleOYxqWcw?= =?us-ascii?Q?1JMHQYeZGvGCjWzFKwAxNmH5+PgTncRtuBis+yI4hm23853N+PykBNZ3gKeY?= =?us-ascii?Q?JvO9PdbYMZUvHNTqilSACmTfDtog5uxpHZTzVFakjGWsA/thCkvN/X+biTSp?= =?us-ascii?Q?PRa/g02X7/XZ/OzXEEhObki9OvP0jp/fu+tNuUrdhCRFaFUOsxzdAKnq0FbH?= =?us-ascii?Q?ps7YB6bJgBqaMgEYEKo=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:satlexmb07.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2026 14:49:13.3362 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b927df35-405b-412b-1365-08de4ec516f4 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECD7.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB9736 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" When we do a full adapter reset, if we know the timedout fence mark the fence with -ETIME rather than -ECANCELED so it gets properly handled by userspace. Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++++- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 28 +++++++++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 4 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 21 ++++++++++------ 7 files changed, 47 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c index 1f3e52637326b..e36c8e3cfb0f0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c @@ -1960,7 +1960,7 @@ static int amdgpu_debugfs_ib_preempt(void *data, u64 val) /* swap out the old fences */ amdgpu_ib_preempt_fences_swap(ring, fences); - amdgpu_fence_driver_force_completion(ring); + amdgpu_fence_driver_force_completion(ring, NULL); /* resubmit unfinished jobs */ amdgpu_ib_preempt_job_recovery(&ring->sched); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index c9954dd8d83c8..d77c3e6552a8c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -5783,6 +5783,7 @@ int amdgpu_device_pre_asic_reset(struct amdgpu_device *adev, { int i, r = 0; struct amdgpu_job *job = NULL; + struct dma_fence *fence = NULL; struct amdgpu_device *tmp_adev = reset_context->reset_req_dev; bool need_full_reset = test_bit(AMDGPU_NEED_FULL_RESET, &reset_context->flags); @@ -5795,6 +5796,9 @@ int amdgpu_device_pre_asic_reset(struct amdgpu_device *adev, amdgpu_fence_driver_isr_toggle(adev, true); + if (job) + fence = &job->hw_fence->base; + /* block all schedulers and reset given job's ring */ for (i = 0; i < AMDGPU_MAX_RINGS; ++i) { struct amdgpu_ring *ring = adev->rings[i]; @@ -5803,7 +5807,7 @@ int amdgpu_device_pre_asic_reset(struct amdgpu_device *adev, continue; /* after all hw jobs are reset, hw fence is meaningless, so force_completion */ - amdgpu_fence_driver_force_completion(ring); + amdgpu_fence_driver_force_completion(ring, fence); } amdgpu_fence_driver_isr_toggle(adev, false); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c index 6f37fc45458a3..b1cf9550c259b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c @@ -568,7 +568,7 @@ void amdgpu_fence_driver_hw_fini(struct amdgpu_device *adev) r = -ENODEV; /* no need to trigger GPU reset as we are unloading */ if (r) - amdgpu_fence_driver_force_completion(ring); + amdgpu_fence_driver_force_completion(ring, NULL); if (!drm_dev_is_unplugged(adev_to_drm(adev)) && ring->fence_drv.irq_src && @@ -683,16 +683,34 @@ void amdgpu_fence_driver_set_error(struct amdgpu_ring *ring, int error) * amdgpu_fence_driver_force_completion - force signal latest fence of ring * * @ring: fence of the ring to signal + * @timedout_fence: fence of the timedout job * */ -void amdgpu_fence_driver_force_completion(struct amdgpu_ring *ring) +void amdgpu_fence_driver_force_completion(struct amdgpu_ring *ring, + struct dma_fence *timedout_fence) { - amdgpu_fence_driver_set_error(ring, -ECANCELED); + struct amdgpu_fence_driver *drv = &ring->fence_drv; + unsigned long flags; + + spin_lock_irqsave(&drv->lock, flags); + for (unsigned int i = 0; i <= drv->num_fences_mask; ++i) { + struct dma_fence *fence; + + fence = rcu_dereference_protected(drv->fences[i], + lockdep_is_held(&drv->lock)); + if (fence && !dma_fence_is_signaled_locked(fence)) { + if (fence == timedout_fence) + dma_fence_set_error(fence, -ETIME); + else + dma_fence_set_error(fence, -ECANCELED); + } + } + spin_unlock_irqrestore(&drv->lock, flags); + amdgpu_fence_write(ring, ring->fence_drv.sync_seq); amdgpu_fence_process(ring); } - /* * Kernel queue reset handling * @@ -753,7 +771,7 @@ void amdgpu_fence_driver_update_timedout_fence_state(struct amdgpu_fence *af) if (reemitted) { /* if we've already reemitted once then just cancel everything */ - amdgpu_fence_driver_force_completion(af->ring); + amdgpu_fence_driver_force_completion(af->ring, &af->base); af->ring->ring_backup_entries_to_copy = 0; } } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h index 86a788d476957..ce095427611fb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h @@ -160,7 +160,8 @@ struct amdgpu_fence { extern const struct drm_sched_backend_ops amdgpu_sched_ops; void amdgpu_fence_driver_set_error(struct amdgpu_ring *ring, int error); -void amdgpu_fence_driver_force_completion(struct amdgpu_ring *ring); +void amdgpu_fence_driver_force_completion(struct amdgpu_ring *ring, + struct dma_fence *timedout_fence); void amdgpu_fence_driver_update_timedout_fence_state(struct amdgpu_fence *af); void amdgpu_fence_save_wptr(struct amdgpu_fence *af); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c index 8b8a04138711c..c270a40de5e5d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c @@ -597,10 +597,10 @@ int amdgpu_sdma_reset_engine(struct amdgpu_device *adev, uint32_t instance_id, * to be submitted to the queues after the reset is complete. */ if (!ret) { - amdgpu_fence_driver_force_completion(gfx_ring); + amdgpu_fence_driver_force_completion(gfx_ring, NULL); drm_sched_wqueue_start(&gfx_ring->sched); if (adev->sdma.has_page_queue) { - amdgpu_fence_driver_force_completion(page_ring); + amdgpu_fence_driver_force_completion(page_ring, NULL); drm_sched_wqueue_start(&page_ring->sched); } } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index 9d5cca7da1d9e..3a3bc0d370fa6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -512,7 +512,7 @@ int amdgpu_uvd_resume(struct amdgpu_device *adev) } memset_io(ptr, 0, size); /* to restore uvd fence seq */ - amdgpu_fence_driver_force_completion(&adev->uvd.inst[i].ring); + amdgpu_fence_driver_force_completion(&adev->uvd.inst[i].ring, NULL); } } return 0; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index 75ae9b429420e..d22c8980fa42b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -1482,15 +1482,16 @@ int vcn_set_powergating_state(struct amdgpu_ip_block *ip_block, /** * amdgpu_vcn_reset_engine - Reset a specific VCN engine - * @adev: Pointer to the AMDGPU device - * @instance_id: VCN engine instance to reset + * @ring: Pointer to the VCN ring + * @timedout_fence: fence that timed out * * Returns: 0 on success, or a negative error code on failure. */ -static int amdgpu_vcn_reset_engine(struct amdgpu_device *adev, - uint32_t instance_id) +static int amdgpu_vcn_reset_engine(struct amdgpu_ring *ring, + struct amdgpu_fence *timedout_fence) { - struct amdgpu_vcn_inst *vinst = &adev->vcn.inst[instance_id]; + struct amdgpu_device *adev = ring->adev; + struct amdgpu_vcn_inst *vinst = &adev->vcn.inst[ring->me]; int r, i; mutex_lock(&vinst->engine_reset_mutex); @@ -1514,9 +1515,13 @@ static int amdgpu_vcn_reset_engine(struct amdgpu_device *adev, if (r) goto unlock; } - amdgpu_fence_driver_force_completion(&vinst->ring_dec); + amdgpu_fence_driver_force_completion(&vinst->ring_dec, + (&vinst->ring_dec == ring) ? + &timedout_fence->base : NULL); for (i = 0; i < vinst->num_enc_rings; i++) - amdgpu_fence_driver_force_completion(&vinst->ring_enc[i]); + amdgpu_fence_driver_force_completion(&vinst->ring_enc[i], + (&vinst->ring_enc[i] == ring) ? + &timedout_fence->base : NULL); /* Restart the scheduler's work queue for the dec and enc rings * if they were stopped by this function. This allows new tasks @@ -1552,7 +1557,7 @@ int amdgpu_vcn_ring_reset(struct amdgpu_ring *ring, if (adev->vcn.inst[ring->me].using_unified_queue) return -EINVAL; - return amdgpu_vcn_reset_engine(adev, ring->me); + return amdgpu_vcn_reset_engine(ring, timedout_fence); } int amdgpu_vcn_reg_dump_init(struct amdgpu_device *adev, -- 2.52.0