Commit dfffdf5e authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/amdgpu: check contiguous flags instead of mm_node

Drop the last user of drm_mm_node.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Tested-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent abf91e0d
...@@ -576,10 +576,10 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, ...@@ -576,10 +576,10 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict,
* *
* Called by ttm_mem_io_reserve() ultimately via ttm_bo_vm_fault() * Called by ttm_mem_io_reserve() ultimately via ttm_bo_vm_fault()
*/ */
static int amdgpu_ttm_io_mem_reserve(struct ttm_device *bdev, struct ttm_resource *mem) static int amdgpu_ttm_io_mem_reserve(struct ttm_device *bdev,
struct ttm_resource *mem)
{ {
struct amdgpu_device *adev = amdgpu_ttm_adev(bdev); struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);
struct drm_mm_node *mm_node = mem->mm_node;
size_t bus_size = (size_t)mem->num_pages << PAGE_SHIFT; size_t bus_size = (size_t)mem->num_pages << PAGE_SHIFT;
switch (mem->mem_type) { switch (mem->mem_type) {
...@@ -593,12 +593,9 @@ static int amdgpu_ttm_io_mem_reserve(struct ttm_device *bdev, struct ttm_resourc ...@@ -593,12 +593,9 @@ static int amdgpu_ttm_io_mem_reserve(struct ttm_device *bdev, struct ttm_resourc
/* check if it's visible */ /* check if it's visible */
if ((mem->bus.offset + bus_size) > adev->gmc.visible_vram_size) if ((mem->bus.offset + bus_size) > adev->gmc.visible_vram_size)
return -EINVAL; return -EINVAL;
/* Only physically contiguous buffers apply. In a contiguous
* buffer, size of the first mm_node would match the number of
* pages in ttm_resource.
*/
if (adev->mman.aper_base_kaddr && if (adev->mman.aper_base_kaddr &&
(mm_node->size == mem->num_pages)) mem->placement & TTM_PL_FLAG_CONTIGUOUS)
mem->bus.addr = (u8 *)adev->mman.aper_base_kaddr + mem->bus.addr = (u8 *)adev->mman.aper_base_kaddr +
mem->bus.offset; mem->bus.offset;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment