diff --git a/srcpkgs/linux5.4/patches/amd-reenable-wait-in-pipelock.patch b/srcpkgs/linux5.4/patches/amd-reenable-wait-in-pipelock.patch deleted file mode 100644 index b6348d0c80f..00000000000 --- a/srcpkgs/linux5.4/patches/amd-reenable-wait-in-pipelock.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 ---- - .../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 diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template index 571216c86c5..f51f9f0c5ea 100644 --- a/srcpkgs/linux5.4/template +++ b/srcpkgs/linux5.4/template @@ -1,6 +1,6 @@ # Template file for 'linux5.4' pkgname=linux5.4 -version=5.4.5 +version=5.4.6 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=568e9f27fbba86131c2e2849f296d54216e2ed3e8c4d8aa78a93b417cab23ec0 +checksum=fda561bcdea397ddd59656319c53871002938b19b554f30efed90affa30989c8 patch_args="-Np1" nodebug=yes # -dbg package is generated below manually