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

drm/ttm: remove pointers to globals 



As the name says global memory and bo accounting is global. So it doesn't
make to much sense having pointers to global structures all around the code.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarThomas Hellström <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/332879/
parent 9165fb87

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

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
 */

static int amdgpu_gart_dummy_page_init(struct amdgpu_device *adev)

{

	struct page *dummy_page = adev->mman.bdev.glob->dummy_read_page;

	struct page *dummy_page = ttm_bo_glob.dummy_read_page;



	if (adev->dummy_page_addr)

		return 0;

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

+4 −5
Original line number Diff line number Diff line
@@ -600,19 +600,18 @@ void amdgpu_vm_del_from_lru_notify(struct ttm_buffer_object *bo) 
void amdgpu_vm_move_to_lru_tail(struct amdgpu_device *adev,

				struct amdgpu_vm *vm)

{

	struct ttm_bo_global *glob = adev->mman.bdev.glob;

	struct amdgpu_vm_bo_base *bo_base;



	if (vm->bulk_moveable) {

		spin_lock(&glob->lru_lock);

		spin_lock(&ttm_bo_glob.lru_lock);

		ttm_bo_bulk_move_lru_tail(&vm->lru_bulk_move);

		spin_unlock(&glob->lru_lock);

		spin_unlock(&ttm_bo_glob.lru_lock);

		return;

	}



	memset(&vm->lru_bulk_move, 0, sizeof(vm->lru_bulk_move));



	spin_lock(&glob->lru_lock);

	spin_lock(&ttm_bo_glob.lru_lock);

	list_for_each_entry(bo_base, &vm->idle, vm_status) {

		struct amdgpu_bo *bo = bo_base->bo;
@@ -624,7 +623,7 @@ void amdgpu_vm_move_to_lru_tail(struct amdgpu_device *adev, 
			ttm_bo_move_to_lru_tail(&bo->shadow->tbo,

						&vm->lru_bulk_move);

	}

	spin_unlock(&glob->lru_lock);

	spin_unlock(&ttm_bo_glob.lru_lock);



	vm->bulk_moveable = true;

}

drivers/gpu/drm/drm_gem_vram_helper.c

+2 −3
Original line number Diff line number Diff line
@@ -1013,12 +1013,11 @@ static int drm_vram_mm_debugfs(struct seq_file *m, void *data) 
	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_vram_mm *vmm = node->minor->dev->vram_mm;

	struct drm_mm *mm = vmm->bdev.man[TTM_PL_VRAM].priv;

	struct ttm_bo_global *glob = vmm->bdev.glob;

	struct drm_printer p = drm_seq_file_printer(m);



	spin_lock(&glob->lru_lock);

	spin_lock(&ttm_bo_glob.lru_lock);

	drm_mm_print(mm, &p);

	spin_unlock(&glob->lru_lock);

	spin_unlock(&ttm_bo_glob.lru_lock);

	return 0;

}

drivers/gpu/drm/qxl/qxl_release.c

+2 −5
Original line number Diff line number Diff line
@@ -429,7 +429,6 @@ void qxl_release_unmap(struct qxl_device *qdev, 
void qxl_release_fence_buffer_objects(struct qxl_release *release)

{

	struct ttm_buffer_object *bo;

	struct ttm_bo_global *glob;

	struct ttm_bo_device *bdev;

	struct ttm_validate_buffer *entry;

	struct qxl_device *qdev;
@@ -451,9 +450,7 @@ void qxl_release_fence_buffer_objects(struct qxl_release *release) 
		       release->id | 0xf0000000, release->base.seqno);

	trace_dma_fence_emit(&release->base);



	glob = bdev->glob;



	spin_lock(&glob->lru_lock);

	spin_lock(&ttm_bo_glob.lru_lock);



	list_for_each_entry(entry, &release->bos, head) {

		bo = entry->bo;
@@ -462,7 +459,7 @@ void qxl_release_fence_buffer_objects(struct qxl_release *release) 
		ttm_bo_move_to_lru_tail(bo, NULL);

		dma_resv_unlock(bo->base.resv);

	}

	spin_unlock(&glob->lru_lock);

	spin_unlock(&ttm_bo_glob.lru_lock);

	ww_acquire_fini(&release->ticket);

}

drivers/gpu/drm/qxl/qxl_ttm.c

+2 −5
Original line number Diff line number Diff line
@@ -319,14 +319,11 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data) 
{

	struct drm_info_node *node = (struct drm_info_node *)m->private;

	struct drm_mm *mm = (struct drm_mm *)node->info_ent->data;

	struct drm_device *dev = node->minor->dev;

	struct qxl_device *rdev = dev->dev_private;

	struct ttm_bo_global *glob = rdev->mman.bdev.glob;

	struct drm_printer p = drm_seq_file_printer(m);



	spin_lock(&glob->lru_lock);

	spin_lock(&ttm_bo_glob.lru_lock);

	drm_mm_print(mm, &p);

	spin_unlock(&glob->lru_lock);

	spin_unlock(&ttm_bo_glob.lru_lock);

	return 0;

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE