drm/amd/amdgpu: Add rev_id workaround logic for SRIOV setup
Subsystems (2)
PATCH 1/1 drm/amd/amdgpu: Add rev_id workaround logic for SRIOV setup
- When we are under SRIOV setup, the rev_id cannot be read properly. Therefore, we will return default value for it
--- drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c +13 -1
@@ -53,8 +53,20 @@ static void nbio_v2_3_remap_hdp_registers(struct amdgpu_device *adev)static u32 nbio_v2_3_get_rev_id (struct amdgpu_device *adev) { -u32 tmp =RREG32_SOC15 (NBIO ,0 , mmRCC_DEV0_EPF0_STRAP0); +u32 tmp; + +if (amdgpu_sriov_vf (adev)) { +/* workaround on rev_id for sriov +* guest vm gets 0xffffffff when reading RCC_DEV0_EPF0_STRAP0, +* as a consequence, the rev_id and external_rev_id are wrong. +* +* workaround it by hardcoding the rev_id to 0, +* (which is the default value) +*/ +return 0 ; + } + tmp =RREG32_SOC15 (NBIO ,0 , mmRCC_DEV0_EPF0_STRAP0); tmp &=RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK ; tmp >>=RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT ;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
_____________________________________
Monk Liu|GPU Virtualization Team |AMD
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Bokun Zhang
Sent: Wednesday, October 28, 2020 6:02 AM
To: [email protected]
Cc: Zhang, Bokun <[email protected]>
Subject: [PATCH] drm/amd/amdgpu: Add rev_id workaround logic for SRIOV setup
- When we are under SRIOV setup, the rev_id cannot be read properly. Therefore, we will return default value for it
--- drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c +13 -2
@@ -53,8 +53,20 @@ static void nbio_v2_3_remap_hdp_registers(struct amdgpu_device *adev)static u32 nbio_v2_3_get_rev_id (struct amdgpu_device *adev) { -u32 tmp =RREG32_SOC15 (NBIO ,0 , mmRCC_DEV0_EPF0_STRAP0); +u32 tmp; + +if (amdgpu_sriov_vf (adev)) { +/* workaround on rev_id for sriov +* guest vm gets 0xffffffff when reading RCC_DEV0_EPF0_STRAP0, +* as a consequence, the rev_id and external_rev_id are wrong. +* +* workaround it by hardcoding the rev_id to 0, +* (which is the default value) +*/ +return 0 ; +} +tmp =RREG32_SOC15 (NBIO ,0 , mmRCC_DEV0_EPF0_STRAP0); tmp &=RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK ; tmp >>=RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT ; --
2.25.1
_______________________________________________
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%7Cmonk.liu%40amd.com%7C5ddf2de922c74ecf2b7008d87ac53dd3%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637394334870430374%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=vPCdjXdjfuBEPAi1gcgF%2B8oGDQCQeZdSLzChC8k0DWU%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx