Commit ce4528da authored by Christian König's avatar Christian König
Browse files

drm/amdgpu: check base size instead of mem.num_pages 



Drop some ussage of mem in the code.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210413135248.1266-2-christian.koenig@amd.com


Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
parent aeaf45c5

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+3 −4
Original line number Diff line number Diff line
@@ -1311,7 +1311,7 @@ vm_fault_t amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) 
	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);

	struct ttm_operation_ctx ctx = { false, false };

	struct amdgpu_bo *abo = ttm_to_amdgpu_bo(bo);

	unsigned long offset, size;

	unsigned long offset;

	int r;



	/* Remember that this BO was accessed by the CPU */
@@ -1320,9 +1320,8 @@ vm_fault_t amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) 
	if (bo->mem.mem_type != TTM_PL_VRAM)

		return 0;



	size = bo->mem.num_pages << PAGE_SHIFT;

	offset = bo->mem.start << PAGE_SHIFT;

	if ((offset + size) <= adev->gmc.visible_vram_size)

	if ((offset + bo->base.size) <= adev->gmc.visible_vram_size)

		return 0;



	/* Can't move a pinned BO to visible VRAM */
@@ -1347,7 +1346,7 @@ vm_fault_t amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) 
	offset = bo->mem.start << PAGE_SHIFT;

	/* this should never happen */

	if (bo->mem.mem_type == TTM_PL_VRAM &&

	    (offset + size) > adev->gmc.visible_vram_size)

	    (offset + bo->base.size) > adev->gmc.visible_vram_size)

		return VM_FAULT_SIGBUS;



	ttm_bo_move_to_lru_tail_unlocked(bo);