Included psp_13_0_15 ip block for uniras
Signed-off-by: Ce Sun <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 ++-
drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.c | 1 +
drivers/gpu/drm/amd/ras/core/ras_mp1.c | 1 +
drivers/gpu/drm/amd/ras/core/ras_psp.c | 1 +
drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.c | 1 +
drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c | 3 +++
7 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 1420bb60e015..69a998e09556 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -3130,6 +3130,7 @@ static int amdgpu_discovery_set_ras_ip_blocks(struct
amdgpu_device *adev)
case IP_VERSION(13, 0, 6):
case IP_VERSION(13, 0, 12):
case IP_VERSION(13, 0, 14):
+ case IP_VERSION(13, 0, 15):
case IP_VERSION(15, 0, 8):
amdgpu_device_ip_block_add(adev, &ras_v1_0_ip_block);
break;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 6b2b8acdbf9b..47e852c15c36 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -3822,7 +3822,8 @@ int amdgpu_ras_block_late_init(struct amdgpu_device *adev,
ras_obj->hw_ops->query_ras_error_status)) ||
amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 14) ||
amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 12) ||
- amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 6)) {
+ amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 6) ||
+ amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 15)) {
r = amdgpu_ras_sysfs_create(adev, ras_block);
if (r)
goto interrupt;
diff --git a/drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.c
b/drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.c
index 1781d037ef13..fe0e35357af1 100644
--- a/drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.c
+++ b/drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.c
@@ -41,6 +41,7 @@ static const struct ras_eeprom_ops
*ras_eeprom_mgr_get_ip_func(
case IP_VERSION(13, 0, 6):
case IP_VERSION(13, 0, 14):
case IP_VERSION(13, 0, 12):
+ case IP_VERSION(13, 0, 15):
mgr->eeprom_early_init_service_supported = false;
return &ras_drv_eeprom_ops;
case IP_VERSION(15, 0, 8):
diff --git a/drivers/gpu/drm/amd/ras/core/ras_mp1.c
b/drivers/gpu/drm/amd/ras/core/ras_mp1.c
index 4c180027850f..49ce6ec7993f 100644
--- a/drivers/gpu/drm/amd/ras/core/ras_mp1.c
+++ b/drivers/gpu/drm/amd/ras/core/ras_mp1.c
@@ -34,6 +34,7 @@ static const struct ras_mp1_ip_func *ras_mp1_get_ip_funcs(
case IP_VERSION(13, 0, 6):
case IP_VERSION(13, 0, 14):
case IP_VERSION(13, 0, 12):
+ case IP_VERSION(13, 0, 15):
return &mp1_ras_func_v13_0;
case IP_VERSION(15, 0, 8):
return &mp1_ras_func_v15_0;
diff --git a/drivers/gpu/drm/amd/ras/core/ras_psp.c
b/drivers/gpu/drm/amd/ras/core/ras_psp.c
index ed53cd25d6bd..23ceec04a82a 100644
--- a/drivers/gpu/drm/amd/ras/core/ras_psp.c
+++ b/drivers/gpu/drm/amd/ras/core/ras_psp.c
@@ -46,6 +46,7 @@ static const struct ras_psp_ip_func *ras_psp_get_ip_funcs(
case IP_VERSION(13, 0, 6):
case IP_VERSION(13, 0, 14):
case IP_VERSION(13, 0, 12):
+ case IP_VERSION(13, 0, 15):
return &ras_psp_v13_0;
case IP_VERSION(15, 0, 8):
return &ras_psp_v15_0;
diff --git a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.c
b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.c
index a56d3116c5fd..5f550abd8dbf 100644
--- a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.c
+++ b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.c
@@ -121,6 +121,7 @@ static int ras_eeprom_i2c_config(struct ras_core_context
*ras_core,
case IP_VERSION(13, 0, 10):
case IP_VERSION(13, 0, 12):
case IP_VERSION(13, 0, 14):
+ case IP_VERSION(13, 0, 15):
cfg->eeprom_i2c_addr = EEPROM_I2C_MADDR_4;
badpages_per_record =
BAD_PAGE_NUM_PER_EEPROM_RECORD_V13;
break;
diff --git a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
index eb5722a59786..109c47eb002a 100644
--- a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
+++ b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
@@ -141,6 +141,7 @@ static bool amdgpu_ras_mgr_eeprom_is_supported(struct
amdgpu_device *adev)
case IP_VERSION(13, 0, 6):
case IP_VERSION(13, 0, 12):
case IP_VERSION(13, 0, 14):
+ case IP_VERSION(13, 0, 15):
return (adev->gmc.is_app_apu) ? false : true;
default:
return false;
@@ -156,6 +157,7 @@ static int amdgpu_ras_mgr_init_mp1_config(struct
amdgpu_device *adev,
switch (config->mp1_ip_version) {
case IP_VERSION(13, 0, 6):
case IP_VERSION(13, 0, 14):
+ case IP_VERSION(13, 0, 15):
case IP_VERSION(13, 0, 12):
case IP_VERSION(15, 0, 8):
mp1_cfg->mp1_sys_fn = &amdgpu_ras_mp1_sys_func;
@@ -325,6 +327,7 @@ int amdgpu_ras_mgr_sw_init(struct amdgpu_device *adev,
struct ras_module_param *
return 0;
else if (amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 14)
||
amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 12) ||
+ amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 15) ||
amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 6) ||
amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(15, 0, 8))
con->uniras_enabled = true;
--
2.34.1
