Attachment 145971 Details for Bug 112266 – possible fix

[patch] possible fix

0001-drm-amd-display-re-enable-wait-in-pipelock-but-add-t.patch (text/plain), 1.73 KB, created by Alex Deucher on 2019-11-15 16:04:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2019-11-15 16:04:27 UTC

Size: 1.73 KB

patch

obsolete

>From 0bf7bb7fbdea95a0355abebff028a2746b4389cb Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Fri, 15 Nov 2019 10:02:44 -0500
>Subject: [PATCH] drm/amd/display: re-enable wait in pipelock, but add timeout
>
>Removing this causes hangs in some games, so re-add it, but add
>a timeout so we don't hang while switching flip types.
>
>Bug: https://bugzilla.kernel.org/show_bug.cgi?id=205169
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=112266
>Bug: https://bugzilla.kernel.org/show_bug.cgi?id=205169
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> .../drm/amd/display/dc/dcn20/dcn20_hwseq.c    | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
>diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
>index 0046a099c9e9..120e62c5193c 100644
>--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
>+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
>@@ -1033,6 +1033,25 @@ void dcn20_pipe_control_lock(
> 	if (pipe->plane_state != NULL)
> 		flip_immediate = pipe->plane_state->flip_immediate;
> 
>+	if (flip_immediate && lock) {
>+		const int TIMEOUT_FOR_FLIP_PENDING = 100000;
>+		int i;
>+
>+		for (i = 0; i < TIMEOUT_FOR_FLIP_PENDING; ++i) {
>+			if (!pipe->plane_res.hubp->funcs->hubp_is_flip_pending(pipe->plane_res.hubp))
>+				break;
>+			udelay(1);
>+		}
>+
>+		if (pipe->bottom_pipe != NULL) {
>+			for (i = 0; i < TIMEOUT_FOR_FLIP_PENDING; ++i) {
>+				if (!pipe->bottom_pipe->plane_res.hubp->funcs->hubp_is_flip_pending(pipe->bottom_pipe->plane_res.hubp))
>+					break;
>+				udelay(1);
>+			}
>+		}
>+	}
>+
> 	/* In flip immediate and pipe splitting case, we need to use GSL
> 	 * for synchronization. Only do setup on locking and on flip type change.
> 	 */
>-- 
>2.23.0
>

Actions: View | Splinter Review

Attachments on bug 112266: 145971

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.