diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0223-drm-amdgpu-port-fault_reserve_notify-changes-from-ra.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0223-drm-amdgpu-port-fault_reserve_notify-changes-from-ra.patch | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/common/recipes-kernel/linux/files/0223-drm-amdgpu-port-fault_reserve_notify-changes-from-ra.patch b/common/recipes-kernel/linux/files/0223-drm-amdgpu-port-fault_reserve_notify-changes-from-ra.patch deleted file mode 100644 index 8553fb31..00000000 --- a/common/recipes-kernel/linux/files/0223-drm-amdgpu-port-fault_reserve_notify-changes-from-ra.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 5fb1941d0ce70d8ce56b12edcb1a1f2ba07629dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> -Date: Thu, 21 May 2015 17:03:46 +0200 -Subject: [PATCH 0223/1050] drm/amdgpu: port fault_reserve_notify changes from - radeon -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Christian König <christian.koenig@amd.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 55 +++++++++++++++++++----------- - 1 file changed, 35 insertions(+), 20 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c -index b545f61..dcc6af9 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c -@@ -549,30 +549,45 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo, - int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) - { - struct amdgpu_device *adev; -- struct amdgpu_bo *rbo; -- unsigned long offset, size; -- int r; -+ struct amdgpu_bo *abo; -+ unsigned long offset, size, lpfn; -+ int i, r; - - if (!amdgpu_ttm_bo_is_amdgpu_bo(bo)) - return 0; -- rbo = container_of(bo, struct amdgpu_bo, tbo); -- adev = rbo->adev; -- if (bo->mem.mem_type == TTM_PL_VRAM) { -- size = bo->mem.num_pages << PAGE_SHIFT; -- offset = bo->mem.start << PAGE_SHIFT; -- if ((offset + size) > adev->mc.visible_vram_size) { -- /* hurrah the memory is not visible ! */ -- amdgpu_ttm_placement_from_domain(rbo, AMDGPU_GEM_DOMAIN_VRAM); -- rbo->placements[0].lpfn = adev->mc.visible_vram_size >> PAGE_SHIFT; -- r = ttm_bo_validate(bo, &rbo->placement, false, false); -- if (unlikely(r != 0)) -- return r; -- offset = bo->mem.start << PAGE_SHIFT; -- /* this should not happen */ -- if ((offset + size) > adev->mc.visible_vram_size) -- return -EINVAL; -- } -+ -+ abo = container_of(bo, struct amdgpu_bo, tbo); -+ adev = abo->adev; -+ 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->mc.visible_vram_size) -+ return 0; -+ -+ /* hurrah the memory is not visible ! */ -+ amdgpu_ttm_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_VRAM); -+ lpfn = adev->mc.visible_vram_size >> PAGE_SHIFT; -+ for (i = 0; i < abo->placement.num_placement; i++) { -+ /* Force into visible VRAM */ -+ if ((abo->placements[i].flags & TTM_PL_FLAG_VRAM) && -+ (!abo->placements[i].lpfn || abo->placements[i].lpfn > lpfn)) -+ abo->placements[i].lpfn = lpfn; -+ } -+ r = ttm_bo_validate(bo, &abo->placement, false, false); -+ if (unlikely(r == -ENOMEM)) { -+ amdgpu_ttm_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_GTT); -+ return ttm_bo_validate(bo, &abo->placement, false, false); -+ } else if (unlikely(r != 0)) { -+ return r; - } -+ -+ offset = bo->mem.start << PAGE_SHIFT; -+ /* this should never happen */ -+ if ((offset + size) > adev->mc.visible_vram_size) -+ return -EINVAL; -+ - return 0; - } - --- -1.9.1 - |