Commit 0339258b authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher

drm/amd/pm: invalidate hdp before CPU access the memory written by GPU

To eliminate the possible influence by outdated HDP read cache.
Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b7a1f382
...@@ -139,8 +139,7 @@ static int smu10_copy_table_from_smc(struct pp_hwmgr *hwmgr, ...@@ -139,8 +139,7 @@ static int smu10_copy_table_from_smc(struct pp_hwmgr *hwmgr,
priv->smu_tables.entry[table_id].table_id, priv->smu_tables.entry[table_id].table_id,
NULL); NULL);
/* flush hdp cache */ amdgpu_asic_invalidate_hdp(adev, NULL);
amdgpu_asic_flush_hdp(adev, NULL);
memcpy(table, (uint8_t *)priv->smu_tables.entry[table_id].table, memcpy(table, (uint8_t *)priv->smu_tables.entry[table_id].table,
priv->smu_tables.entry[table_id].size); priv->smu_tables.entry[table_id].size);
......
...@@ -60,8 +60,7 @@ static int vega10_copy_table_from_smc(struct pp_hwmgr *hwmgr, ...@@ -60,8 +60,7 @@ static int vega10_copy_table_from_smc(struct pp_hwmgr *hwmgr,
priv->smu_tables.entry[table_id].table_id, priv->smu_tables.entry[table_id].table_id,
NULL); NULL);
/* flush hdp cache */ amdgpu_asic_invalidate_hdp(adev, NULL);
amdgpu_asic_flush_hdp(adev, NULL);
memcpy(table, priv->smu_tables.entry[table_id].table, memcpy(table, priv->smu_tables.entry[table_id].table,
priv->smu_tables.entry[table_id].size); priv->smu_tables.entry[table_id].size);
......
...@@ -68,8 +68,7 @@ static int vega12_copy_table_from_smc(struct pp_hwmgr *hwmgr, ...@@ -68,8 +68,7 @@ static int vega12_copy_table_from_smc(struct pp_hwmgr *hwmgr,
"[CopyTableFromSMC] Attempt to Transfer Table From SMU Failed!", "[CopyTableFromSMC] Attempt to Transfer Table From SMU Failed!",
return -EINVAL); return -EINVAL);
/* flush hdp cache */ amdgpu_asic_invalidate_hdp(adev, NULL);
amdgpu_asic_flush_hdp(adev, NULL);
memcpy(table, priv->smu_tables.entry[table_id].table, memcpy(table, priv->smu_tables.entry[table_id].table,
priv->smu_tables.entry[table_id].size); priv->smu_tables.entry[table_id].size);
......
...@@ -192,8 +192,7 @@ static int vega20_copy_table_from_smc(struct pp_hwmgr *hwmgr, ...@@ -192,8 +192,7 @@ static int vega20_copy_table_from_smc(struct pp_hwmgr *hwmgr,
"[CopyTableFromSMC] Attempt to Transfer Table From SMU Failed!", "[CopyTableFromSMC] Attempt to Transfer Table From SMU Failed!",
return ret); return ret);
/* flush hdp cache */ amdgpu_asic_invalidate_hdp(adev, NULL);
amdgpu_asic_flush_hdp(adev, NULL);
memcpy(table, priv->smu_tables.entry[table_id].table, memcpy(table, priv->smu_tables.entry[table_id].table,
priv->smu_tables.entry[table_id].size); priv->smu_tables.entry[table_id].size);
...@@ -307,8 +306,7 @@ int vega20_get_activity_monitor_coeff(struct pp_hwmgr *hwmgr, ...@@ -307,8 +306,7 @@ int vega20_get_activity_monitor_coeff(struct pp_hwmgr *hwmgr,
"[GetActivityMonitor] Attempt to Transfer Table From SMU Failed!", "[GetActivityMonitor] Attempt to Transfer Table From SMU Failed!",
return ret); return ret);
/* flush hdp cache */ amdgpu_asic_invalidate_hdp(adev, NULL);
amdgpu_asic_flush_hdp(adev, NULL);
memcpy(table, priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].table, memcpy(table, priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].table,
priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].size); priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].size);
......
...@@ -655,7 +655,7 @@ int smu_cmn_update_table(struct smu_context *smu, ...@@ -655,7 +655,7 @@ int smu_cmn_update_table(struct smu_context *smu,
return ret; return ret;
if (!drv2smu) { if (!drv2smu) {
amdgpu_asic_flush_hdp(adev, NULL); amdgpu_asic_invalidate_hdp(adev, NULL);
memcpy(table_data, table->cpu_addr, table_size); memcpy(table_data, table->cpu_addr, table_size);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment