From fb9c6479b192c14d25cbc32c930a8fbfb84f98e6 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Fri, 27 Apr 2018 12:46:28 -0400 Subject: [PATCH] Linux v4.16.5 --- bcm283x-drm-vc4-fix-mem-leak.patch | 54 ------------------------------ kernel.spec | 9 +++-- sources | 2 +- 3 files changed, 5 insertions(+), 60 deletions(-) delete mode 100644 bcm283x-drm-vc4-fix-mem-leak.patch diff --git a/bcm283x-drm-vc4-fix-mem-leak.patch b/bcm283x-drm-vc4-fix-mem-leak.patch deleted file mode 100644 index 58ffce722..000000000 --- a/bcm283x-drm-vc4-fix-mem-leak.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c0db1b677e1d584fab5d7ac76a32e1c0157542e0 Mon Sep 17 00:00:00 2001 -From: Daniel J Blueman -Date: Mon, 2 Apr 2018 15:10:35 +0800 -Subject: drm/vc4: Fix memory leak during BO teardown - -During BO teardown, an indirect list 'uniform_addr_offsets' wasn't being -freed leading to leaking many 128B allocations. Fix the memory leak by -releasing it at teardown time. - -Cc: stable@vger.kernel.org -Fixes: 6d45c81d229d ("drm/vc4: Add support for branching in shader validation.") -Signed-off-by: Daniel J Blueman -Signed-off-by: Eric Anholt -Reviewed-by: Eric Anholt -Link: https://patchwork.freedesktop.org/patch/msgid/20180402071035.25356-1-daniel@quora.org ---- - drivers/gpu/drm/vc4/vc4_bo.c | 2 ++ - drivers/gpu/drm/vc4/vc4_validate_shaders.c | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c -index 2decc8e..add9cc9 100644 ---- a/drivers/gpu/drm/vc4/vc4_bo.c -+++ b/drivers/gpu/drm/vc4/vc4_bo.c -@@ -195,6 +195,7 @@ static void vc4_bo_destroy(struct vc4_bo *bo) - vc4_bo_set_label(obj, -1); - - if (bo->validated_shader) { -+ kfree(bo->validated_shader->uniform_addr_offsets); - kfree(bo->validated_shader->texture_samples); - kfree(bo->validated_shader); - bo->validated_shader = NULL; -@@ -591,6 +592,7 @@ void vc4_free_object(struct drm_gem_object *gem_bo) - } - - if (bo->validated_shader) { -+ kfree(bo->validated_shader->uniform_addr_offsets); - kfree(bo->validated_shader->texture_samples); - kfree(bo->validated_shader); - bo->validated_shader = NULL; -diff --git a/drivers/gpu/drm/vc4/vc4_validate_shaders.c b/drivers/gpu/drm/vc4/vc4_validate_shaders.c -index d3f15bf..7cf82b0 100644 ---- a/drivers/gpu/drm/vc4/vc4_validate_shaders.c -+++ b/drivers/gpu/drm/vc4/vc4_validate_shaders.c -@@ -942,6 +942,7 @@ vc4_validate_shader(struct drm_gem_cma_object *shader_obj) - fail: - kfree(validation_state.branch_targets); - if (validated_shader) { -+ kfree(validated_shader->uniform_addr_offsets); - kfree(validated_shader->texture_samples); - kfree(validated_shader); - } --- -cgit v1.1 diff --git a/kernel.spec b/kernel.spec index 572946fd4..4220e5ac7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 4 +%define stable_update 5 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -634,9 +634,6 @@ Patch323: bcm2835-hwrng-Handle-deferred-clock-properly.patch Patch324: bcm283x-clk-audio-fixes.patch -# in 4.17, headed to stable -Patch329: bcm283x-drm-vc4-fix-mem-leak.patch - # Enabling Patches for the RPi3+ Patch330: bcm2837-gpio-expander.patch # http://www.spinics.net/lists/arm-kernel/msg647617.html @@ -1923,8 +1920,10 @@ fi # # %changelog -* Fri Apr 27 2018 Jeremy Cline +* Fri Apr 27 2018 Jeremy Cline - 4.16.5-300 - Fix an issue with bluetooth autosupsend on some XPS 13 9360 (rhbz 1514836) +- Fix prlimit64 with RLIMIT_CPU ignored (rhbz 1568337) +- Linux v4.16.5 * Fri Apr 27 2018 Peter Robinson - Enable QLogic NICs on ARM diff --git a/sources b/sources index 370716e74..59e27b483 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662 -SHA512 (patch-4.16.4.xz) = caa9726e0c9ad4da4dbcebb6b47f08e6575d30f050e7d6087018fae932c0c706e9a03d4b703dd49bc46bc21df08b5c7dff37ac5bb6522d6a6ed3d3b10712e9eb +SHA512 (patch-4.16.5.xz) = 15c0f85c5f35c2d87a0b63767e18c52a469a81154d915c50b7c7b1c0aed81229e86b3e1cf6e021539c100b29766c47c459adb7d2fcce0da165090206832f62f9