Revert "drm/ttm: make ttm_bo_unpin more defensive"
This reverts commit 4148f28f98
which is
commit 6c5403173a13a08ff61dbdafa4c0ed4a9dedbfe0 upstream.
It breaks the Android kernel abi, and is not needed for any Android
devices at this time. If it is needed in the future, it can be brought
back in an abi-safe way.
Bug: 161946584
Change-Id: I583e85294adb0b0110b0da28b830001a002cc946
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@@ -628,10 +628,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);
|
||||
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,
|
||||
|
Reference in New Issue
Block a user