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

Commit 01d98506 authored by Emily Deng's avatar Emily Deng Committed by Alex Deucher
Browse files

drm/amdgpu: To get gds, gws and oa from adev->gds (v2) 



As now enabled per vm bo feature, the user mode driver won't supply the
bo_list generally, for this case, the gdb_base, gds_size, gws_base, gws_size and
oa_base, oa_size won't be set.

v2: fix warning (Chunming)

Signed-off-by: default avatarEmily Deng <Emily.Deng@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 20d4ac65

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

+23 −15
Original line number Diff line number Diff line
@@ -522,6 +522,9 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
	struct amdgpu_bo_list_entry *e;

	struct list_head duplicates;

	unsigned i, tries = 10;

	struct amdgpu_bo *gds;

	struct amdgpu_bo *gws;

	struct amdgpu_bo *oa;

	int r;



	INIT_LIST_HEAD(&p->validated);
@@ -652,18 +655,24 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 


	amdgpu_cs_report_moved_bytes(p->adev, p->bytes_moved,

				     p->bytes_moved_vis);



	if (p->bo_list) {

		struct amdgpu_bo *gds = p->bo_list->gds_obj;

		struct amdgpu_bo *gws = p->bo_list->gws_obj;

		struct amdgpu_bo *oa = p->bo_list->oa_obj;

		struct amdgpu_vm *vm = &fpriv->vm;

		unsigned i;



		gds = p->bo_list->gds_obj;

		gws = p->bo_list->gws_obj;

		oa = p->bo_list->oa_obj;

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

			struct amdgpu_bo *bo = p->bo_list->array[i].robj;



			p->bo_list->array[i].bo_va = amdgpu_vm_bo_find(vm, bo);

		}

	} else {

		gds = p->adev->gds.gds_gfx_bo;

		gws = p->adev->gds.gws_gfx_bo;

		oa = p->adev->gds.oa_gfx_bo;

	}



	if (gds) {

		p->job->gds_base = amdgpu_bo_gpu_offset(gds);
@@ -677,7 +686,6 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
		p->job->oa_base = amdgpu_bo_gpu_offset(oa);

		p->job->oa_size = amdgpu_bo_size(oa);

	}

	}



	if (!r && p->uf_entry.robj) {

		struct amdgpu_bo *uf = p->uf_entry.robj;