Commit 762e6f3f authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/vi: add need_reset_on_init asic callback for VI (v2) 



VI chips require a reset if the driver was previously loaded
because the SMU can only be loaded once between each reset.

v2: rebase

Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3fcc10d7

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

+18 −0
Original line number Diff line number Diff line
@@ -987,6 +987,23 @@ static void vi_get_pcie_usage(struct amdgpu_device *adev, uint64_t *count0, 
	*count1 = RREG32_PCIE(ixPCIE_PERF_COUNT1_TXCLK) | (cnt1_of << 32);

}



static bool vi_need_reset_on_init(struct amdgpu_device *adev)

{

	u32 clock_cntl, pc;



	if (adev->flags & AMD_IS_APU)

		return false;



	/* check if the SMC is already running */

	clock_cntl = RREG32_SMC(ixSMC_SYSCON_CLOCK_CNTL_0);

	pc = RREG32_SMC(ixSMC_PC_C);

	if ((0 == REG_GET_FIELD(clock_cntl, SMC_SYSCON_CLOCK_CNTL_0, ck_disable)) &&

	    (0x20100 <= pc))

		return true;



	return false;

}



static const struct amdgpu_asic_funcs vi_asic_funcs =

{

	.read_disabled_bios = &vi_read_disabled_bios,
@@ -1003,6 +1020,7 @@ static const struct amdgpu_asic_funcs vi_asic_funcs = 
	.need_full_reset = &vi_need_full_reset,

	.init_doorbell_index = &legacy_doorbell_index_init,

	.get_pcie_usage = &vi_get_pcie_usage,

	.need_reset_on_init = &vi_need_reset_on_init,

};



#define CZ_REV_BRISTOL(rev)	 \