drm/amd/display: re-enable wait in pipelock, but add timeout
authorAlex Deucher <alexander.deucher@amd.com>
Fri, 15 Nov 2019 15:02:44 +0000 (10:02 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 21 Dec 2019 10:05:15 +0000 (11:05 +0100)
commit0d3e9622ad23c608d1328d88284b01f98b92a40a
tree1f891fdd5371677da55e9d39f9de2cb02e054fbc
parent803eb244395b5901a0b56ad2081a5803b77627fc
drm/amd/display: re-enable wait in pipelock, but add timeout

commit 627f75d18910b287472593a4a2c41de9a386f5a2 upstream.

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
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c