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

Submitted by Russell, Kent on Sept. 10, 2019, 7:59 p.m.

Details

Message ID 20190910195922.16898-1-kent.russell@amd.com
State New
Headers show
Series "Revert "drm/amdgpu/nbio7.4: add hw bug workaround for vega20"" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Russell, Kent Sept. 10, 2019, 7:59 p.m.
This reverts commit e01f2d41895102d824c6b8f5e011dd5e286d5e8b.

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

Change-Id: I2d7c394ce9d205d97be6acfa5edc4635951fdadf
Signed-off-by: Kent Russell <kent.russell@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 6 ------
 1 file changed, 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
index 2d171bf07ad5..dafd9b7d31d3 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
@@ -308,13 +308,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)

Comments

On 2019-09-10 3:59 p.m., Russell, Kent wrote:
> This reverts commit e01f2d41895102d824c6b8f5e011dd5e286d5e8b.

>

> 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

>

> Change-Id: I2d7c394ce9d205d97be6acfa5edc4635951fdadf

> Signed-off-by: Kent Russell <kent.russell@amd.com>


Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>



> ---

>   drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 6 ------

>   1 file changed, 6 deletions(-)

>

> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c

> index 2d171bf07ad5..dafd9b7d31d3 100644

> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c

> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c

> @@ -308,13 +308,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)