diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-11-12 13:06:37 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-11-12 13:06:41 +1000 |
| commit | b6c24725249a6c1a889665d720cdff088f686f98 (patch) | |
| tree | 68865fe0a2e4b93cf75aa51a45b466873bba3a81 /drivers/gpu/drm/ttm/ttm_bo.c | |
| parent | 447212bb4f8ebd7d95dd6e160cd82c69c9a23c4c (diff) | |
| parent | 7120a447c7fe37a123ab7a63afefdbf0787b9002 (diff) | |
| download | linux-b6c24725249a6c1a889665d720cdff088f686f98.tar.bz2 | |
Merge tag 'drm-misc-fixes-2021-11-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
* dma-buf: name_lock fixes
* prime: Keep object ref during mmap
* nouveau: Fix a refcount issue; Fix device removal; Protect client
list with dedicated mutex; Fix address CE0 address calculation
* ttm: Fix race condition during BO eviction
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YYzY6jeox9EeI15i@linux-uq9g.fritz.box
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_bo.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 3934ee225c78..739f11c0109c 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -619,7 +619,8 @@ static bool ttm_bo_evict_swapout_allowable(struct ttm_buffer_object *bo, *busy = !ret; } - if (ret && place && !bo->bdev->funcs->eviction_valuable(bo, place)) { + if (ret && place && (bo->resource->mem_type != place->mem_type || + !bo->bdev->funcs->eviction_valuable(bo, place))) { ret = false; if (*locked) { dma_resv_unlock(bo->base.resv); |