Commit 84e5b516 authored by Monk Liu's avatar Monk Liu Committed by Alex Deucher
Browse files

drm/amdgpu:free CSA in unified place 



instead of doing it in each GFX ip's sw_fini

Signed-off-by: default avatarMonk Liu <Monk.Liu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9921167d

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

+1 −0
Original line number Diff line number Diff line
@@ -1893,6 +1893,7 @@ static int amdgpu_fini(struct amdgpu_device *adev) 
		if (!adev->ip_blocks[i].status.hw)

			continue;

		if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) {

			amdgpu_free_static_csa(adev);

			amdgpu_wb_fini(adev);

			amdgpu_vram_scratch_fini(adev);

		}

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

+6 −0
Original line number Diff line number Diff line
@@ -47,6 +47,12 @@ int amdgpu_allocate_static_csa(struct amdgpu_device *adev) 
	return 0;

}



void amdgpu_free_static_csa(struct amdgpu_device *adev) {

	amdgpu_bo_free_kernel(&adev->virt.csa_obj,

						&adev->virt.csa_vmid0_addr,

						NULL);

}



/*

 * amdgpu_map_static_csa should be called during amdgpu_vm_init

 * it maps virtual address "AMDGPU_VA_RESERVED_SIZE - AMDGPU_CSA_SIZE"

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

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev); 
int amdgpu_allocate_static_csa(struct amdgpu_device *adev);

int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm,

			  struct amdgpu_bo_va **bo_va);

void amdgpu_free_static_csa(struct amdgpu_device *adev);

void amdgpu_virt_init_setting(struct amdgpu_device *adev);

uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg);

void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v);

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

+0 −1
Original line number Diff line number Diff line
@@ -2114,7 +2114,6 @@ static int gfx_v8_0_sw_fini(void *handle) 
	amdgpu_gfx_compute_mqd_sw_fini(adev);

	amdgpu_gfx_kiq_free_ring(&adev->gfx.kiq.ring, &adev->gfx.kiq.irq);

	amdgpu_gfx_kiq_fini(adev);

	amdgpu_bo_free_kernel(&adev->virt.csa_obj, &adev->virt.csa_vmid0_addr, NULL);



	gfx_v8_0_mec_fini(adev);

	gfx_v8_0_rlc_fini(adev);

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

+0 −1
Original line number Diff line number Diff line
@@ -1464,7 +1464,6 @@ static int gfx_v9_0_sw_fini(void *handle) 
	amdgpu_gfx_compute_mqd_sw_fini(adev);

	amdgpu_gfx_kiq_free_ring(&adev->gfx.kiq.ring, &adev->gfx.kiq.irq);

	amdgpu_gfx_kiq_fini(adev);

	amdgpu_bo_free_kernel(&adev->virt.csa_obj, &adev->virt.csa_vmid0_addr, NULL);



	gfx_v9_0_mec_fini(adev);

	gfx_v9_0_ngg_fini(adev);