This is a note to let you know that I've just added the patch titled
Revert "drm/ttm: make ttm_bo_unpin more defensive"
to the 5.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-drm-ttm-make-ttm_bo_unpin-more-defensive.patch
and it can be found in the queue-5.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 603426d4f1787045603a1005dad428ae733e14d2 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 25 Mar 2021 09:51:30 +0100
Subject: Revert "drm/ttm: make ttm_bo_unpin more defensive"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
This reverts commit 0492006cc5ecb112d109a4b5cfa99798184a69e2 which is
commit 6c5403173a13a08ff61dbdafa4c0ed4a9dedbfe0 upstream.
It, and the following revert, are causing unneeded warnings to be sent
to the kernel log. For 5.11 these are not needed at this point in time.
Cc: Christian König <christian.koenig@xxxxxxx>
Cc: Matthew Auld <matthew.auld@xxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>
Link: https://lore.kernel.org/r/8c3da8bc-0bf3-496f-1fd6-4f65a07b2d13@xxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
include/drm/ttm/ttm_bo_api.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -613,11 +613,9 @@ static inline void ttm_bo_pin(struct ttm
static inline void ttm_bo_unpin(struct ttm_buffer_object *bo)
{
dma_resv_assert_held(bo->base.resv);
+ WARN_ON_ONCE(!bo->pin_count);
WARN_ON_ONCE(!kref_read(&bo->kref));
- if (bo->pin_count)
- --bo->pin_count;
- else
- WARN_ON_ONCE(true);
+ --bo->pin_count;
}
int ttm_mem_evict_first(struct ttm_bo_device *bdev,
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-5.11/revert-drm-ttm-make-ttm_bo_unpin-more-defensive.patch
queue-5.11/revert-drm-ttm-warn-on-pinning-without-holding-a.patch
