From 073c109344641533cc39e635a44e1c67ad08cf4c Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Thu, 27 Aug 2020 19:50:01 +0200 Subject: [PATCH] linux5.4: update to 5.4.61. --- srcpkgs/linux5.4/patches/navi_alloc.patch | 33 ----------------------- srcpkgs/linux5.4/template | 4 +-- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/linux5.4/patches/navi_alloc.patch diff --git a/srcpkgs/linux5.4/patches/navi_alloc.patch b/srcpkgs/linux5.4/patches/navi_alloc.patch deleted file mode 100644 index 02f794d63ec..00000000000 --- a/srcpkgs/linux5.4/patches/navi_alloc.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2fdd63feb95c6751526068c02f7512fd4bea6956 Mon Sep 17 00:00:00 2001 -From: Daniel Kolesa -Date: Sat, 8 Aug 2020 20:05:29 +0200 -Subject: [PATCH] dcn20_resource: use GFP_ATOMIC in validate_bandwidth_internal - -GFP_KERNEL may and will sleep, and this is being executed in -a non-preemptible context; this will mess things up since it's -called inbetween DC_FP_START/END, and rescheduling will result -in the DC_FP_END later being called in a different context (or -just crashing if any floating point/vector registers/instructions -are used after the call is resumed in a different context). - -Signed-off-by: Daniel Kolesa ---- - drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c -index 2719cde..d37ede0 100644 ---- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c -+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c -@@ -3031,7 +3031,7 @@ static bool dcn20_validate_bandwidth_internal(struct dc *dc, struct dc_state *co - int vlevel = 0; - int pipe_split_from[MAX_PIPES]; - int pipe_cnt = 0; -- display_e2e_pipe_params_st *pipes = kzalloc(dc->res_pool->pipe_count * sizeof(display_e2e_pipe_params_st), GFP_KERNEL); -+ display_e2e_pipe_params_st *pipes = kzalloc(dc->res_pool->pipe_count * sizeof(display_e2e_pipe_params_st), GFP_ATOMIC); - DC_LOGGER_INIT(dc->ctx->logger); - - BW_VAL_TRACE_COUNT(); --- -2.28.0 - diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template index f6259cdbfb6..2971df119bb 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.60 +version=5.4.61 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=add2ab2385c40fc9a3dfebe403e56da8500b633dc7dc42cf0c670c61d151a223 +checksum=86f13d050f6389c5a1727fa81510ee8eceac795297bc584f443354609617fea4 python_version=3 patch_args="-Np1"