summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/ttm
diff options
context:
space:
mode:
authorChristian König2018-11-29 16:25:10 +0100
committerAlex Deucher2018-11-30 18:00:57 +0100
commit082f0f21f71c522491a0cac4895b32bbab1b1006 (patch)
tree7525ddd4c305a97aa13e0f3b2ba4b1d752b5ef51 /drivers/gpu/drm/ttm
parentdrm/amd/display: Fix NULL ptr deref for commit_planes_to_stream (diff)
downloadkernel-qcow2-linux-082f0f21f71c522491a0cac4895b32bbab1b1006.tar.gz
kernel-qcow2-linux-082f0f21f71c522491a0cac4895b32bbab1b1006.tar.xz
kernel-qcow2-linux-082f0f21f71c522491a0cac4895b32bbab1b1006.zip
drm/ttm: fix LRU handling in ttm_buffer_object_transfer
We need to set the NO_EVICT flag on the ghost object or otherwise we are adding it to the LRU. When it is added to the LRU we can run into a race between destroying and evicting it again. Signed-off-by: Christian König <christian.koenig@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/ttm')
-rw-r--r--drivers/gpu/drm/ttm/ttm_bo_util.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index ba80150d1052..895d77d799e4 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -492,8 +492,10 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo,
if (!fbo)
return -ENOMEM;
- ttm_bo_get(bo);
fbo->base = *bo;
+ fbo->base.mem.placement |= TTM_PL_FLAG_NO_EVICT;
+
+ ttm_bo_get(bo);
fbo->bo = bo;
/**