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

Commit f92d5c61 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu: enable the static csa when mcbp enabled 



CSA is the Context Save Area for preemption.

Acked-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b239c017

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

+3 −2
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
	if (r)

		return r;



	if (amdgpu_sriov_vf(adev)) {

	if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {

		struct dma_fence *f;



		bo_va = fpriv->csa_va;
@@ -961,7 +961,8 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev, 
		if (chunk->chunk_id != AMDGPU_CHUNK_ID_IB)

			continue;



		if (chunk_ib->ip_type == AMDGPU_HW_IP_GFX && amdgpu_sriov_vf(adev)) {

		if (chunk_ib->ip_type == AMDGPU_HW_IP_GFX &&

		    (amdgpu_mcbp || amdgpu_sriov_vf(adev))) {

			if (chunk_ib->flags & AMDGPU_IB_FLAG_PREEMPT) {

				if (chunk_ib->flags & AMDGPU_IB_FLAG_CE)

					ce_preempt++;

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

+1 −1
Original line number Diff line number Diff line
@@ -1722,7 +1722,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
			adev->ip_blocks[i].status.hw = true;



			/* right after GMC hw init, we create CSA */

			if (amdgpu_sriov_vf(adev)) {

			if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {

				r = amdgpu_allocate_static_csa(adev, &adev->virt.csa_obj,

								AMDGPU_GEM_DOMAIN_VRAM,

								AMDGPU_CSA_SIZE);

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

+4 −3
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
		if ((ib->flags & AMDGPU_IB_FLAG_PREAMBLE) &&

		    skip_preamble &&

		    !(status & AMDGPU_PREAMBLE_IB_PRESENT_FIRST) &&

		    !amdgpu_mcbp &&

		    !amdgpu_sriov_vf(adev)) /* for SRIOV preemption, Preamble CE ib must be inserted anyway */

			continue;

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

+3 −3
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
		dev_info.ids_flags = 0;

		if (adev->flags & AMD_IS_APU)

			dev_info.ids_flags |= AMDGPU_IDS_FLAGS_FUSION;

		if (amdgpu_sriov_vf(adev))

		if (amdgpu_mcbp || amdgpu_sriov_vf(adev))

			dev_info.ids_flags |= AMDGPU_IDS_FLAGS_PREEMPTION;



		vm_size = adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE;
@@ -1003,7 +1003,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
		goto error_vm;

	}



	if (amdgpu_sriov_vf(adev)) {

	if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {

		uint64_t csa_addr = amdgpu_csa_vaddr(adev) & AMDGPU_GMC_HOLE_MASK;



		r = amdgpu_map_static_csa(adev, &fpriv->vm, adev->virt.csa_obj,
@@ -1066,7 +1066,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev, 


	amdgpu_vm_bo_rmv(adev, fpriv->prt_va);



	if (amdgpu_sriov_vf(adev)) {

	if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {

		/* TODO: how to handle reserve failure */

		BUG_ON(amdgpu_bo_reserve(adev->virt.csa_obj, true));

		amdgpu_vm_bo_rmv(adev, fpriv->csa_va);