From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81E4E372235; Sat, 28 Feb 2026 17:35:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300144; cv=none; b=hcxjzWiraEz2GnSaagwIcocHKX9lYadG6TVy1RfdJfWanj2Oxa6zfcmTxhP2fOk74U1M48jphR69ZLfpyqOgq62bhixLkMRLCzVYGctf0L+ZykbkYzw4B51w/AVE/sipVWkBtqMsXEm3a+udvqwGWbubbe96L4uWrFJvoV+64Ww= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300144; c=relaxed/simple; bh=VcPYe4j20vtqahNKHjlKZcdTbEXtbZLF6tHgSShtbXE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=opU5RAFo6ZIhsvKQIWCKYvJ1bBCWStdJqPNhvhjJSLar5ibrPs1Mbnma4fW36f9zsR8ScUYReMlwMTgJQI26YQsp0CzVjreds6jEcrv0AYcNhsYMEsge1tuWL/2FisvgJxx13TPA/E6XEv3GAr2j5sY6vjNkmzktnnYbCtX4Nlk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ovcZ+1Bt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ovcZ+1Bt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADC68C19424; Sat, 28 Feb 2026 17:35:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300144; bh=VcPYe4j20vtqahNKHjlKZcdTbEXtbZLF6tHgSShtbXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ovcZ+1BtVEXvTx6Rx22Vme9evNItFb+1ExY4ub2YLAs29v9nv6iDqatvlJjSHDb5z T3auG9ceH0ZSdQb6XKukOboKsjSMiacULEqvTZ+JvoEcIqoBL3zbsMIjew4f2gFN7F 8UaVHYUNABjXQgXolt3d0brVdBuFnlnotAHwGKbOI6L+WlIniAZZ6wtufjujc02vsS JgnHImDqzi2luDpbWv8sX9tI9xjGXHqdImprI4l87zSPF8XvGdRrJ4qjfHz+J8UUJh Z4If9/LJ5IpM1UFbY5xjcKLV+ibZ/utO14849FMmvbK4tbYCNZzEbuqUjZXd2ynenR 9jVWLG52paVFw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Deucher , =?UTF-8?q?Timur=20Krist=C3=B3f?= , Sasha Levin Subject: [PATCH 6.19 162/844] drm/amdgpu: avoid a warning in timedout job handler Date: Sat, 28 Feb 2026 12:21:15 -0500 Message-ID: <20260228173244.1509663-163-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Alex Deucher [ Upstream commit c8cf9ddc549fb93cb5a35f3fe23487b1e6707e74 ] Only set an error on the fence if the fence is not signalled. We can end up with a warning if the per queue reset path signals the fence and sets an error as part of the reset, but fails to recover. Reviewed-by: Timur Kristóf Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 7ccb724b2488d..aaf5477fcd7ac 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -147,7 +147,8 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) dev_err(adev->dev, "Ring %s reset failed\n", ring->sched.name); } - dma_fence_set_error(&s_job->s_fence->finished, -ETIME); + if (dma_fence_get_status(&s_job->s_fence->finished) == 0) + dma_fence_set_error(&s_job->s_fence->finished, -ETIME); if (amdgpu_device_should_recover_gpu(ring->adev)) { struct amdgpu_reset_context reset_context; -- 2.51.0