diff options
| author | Nicolai Hähnle | 2017-02-16 23:49:12 +0100 |
|---|---|---|
| committer | Alex Deucher | 2017-02-21 23:16:28 +0100 |
| commit | 4694335dad7357e9b3d7822ab13049014d74d8b0 (patch) | |
| tree | 7285b01bac2477e0711af9a834e2f2ee118d61d2 | |
| parent | drm/ttm: fix use-after-free races in vm fault handling (diff) | |
| download | kernel-qcow2-linux-4694335dad7357e9b3d7822ab13049014d74d8b0.tar.gz kernel-qcow2-linux-4694335dad7357e9b3d7822ab13049014d74d8b0.tar.xz kernel-qcow2-linux-4694335dad7357e9b3d7822ab13049014d74d8b0.zip | |
drm/amdgpu: refuse to reserve io mem for split VRAM buffers
When the fast blit path fails while attempting to move a buffer from RAM
to VRAM, we fall back to a CPU-based memcpy that cannot handle split VRAM
buffers. Instead of crashing, simply fail the buffer move.
Ideally, we would teach TTM about split buffers so that the fallback still
works in this case, but that is quite involved. So for now, apply the
simplest possible fix.
Fixes: 40361bb1704b ("drm/amdgpu: add VRAM manager v2")
Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 1154b0a8881d..4c6094eefc51 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -529,6 +529,9 @@ static int amdgpu_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_ case TTM_PL_TT: break; case TTM_PL_VRAM: + if (mem->start == AMDGPU_BO_INVALID_OFFSET) + return -EINVAL; + mem->bus.offset = mem->start << PAGE_SHIFT; /* check if it's visible */ if ((mem->bus.offset + mem->bus.size) > adev->mc.visible_vram_size) |