drm/amdgpu/si: fix ASIC tests (77efe48a) · Commits · 戴 / test

Comparing adev->family with CHIP constants is not correct. adev->family can only be compared with AMDGPU_FAMILY constants and adev->asic_type is the struct member to compare with CHIP constants. They are separate identification spaces. Signed-off-by:

Jean Delvare <jdelvare@suse.de> Fixes: ("drm/amdgpu: add si implementation v10") Cc: Ken Wang <Qingqing.Wang@amd.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com> Signed-off-by:

Alex Deucher <alexander.deucher@amd.com>

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -1888,7 +1888,7 @@ static void si_program_aspm(struct amdgpu_device *adev)
		if (orig != data)
		si_pif_phy1_wreg(adev,PB1_PIF_PWRDOWN_1, data);

		if ((adev->family != CHIP_OLAND) && (adev->family != CHIP_HAINAN)) {
		if ((adev->asic_type != CHIP_OLAND) && (adev->asic_type != CHIP_HAINAN)) {
		orig = data = si_pif_phy0_rreg(adev,PB0_PIF_PWRDOWN_0);
		data &= ~PLL_RAMP_UP_TIME_0_MASK;
		if (orig != data)
		@@ -1937,14 +1937,14 @@ static void si_program_aspm(struct amdgpu_device *adev)

		orig = data = si_pif_phy0_rreg(adev,PB0_PIF_CNTL);
		data &= ~LS2_EXIT_TIME_MASK;
		if ((adev->family == CHIP_OLAND) \|\| (adev->family == CHIP_HAINAN))
		if ((adev->asic_type == CHIP_OLAND) \|\| (adev->asic_type == CHIP_HAINAN))
		data \|= LS2_EXIT_TIME(5);
		if (orig != data)
		si_pif_phy0_wreg(adev,PB0_PIF_CNTL, data);

		orig = data = si_pif_phy1_rreg(adev,PB1_PIF_CNTL);
		data &= ~LS2_EXIT_TIME_MASK;
		if ((adev->family == CHIP_OLAND) \|\| (adev->family == CHIP_HAINAN))
		if ((adev->asic_type == CHIP_OLAND) \|\| (adev->asic_type == CHIP_HAINAN))
		data \|= LS2_EXIT_TIME(5);
		if (orig != data)
		si_pif_phy1_wreg(adev,PB1_PIF_CNTL, data);

Admin message