Skip to contentSkip to conversation

Linux 5.11.10

DISCUSSION Greg Kroah-Hartman 1 participant 2 messages Mar 25, 2021 Stable branch

lore
Share & tools
lore

Greg Kroah-Hartman

author maintainer
#0 lore raw

I'm announcing the release of the 5.11.10 kernel.

This is a "quick revert" of some 5.11.9 commits that caused noisy warnings to show up in the kernel log of some systems. If you do not have this issue, or are not bothered by these messages, no need to upgrade.

The updated 5.11.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.11.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Makefile                     |    2 +-
 drivers/gpu/drm/ttm/ttm_bo.c |    2 +-
 include/drm/ttm/ttm_bo_api.h |    8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

Greg Kroah-Hartman (3):
Revert "drm/ttm: make ttm_bo_unpin more defensive" Revert "drm/ttm: Warn on pinning without holding a reference" Linux 5.11.10

author maintainer
#1 lore raw
Makefile +1 -1
index 23403c8e0838..824d15c14be0 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 11
-SUBLEVEL = 9
+SUBLEVEL = 10
 EXTRAVERSION =
 NAME = 💕 Valentine's Day Edition 💕
drivers/gpu/drm/ttm/ttm_bo.c +1 -1
index a76eb2c14e8c..22073e77fdf9 100644
@@ -514,7 +514,7 @@ static void ttm_bo_release(struct kref *kref)
 		 * shrinkers, now that they are queued for
 		 * destruction.
 		 */
-		if (WARN_ON(bo->pin_count)) {
+		if (bo->pin_count) {
 			bo->pin_count = 0;
 			ttm_bo_del_from_lru(bo);
 			ttm_bo_add_mem_to_lru(bo, &bo->mem);
include/drm/ttm/ttm_bo_api.h +2 -6
index b5bef3199196..2564e66e67d7 100644
@@ -600,7 +600,6 @@ static inline bool ttm_bo_uses_embedded_gem_object(struct ttm_buffer_object *bo)
 static inline void ttm_bo_pin(struct ttm_buffer_object *bo)
 {
 	dma_resv_assert_held(bo->base.resv);
-	WARN_ON_ONCE(!kref_read(&bo->kref));
 	++bo->pin_count;
 }
 

@@ -613,11 +612,8 @@ static inline void ttm_bo_pin(struct ttm_buffer_object *bo)
 static inline void ttm_bo_unpin(struct ttm_buffer_object *bo)
 {
 	dma_resv_assert_held(bo->base.resv);
-	WARN_ON_ONCE(!kref_read(&bo->kref));
-	if (bo->pin_count)
-		--bo->pin_count;
-	else
-		WARN_ON_ONCE(true);
+	WARN_ON_ONCE(!bo->pin_count);
+	--bo->pin_count;
 }
 
 int ttm_mem_evict_first(struct ttm_bo_device *bdev,