drm/amdgpu/gmc10: remove dummy read workaround for newer chips
Subsystems (2)
PATCH 1/1 drm/amdgpu/gmc10: remove dummy read workaround for newer chips
Sienna Cichlid and newer have a hw fix so no longer require the workaround.
--- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +4 -2
@@ -107,7 +107,8 @@ static int gmc_v10_0_process_interrupt(struct amdgpu_device *adev,* be updated to avoid reading an incorrect value due to * the new fast GRBM interface. */ -if (entry->vmid_src ==AMDGPU_GFXHUB_0 ) +if ((entry->vmid_src ==AMDGPU_GFXHUB_0 ) && + (adev->asic_type <CHIP_SIENNA_CICHLID ))RREG32 (hub->vm_l2_pro_fault_status); status =RREG32 (hub->vm_l2_pro_fault_status);
@@ -232,7 +233,8 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,* Issue a dummy read to wait for the ACK register to be cleared * to avoid a false ACK due to the new fast GRBM interface. */ -if (vmhub ==AMDGPU_GFXHUB_0 ) +if ((vmhub ==AMDGPU_GFXHUB_0 ) && + (adev->asic_type <CHIP_SIENNA_CICHLID ))RREG32_NO_KIQ (hub->vm_inv_eng0_req + hub->eng_distance * eng);/* Wait for ACK with a delay.*/
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 16.10.20 um 18:57 schrieb Alex Deucher:
Quoted 4 lines
Sienna Cichlid and newer have a hw fix so no longer require the workaround.
Signed-off-by Alex Deucher <[email protected]>
Quoted 19 lines
--- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/gmc_v10_0.cbrahma/amd-staging-drm-next renamed from drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +2
-1@@ -107,7 +107,8 @@ static int gmc_v10_0_process_interrupt(struct amdgpu_device *adev, * be updated to avoid reading an incorrect value due to * the new fast GRBM interface. */ - if (entry->vmid_src == AMDGPU_GFXHUB_0) + if ((entry->vmid_src == AMDGPU_GFXHUB_0) && + (adev->asic_type < CHIP_SIENNA_CICHLID)) RREG32(hub->vm_l2_pro_fault_status); status = RREG32(hub->vm_l2_pro_fault_status);
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.cbrahma/amd-staging-drm-next static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid, · line 240
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.cbrahma/amd-staging-drm-next renamed from drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +2
-1@@ -232,7 +233,8 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid, * Issue a dummy read to wait for the ACK register to be cleared * to avoid a false ACK due to the new fast GRBM interface. */ - if (vmhub == AMDGPU_GFXHUB_0) + if ((vmhub == AMDGPU_GFXHUB_0) && + (adev->asic_type < CHIP_SIENNA_CICHLID)) RREG32_NO_KIQ(hub->vm_inv_eng0_req + hub->eng_distance * eng); /* Wait for ACK with a delay.*/
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
Regards,
Hawking
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Saturday, October 17, 2020 00:58
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH] drm/amdgpu/gmc10: remove dummy read workaround for newer chips
Sienna Cichlid and newer have a hw fix so no longer require the workaround.
--- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +4 -2
@@ -107,7 +107,8 @@ static int gmc_v10_0_process_interrupt(struct amdgpu_device *adev,* be updated to avoid reading an incorrect value due to * the new fast GRBM interface. */ -if (entry->vmid_src ==AMDGPU_GFXHUB_0 ) +if ((entry->vmid_src ==AMDGPU_GFXHUB_0 ) && + (adev->asic_type <CHIP_SIENNA_CICHLID ))RREG32 (hub->vm_l2_pro_fault_status); status =RREG32 (hub->vm_l2_pro_fault_status);
@@ -232,7 +233,8 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,* Issue a dummy read to wait for the ACK register to be cleared * to avoid a false ACK due to the new fast GRBM interface. */ -if (vmhub ==AMDGPU_GFXHUB_0 ) +if ((vmhub ==AMDGPU_GFXHUB_0 ) && + (adev->asic_type <CHIP_SIENNA_CICHLID ))RREG32_NO_KIQ (hub->vm_inv_eng0_req + hub->eng_distance * eng);/* Wait for ACK with a delay.*/
--
2.25.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Chawking.zhang%40amd.com%7C60cb49692afa43db6a5c08d871f49d6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637384642722943276%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=N5g4KP9PKHFfHi6c9bKI49QRlgmo6ZuxbHAbUe61Aic%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx