When we want to decouble resource management from buffer management we need to
be able to handle resources separately.
Add a resource pointer and rename bo->mem so that all code needs to
change to access the pointer instead.
No functional change.
Signed-off-by: Christian König
---
.../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c| 6 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 8 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c| 48 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h| 6 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 42
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c| 12 ++---
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +-
drivers/gpu/drm/drm_gem_ttm_helper.c | 6 +--
drivers/gpu/drm/drm_gem_vram_helper.c | 4 +-
drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_bo.c | 30 ++--
drivers/gpu/drm/nouveau/nouveau_chan.c| 2 +-
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_gem.c | 16 +++---
drivers/gpu/drm/nouveau/nouveau_vmm.c | 4 +-
drivers/gpu/drm/nouveau/nv17_fence.c | 2 +-
drivers/gpu/drm/nouveau/nv50_fence.c | 2 +-
drivers/gpu/drm/qxl/qxl_drv.h | 6 +--
drivers/gpu/drm/qxl/qxl_object.c | 10 ++--
drivers/gpu/drm/qxl/qxl_ttm.c | 4 +-
drivers/gpu/drm/radeon/radeon_cs.c| 8 +--
drivers/gpu/drm/radeon/radeon_gem.c | 10 ++--
drivers/gpu/drm/radeon/radeon_object.c| 22 -
drivers/gpu/drm/radeon/radeon_object.h| 4 +-
drivers/gpu/drm/radeon/radeon_pm.c| 2 +-
drivers/gpu/drm/radeon/radeon_trace.h | 2 +-
drivers/gpu/drm/radeon/radeon_ttm.c | 8 +--
drivers/gpu/drm/ttm/ttm_bo.c | 39 ---
drivers/gpu/drm/ttm/ttm_bo_util.c | 49 ++-
drivers/gpu/drm/ttm/ttm_bo_vm.c | 22 -
drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 8 +--
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c| 36 +++---
drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 10 ++--
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c| 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 12 ++---
drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 10 ++--
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 12 ++---
drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c| 8 +--
drivers/gpu/drm/vmwgfx/vmwgfx_shader.c| 12 ++---
drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c | 6 +--
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 6 +--
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c| 10 ++--
include/drm/ttm/ttm_bo_api.h | 3 +-
include/drm/ttm/ttm_bo_driver.h | 6 +--
48 files changed, 269 insertions(+), 264 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 9f6b299cbf74..2a6c2a3c7b6d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -1423,7 +1423,7 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(
* the next restore worker
*/
if (amdgpu_ttm_tt_get_usermm(bo->tbo.ttm) &&
- bo->tbo.mem.mem_type == TTM_PL_SYSTEM)
+ bo->tbo.resource->mem_type == TTM_PL_SYSTEM)
is_invalid_userptr = true;
if (check_if_add_bo_to_vm(avm, mem)) {
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 33b6e460f481..e4da933aaf4e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -4057,9 +4057,9 @@ static int amdgpu_device_recover_vram(struct
amdgpu_device *adev)
list_for_each_entry(shadow, >shadow_list, shadow_list) {
/* No need to recover an evicted BO */
- if (shadow->tbo.mem.mem_type != TTM_PL_TT ||
- shadow->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET ||
- shadow->parent->tbo.mem.mem_type != TTM_PL_VRAM)
+ if (shadow->tbo.resource->mem_type != TTM_PL_TT ||
+ shadow->tbo.resource->start == AMDGPU_BO_INVALID_OFFSET ||
+ shadow->parent->tbo.resource->mem_type != TTM_PL_VRAM)
continue;
r = amdgpu_bo_restore_shadow(shadow, );
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
index 47e0b48dc26f..69e4b29203a5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
@@ -272,12 +272,12 @@ static struct
