Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c4e7fa5 authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: link all shadow bo V2 



V2:
1. use mutex instead of spinlock for shadow list, since its process could
sleep.
2. move list_del to bo destroy phase.

Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4c7e8855

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+5 −0
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ struct amdgpu_bo { 
	struct ttm_bo_kmap_obj		dma_buf_vmap;

	struct amdgpu_mn		*mn;

	struct list_head		mn_list;

	struct list_head		shadow_list;

};

#define gem_to_amdgpu_bo(gobj) container_of((gobj), struct amdgpu_bo, gem_base)
@@ -2096,6 +2097,10 @@ struct amdgpu_device { 
	struct kfd_dev          *kfd;



	struct amdgpu_virtualization virtualization;



	/* link all shadow bo */

	struct list_head                shadow_list;

	struct mutex                    shadow_list_lock;

};



bool amdgpu_device_is_px(struct drm_device *dev);

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

+3 −0
Original line number Diff line number Diff line
@@ -1550,6 +1550,9 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	spin_lock_init(&adev->gc_cac_idx_lock);

	spin_lock_init(&adev->audio_endpt_idx_lock);



	INIT_LIST_HEAD(&adev->shadow_list);

	mutex_init(&adev->shadow_list_lock);



	adev->rmmio_base = pci_resource_start(adev->pdev, 5);

	adev->rmmio_size = pci_resource_len(adev->pdev, 5);

	adev->rmmio = ioremap(adev->rmmio_base, adev->rmmio_size);

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

+11 −1
Original line number Diff line number Diff line
@@ -98,6 +98,11 @@ static void amdgpu_ttm_bo_destroy(struct ttm_buffer_object *tbo) 


	drm_gem_object_release(&bo->gem_base);

	amdgpu_bo_unref(&bo->parent);

	if (!list_empty(&bo->shadow_list)) {

		mutex_lock(&bo->adev->shadow_list_lock);

		list_del_init(&bo->shadow_list);

		mutex_unlock(&bo->adev->shadow_list_lock);

	}

	kfree(bo->metadata);

	kfree(bo);

}
@@ -315,6 +320,7 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev, 
	}

	bo->adev = adev;

	INIT_LIST_HEAD(&bo->list);

	INIT_LIST_HEAD(&bo->shadow_list);

	INIT_LIST_HEAD(&bo->va);

	bo->prefered_domains = domain & (AMDGPU_GEM_DOMAIN_VRAM |

					 AMDGPU_GEM_DOMAIN_GTT |
@@ -407,8 +413,12 @@ static int amdgpu_bo_create_shadow(struct amdgpu_device *adev, 
					NULL, &placement,

					bo->tbo.resv,

					&bo->shadow);

	if (!r)

	if (!r) {

		bo->shadow->parent = amdgpu_bo_ref(bo);

		mutex_lock(&adev->shadow_list_lock);

		list_add_tail(&bo->shadow_list, &adev->shadow_list);

		mutex_unlock(&adev->shadow_list_lock);

	}



	return r;

}