Commit f9e292cb authored by Philip Yang's avatar Philip Yang Committed by Alex Deucher
Browse files

drm/amdkfd: kfd_bo_mapped_dev support partition 



Change amdgpu_amdkfd_bo_mapped_to_dev to use drm_priv as parameter
instead of adev, to support spatial partition. This is only used by CRIU
checkpoint restore now. No functional change.

Signed-off-by: default avatarPhilip Yang <Philip.Yang@amd.com>
Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent caaf5762

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

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ void amdgpu_amdkfd_ras_pasid_poison_consumption_handler(struct amdgpu_device *ad 
			pasid_notify pasid_fn, void *data, uint32_t reset);



bool amdgpu_amdkfd_is_fed(struct amdgpu_device *adev);

bool amdgpu_amdkfd_bo_mapped_to_dev(struct amdgpu_device *adev, struct kgd_mem *mem);

bool amdgpu_amdkfd_bo_mapped_to_dev(void *drm_priv, struct kgd_mem *mem);

void amdgpu_amdkfd_block_mmu_notifications(void *p);

int amdgpu_amdkfd_criu_resume(void *p);

bool amdgpu_amdkfd_ras_query_utcl2_poison_status(struct amdgpu_device *adev,

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

+3 −2
Original line number Diff line number Diff line
@@ -3200,12 +3200,13 @@ int amdgpu_amdkfd_get_tile_config(struct amdgpu_device *adev, 
	return 0;

}



bool amdgpu_amdkfd_bo_mapped_to_dev(struct amdgpu_device *adev, struct kgd_mem *mem)

bool amdgpu_amdkfd_bo_mapped_to_dev(void *drm_priv, struct kgd_mem *mem)

{

	struct amdgpu_vm *vm = drm_priv_to_vm(drm_priv);

	struct kfd_mem_attachment *entry;



	list_for_each_entry(entry, &mem->attachments, list) {

		if (entry->is_mapped && entry->adev == adev)

		if (entry->is_mapped && entry->bo_va->base.vm == vm)

			return true;

	}

	return false;

drivers/gpu/drm/amd/amdkfd/kfd_chardev.c

+1 −1
Original line number Diff line number Diff line
@@ -1963,7 +1963,7 @@ static int criu_checkpoint_bos(struct kfd_process *p, 
				bo_bucket->offset = amdgpu_bo_mmap_offset(dumper_bo);



			for (i = 0; i < p->n_pdds; i++) {

				if (amdgpu_amdkfd_bo_mapped_to_dev(p->pdds[i]->dev->adev, kgd_mem))

				if (amdgpu_amdkfd_bo_mapped_to_dev(p->pdds[i]->drm_priv, kgd_mem))

					bo_priv->mapped_gpuids[dev_idx++] = p->pdds[i]->user_gpu_id;

			}