drm/amdgpu: correct ROM_INDEX/DATA offset for VEGA20
Subsystems (2)
PATCH 1/1 drm/amdgpu: correct ROM_INDEX/DATA offset for VEGA20
The ROMC_INDEX/DATA offset was changed to e4/e5 since from smuio_v11 (vega20/arcturus).
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +23 -2
@@ -89,6 +89,13 @@#define HDP_MEM_POWER_CTRL__RC_MEM_POWER_CTRL_EN_MASK 0x00010000L#define HDP_MEM_POWER_CTRL__RC_MEM_POWER_LS_EN_MASK 0x00020000L#define mmHDP_MEM_POWER_CTRL_BASE_IDX 0 + +/* for Vega20/arcturus regiter offset change */ +#define mmROM_INDEX_VG20 0x00e4 +#define mmROM_INDEX_VG20_BASE_IDX 0 +#define mmROM_DATA_VG20 0x00e5 +#define mmROM_DATA_VG20_BASE_IDX 0 +/* * Indirect registers accessor */
@@ -304,6 +311,8 @@ static bool soc15_read_bios_from_rom(struct amdgpu_device *adev, {u32 *dw_ptr;u32 i, length_dw; +uint32_t rom_index_offset; +uint32_t rom_data_offset;if (bios ==NULL )return false;
@@ -316,11 +325,23 @@ static bool soc15_read_bios_from_rom(struct amdgpu_device *adev, dw_ptr = (u32 *)bios; length_dw =ALIGN (length_bytes,4 ) /4 ; +switch (adev->asic_type) { +case CHIP_VEGA20 : +case CHIP_ARCTURUS : + rom_index_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_INDEX_VG20); + rom_data_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_DATA_VG20); +break ; +default : + rom_index_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_INDEX); + rom_data_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_DATA); +break ; + } +/* set rom index to 0 */ -WREG32 (SOC15_REG_OFFSET (SMUIO ,0 , mmROM_INDEX),0 ); +WREG32 (rom_index_offset,0 );/* read out the rom data */ for (i =0 ; i < length_dw; i++) - dw_ptr[i] =RREG32 (SOC15_REG_OFFSET (SMUIO ,0 , mmROM_DATA)); + dw_ptr[i] =RREG32 (rom_data_offset);return true; }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
-----Original Message-----
From: Hawking Zhang <[email protected]>
Sent: 2020年3月4日 17:27
To: [email protected]; Li, Candice <[email protected]>
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH] drm/amdgpu: correct ROM_INDEX/DATA offset for VEGA20
The ROMC_INDEX/DATA offset was changed to e4/e5 since from smuio_v11 (vega20/arcturus).
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +23 -2
@@ -89,6 +89,13 @@#define HDP_MEM_POWER_CTRL__RC_MEM_POWER_CTRL_EN_MASK 0x00010000L#define HDP_MEM_POWER_CTRL__RC_MEM_POWER_LS_EN_MASK 0x00020000L#define mmHDP_MEM_POWER_CTRL_BASE_IDX 0 + +/* for Vega20/arcturus regiter offset change */ +#define mmROM_INDEX_VG20 0x00e4 +#define mmROM_INDEX_VG20_BASE_IDX 0 +#define mmROM_DATA_VG20 0x00e5 +#define mmROM_DATA_VG20_BASE_IDX 0 +/* * Indirect registers accessor */
@@ -304,6 +311,8 @@ static bool soc15_read_bios_from_rom(struct amdgpu_device *adev, {u32 *dw_ptr;u32 i, length_dw; +uint32_t rom_index_offset; +uint32_t rom_data_offset;if (bios ==NULL )return false;
@@ -316,11 +325,23 @@ static bool soc15_read_bios_from_rom(struct amdgpu_device *adev, dw_ptr = (u32 *)bios; length_dw =ALIGN (length_bytes,4 ) /4 ; +switch (adev->asic_type) { +case CHIP_VEGA20 : +case CHIP_ARCTURUS : + rom_index_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_INDEX_VG20); + rom_data_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_DATA_VG20); +break ; +default : + rom_index_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_INDEX); + rom_data_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_DATA); +break ; + } +/* set rom index to 0 */ -WREG32 (SOC15_REG_OFFSET (SMUIO ,0 , mmROM_INDEX),0 ); +WREG32 (rom_index_offset,0 );/* read out the rom data */ for (i =0 ; i < length_dw; i++) - dw_ptr[i] =RREG32 (SOC15_REG_OFFSET (SMUIO ,0 , mmROM_DATA)); + dw_ptr[i] =RREG32 (rom_data_offset);return true; }
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
A spelling typo.
+/* for Vega20/arcturus regiter offset change */
regiter->register.
Regards,
Guchun
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Li, Candice
Sent: Wednesday, March 4, 2020 5:36 PM
To: Zhang, Hawking <[email protected]>; [email protected]
Cc: Zhang, Hawking <[email protected]>
Subject: RE: [PATCH] drm/amdgpu: correct ROM_INDEX/DATA offset for VEGA20
[AMD Official Use Only - Internal Distribution Only]
-----Original Message-----
From: Hawking Zhang <[email protected]>
Sent: 2020年3月4日 17:27
To: [email protected]; Li, Candice <[email protected]>
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH] drm/amdgpu: correct ROM_INDEX/DATA offset for VEGA20
The ROMC_INDEX/DATA offset was changed to e4/e5 since from smuio_v11 (vega20/arcturus).
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +23 -2
@@ -89,6 +89,13 @@#define HDP_MEM_POWER_CTRL__RC_MEM_POWER_CTRL_EN_MASK 0x00010000L#define HDP_MEM_POWER_CTRL__RC_MEM_POWER_LS_EN_MASK 0x00020000L#define mmHDP_MEM_POWER_CTRL_BASE_IDX 0 + +/* for Vega20/arcturus regiter offset change */ +#define mmROM_INDEX_VG20 0x00e4 +#define mmROM_INDEX_VG20_BASE_IDX 0 +#define mmROM_DATA_VG20 0x00e5 +#define mmROM_DATA_VG20_BASE_IDX 0 +/* * Indirect registers accessor */
@@ -304,6 +311,8 @@ static bool soc15_read_bios_from_rom(struct amdgpu_device *adev, {u32 *dw_ptr;u32 i, length_dw; +uint32_t rom_index_offset; +uint32_t rom_data_offset;if (bios ==NULL )return false;
@@ -316,11 +325,23 @@ static bool soc15_read_bios_from_rom(struct amdgpu_device *adev, dw_ptr = (u32 *)bios; length_dw =ALIGN (length_bytes,4 ) /4 ; +switch (adev->asic_type) { +case CHIP_VEGA20 : +case CHIP_ARCTURUS : + rom_index_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_INDEX_VG20); + rom_data_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_DATA_VG20); +break ; +default : + rom_index_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_INDEX); + rom_data_offset =SOC15_REG_OFFSET (SMUIO ,0 , mmROM_DATA); +break ; + } +/* set rom index to 0 */ -WREG32 (SOC15_REG_OFFSET (SMUIO ,0 , mmROM_INDEX),0 ); +WREG32 (rom_index_offset,0 );/* read out the rom data */ for (i =0 ; i < length_dw; i++) - dw_ptr[i] =RREG32 (SOC15_REG_OFFSET (SMUIO ,0 , mmROM_DATA)); + dw_ptr[i] =RREG32 (rom_data_offset);return true; }
--
2.17.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=02%7C01%7Cguchun.chen%40amd.com%7Ca3d950521fb444512da808d7c01f7787%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637189113776290047&sdata=g5WllYTvgLwjEN80qgAupeKzCAhV2b83HJSAi%2FmCqJg%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx