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

Commit 45088efc authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: improve parse_cs handling a bit 



This way we can use parse_cs and still keep VM mode enabled.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-and-Tested by: Leo Liu <leo.liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5e876c62

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

+5 −4
Original line number Diff line number Diff line
@@ -822,13 +822,14 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev, 


	/* Only for UVD/VCE VM emulation */

	if (ring->funcs->parse_cs) {

		p->job->vm = NULL;

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

			r = amdgpu_ring_parse_cs(ring, p, i);

			if (r)

				return r;

		}

	} else {

	}



	if (p->job->vm) {

		p->job->vm_pd_addr = amdgpu_bo_gpu_offset(vm->page_directory);



		r = amdgpu_bo_vm_update_pte(p, vm);
@@ -917,7 +918,7 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev, 
			offset = ((uint64_t)m->it.start) * AMDGPU_GPU_PAGE_SIZE;

			kptr += chunk_ib->va_start - offset;



			r =  amdgpu_ib_get(adev, NULL, chunk_ib->ib_bytes, ib);

			r =  amdgpu_ib_get(adev, vm, chunk_ib->ib_bytes, ib);

			if (r) {

				DRM_ERROR("Failed to get ib !\n");

				return r;
@@ -932,9 +933,9 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev, 
				return r;

			}



			ib->gpu_addr = chunk_ib->va_start;

		}



		ib->gpu_addr = chunk_ib->va_start;

		ib->length_dw = chunk_ib->ib_bytes / 4;

		ib->flags = chunk_ib->flags;

		j++;

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

+3 −0
Original line number Diff line number Diff line
@@ -876,6 +876,9 @@ int amdgpu_uvd_ring_parse_cs(struct amdgpu_cs_parser *parser, uint32_t ib_idx) 
	struct amdgpu_ib *ib = &parser->job->ibs[ib_idx];

	int r;



	parser->job->vm = NULL;

	ib->gpu_addr = amdgpu_sa_bo_gpu_addr(ib->sa_bo);



	if (ib->length_dw % 16) {

		DRM_ERROR("UVD IB length (%d) not 16 dwords aligned!\n",

			  ib->length_dw);

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

+3 −0
Original line number Diff line number Diff line
@@ -642,6 +642,9 @@ int amdgpu_vce_ring_parse_cs(struct amdgpu_cs_parser *p, uint32_t ib_idx) 
	uint32_t *size = &tmp;

	int i, r, idx = 0;



	p->job->vm = NULL;

	ib->gpu_addr = amdgpu_sa_bo_gpu_addr(ib->sa_bo);



	r = amdgpu_cs_sysvm_access_required(p);

	if (r)

		return r;