diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-07-08 04:16:33 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-07-08 04:17:32 +0300 |
| commit | 21c355b09711e95f8f0e7c1890b343c6cd350042 (patch) | |
| tree | 6a836154558c8504e8cb68c0bfd5b4d358af5cf4 /drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |
| parent | 5cebdea6f8cea0d167bf0b3535f9905c67e76e00 (diff) | |
| parent | f18f58012ee894039cd59ee8c889bf499d7a3943 (diff) | |
| download | linux-21c355b09711e95f8f0e7c1890b343c6cd350042.tar.xz | |
Merge tag 'drm-misc-next-fixes-2021-07-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Short summary of fixes pull:
* amdgpu: TTM fixes
* dma-buf: Doc fixes
* gma500: Fix potential BO leaks in error handling
* radeon: Fix NULL-ptr deref
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YN2GK2SH64yqXqh9@linux-uq9g
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 2e9ad6e0dfbb..05ff22a4893a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -919,7 +919,8 @@ static int amdgpu_ttm_backend_bind(struct ttm_device *bdev, bo_mem->mem_type == AMDGPU_PL_OA) return -EINVAL; - if (!amdgpu_gtt_mgr_has_gart_addr(bo_mem)) { + if (bo_mem->mem_type != TTM_PL_TT || + !amdgpu_gtt_mgr_has_gart_addr(bo_mem)) { gtt->offset = AMDGPU_BO_INVALID_OFFSET; return 0; } |