Commit 4908d026 authored by James Zhu's avatar James Zhu Committed by Alex Deucher
Browse files

drm/amdgpu/vcn: merge shared memory into vcpu 



Merge vcn firmware shared memory bo into vcn vcpu bo.

Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d10985f4

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

+6 −12
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
	bo_size = AMDGPU_VCN_STACK_SIZE + AMDGPU_VCN_CONTEXT_SIZE;

	if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)

		bo_size += AMDGPU_GPU_PAGE_ALIGN(le32_to_cpu(hdr->ucode_size_bytes) + 8);

	bo_size += AMDGPU_GPU_PAGE_ALIGN(sizeof(struct amdgpu_fw_shared));



	for (i = 0; i < adev->vcn.num_vcn_inst; i++) {

		if (adev->vcn.harvest_config & (1 << i))
@@ -189,6 +190,11 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
			return r;

		}



		adev->vcn.inst[i].fw_shared_cpu_addr = adev->vcn.inst[i].cpu_addr +

				bo_size - AMDGPU_GPU_PAGE_ALIGN(sizeof(struct amdgpu_fw_shared));

		adev->vcn.inst[i].fw_shared_gpu_addr = adev->vcn.inst[i].gpu_addr +

				bo_size - AMDGPU_GPU_PAGE_ALIGN(sizeof(struct amdgpu_fw_shared));



		if (adev->vcn.indirect_sram) {

			r = amdgpu_bo_create_kernel(adev, 64 * 2 * 4, PAGE_SIZE,

					AMDGPU_GEM_DOMAIN_VRAM, &adev->vcn.inst[i].dpg_sram_bo,
@@ -198,14 +204,6 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
				return r;

			}

		}



		r = amdgpu_bo_create_kernel(adev, AMDGPU_GPU_PAGE_ALIGN(sizeof(struct amdgpu_fw_shared)),

				PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM, &adev->vcn.inst[i].fw_shared_bo,

				&adev->vcn.inst[i].fw_shared_gpu_addr, &adev->vcn.inst[i].fw_shared_cpu_addr);

		if (r) {

			dev_err(adev->dev, "VCN %d (%d) failed to allocate firmware shared bo\n", i, r);

			return r;

		}

	}



	return 0;
@@ -221,10 +219,6 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev) 
		if (adev->vcn.harvest_config & (1 << j))

			continue;



		amdgpu_bo_free_kernel(&adev->vcn.inst[j].fw_shared_bo,

					  &adev->vcn.inst[j].fw_shared_gpu_addr,

					  (void **)&adev->vcn.inst[j].fw_shared_cpu_addr);



		if (adev->vcn.indirect_sram) {

			amdgpu_bo_free_kernel(&adev->vcn.inst[j].dpg_sram_bo,

						  &adev->vcn.inst[j].dpg_sram_gpu_addr,

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

+0 −1
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ struct amdgpu_vcn_inst { 
	struct amdgpu_irq_src	irq;

	struct amdgpu_vcn_reg	external;

	struct amdgpu_bo	*dpg_sram_bo;

	struct amdgpu_bo	*fw_shared_bo;

	struct dpg_pause_state	pause_state;

	void			*dpg_sram_cpu_addr;

	uint64_t		dpg_sram_gpu_addr;