Revert "drm/amdgpu/nbio7.4: add hw bug workaround for vega20"

kentrussell · kentrussell · commit 217c2b3894e7 · 2019-09-25T15:13:06.000-04:00
This reverts commit e01f2d4. VG20 did not require this workaround, as the fix is in the VBIOS. Leave VG10/12 workaround as some older shipped cards do not have the VBIOS fix in place, and the kernel workaround is required in those situations Signed-off-by: Kent Russell <kent.russell@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
@@ -307,13 +307,7 @@ static void nbio_v7_4_detect_hw_virt(struct amdgpu_device *adev)
 
 static void nbio_v7_4_init_registers(struct amdgpu_device *adev)
 {
-	uint32_t def, data;
-
-	def = data = RREG32_PCIE(smnPCIE_CI_CNTL);
-	data = REG_SET_FIELD(data, PCIE_CI_CNTL, CI_SLV_ORDERING_DIS, 1);
 
-	if (def != data)
-		WREG32_PCIE(smnPCIE_CI_CNTL, data);
 }
 
 static void nbio_v7_4_handle_ras_controller_intr_no_bifring(struct amdgpu_device *adev)

Original file line number	Diff line number	Diff line change
`@@ -307,13 +307,7 @@ static void nbio_v7_4_detect_hw_virt(struct amdgpu_device *adev)`
`307`	`307`
`308`	`308`	`static void nbio_v7_4_init_registers(struct amdgpu_device *adev)`
`309`	`309`	`{`
`310`		`- uint32_t def, data;`
`311`		`-`
`312`		`- def = data = RREG32_PCIE(smnPCIE_CI_CNTL);`
`313`		`- data = REG_SET_FIELD(data, PCIE_CI_CNTL, CI_SLV_ORDERING_DIS, 1);`
`314`	`310`
`315`		`- if (def != data)`
`316`		`- WREG32_PCIE(smnPCIE_CI_CNTL, data);`
`317`	`311`	`}`
`318`	`312`
`319`	`313`	`static void nbio_v7_4_handle_ras_controller_intr_no_bifring(struct amdgpu_device *adev)`