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

Commit ab276632 authored by Xiangliang Yu's avatar Xiangliang Yu Committed by Alex Deucher
Browse files

drm/amdgpu/virt: change the place of virt_init_setting 



Change place of virt_init_setting function so that can cover the
cg and pg flags configuration.

Signed-off-by: default avatarXiangliang Yu <Xiangliang.Yu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 213cacef

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

+5 −5
Original line number Diff line number Diff line
@@ -531,11 +531,6 @@ static int soc15_common_early_init(void *handle) 
		(amdgpu_ip_block_mask & (1 << AMD_IP_BLOCK_TYPE_PSP)))

		psp_enabled = true;



	if (amdgpu_sriov_vf(adev)) {

		amdgpu_virt_init_setting(adev);

		xgpu_ai_mailbox_set_irq_funcs(adev);

	}



	/*

	 * nbio need be used for both sdma and gfx9, but only

	 * initializes once
@@ -579,6 +574,11 @@ static int soc15_common_early_init(void *handle) 
		return -EINVAL;

	}



	if (amdgpu_sriov_vf(adev)) {

		amdgpu_virt_init_setting(adev);

		xgpu_ai_mailbox_set_irq_funcs(adev);

	}



	adev->firmware.load_type = amdgpu_ucode_get_load_type(adev, amdgpu_fw_load_type);



	amdgpu_get_pcie_info(adev);

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

+5 −5
Original line number Diff line number Diff line
@@ -894,11 +894,6 @@ static int vi_common_early_init(void *handle) 
		(amdgpu_ip_block_mask & (1 << AMD_IP_BLOCK_TYPE_SMC)))

		smc_enabled = true;



	if (amdgpu_sriov_vf(adev)) {

		amdgpu_virt_init_setting(adev);

		xgpu_vi_mailbox_set_irq_funcs(adev);

	}



	adev->rev_id = vi_get_rev_id(adev);

	adev->external_rev_id = 0xFF;

	switch (adev->asic_type) {
@@ -1071,6 +1066,11 @@ static int vi_common_early_init(void *handle) 
		return -EINVAL;

	}



	if (amdgpu_sriov_vf(adev)) {

		amdgpu_virt_init_setting(adev);

		xgpu_vi_mailbox_set_irq_funcs(adev);

	}



	/* vi use smc load by default */

	adev->firmware.load_type = amdgpu_ucode_get_load_type(adev, amdgpu_fw_load_type);