From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 82814530E16; Wed, 30 Sep 2026 17:50:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790790651; cv=none; b=lRiLlGy+xRIxL+9nyK5R5qGm6yeqavGr39oDFvJMmyxKSVPJ599OfCc651DMb9Dm9Y8Kn28/v24tJEWNsW+7DBmxdyCP8+cqJZw+E7pFOG3Wat6EoQWFKvxNdz4EX6UgeJdUcWyhB6dX5djSCefkPfSFVDZmcaovJh///pgAriU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790790651; c=relaxed/simple; bh=Blwj38+Zv7n3pRQoSYBRXcusJf8mHlOv+NTpRDuCeSE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jFAnrgR8zoK+Ttr4gW8gBgfqdiR8dF4VFJRNxrHlqNCcMOw1b9I5/+TWgIBRfi5JDdukbHSLcR8qmM7oQ+T31xtFnOkMLFeBtQpVeYV/fQ5gdL7xk/P/e9YUYYxUZHX1EqNDcfkH9EoR8Hw0OBICxsicVe00rr8ZxHVdmdkJv6w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WNaqQvky; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WNaqQvky" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E44531F00898; Wed, 30 Sep 2026 17:50:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790790650; bh=/XYOcjvcssuRZhJhoKNHW5mn84/eDgjfPUN/yEzOsnI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WNaqQvky6+9D9jRz9Vqxs9SNEVn6wnwrnScTohP7hWPpnw96yi3TEBPLz6j3w4jJ1 7DVGZHWJlo9musx7qpyHlNsMFFc0DGqGvf91v0tuMQi3x6Xlqeehi52Oz9i9E9xLAF OdDSy4Cvgi0wxFjcJUr+rrUz2GgPuZkupiMwv+wI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ray Wu , Tom Chung , James Lin , Daniel Wheeler , Alex Deucher , Sasha Levin Subject: [PATCH 5.15 026/752] drm/amd/display: Fix CRC open failure during active rendering Date: Wed, 30 Sep 2026 17:18:16 +0200 Message-ID: <20260930152358.716814272@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152358.131179731@linuxfoundation.org> References: <20260930152358.131179731@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tom Chung [ Upstream commit 5eb2fdafeb6f4a442643b77a21a4c9e70586a146 ] [Why] Opening the CRC data file during active rendering can fail with -EINVAL. The wait for commit->hw_done returns remaining jiffies on success, but the CRC path was treating that as an error. [How] Handle wait_for_completion_interruptible_timeout() correctly: positive return as success, 0 as timeout, and negative as error. Reviewed-by: Ray Wu Signed-off-by: Tom Chung Signed-off-by: James Lin Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c index 8a441a22c46ec..0c17877a6c5c8 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c @@ -261,8 +261,13 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name) */ ret = wait_for_completion_interruptible_timeout( &commit->hw_done, 10 * HZ); - if (ret) + if (ret < 0) + goto cleanup; + + if (ret == 0) { + ret = -ETIMEDOUT; goto cleanup; + } } enable = amdgpu_dm_is_valid_crc_source(source); -- 2.53.0