drm/amd/powerplay: issue proper hdp flush for table transferring
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: issue proper hdp flush for table transferring
Guard the content consistence between the view of GPU and CPU during the table transferring.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 15 ++++++++++----- .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 5 ++++- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 5 ++++- .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 5 ++++- .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 10 ++++++++-- 5 files changed, 30 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +10 -5
@@ -529,8 +529,14 @@ int smu_update_table(struct smu_context *smu, enum smu_table_id table_index, int table_size = smu_table->tables[table_index].size; -if (drv2smu) +if (drv2smu) {memcpy (table->cpu_addr, table_data, table_size); +/* +* Flush hdp cache: to guard the content seen by +* GPU is consitent with CPU. +*/ +amdgpu_asic_flush_hdp (adev,NULL ); + } ret = smu_send_smc_msg_with_param(smu, drv2smu ? SMU_MSG_TransferTableDram2Smu :
@@ -539,11 +545,10 @@ int smu_update_table(struct smu_context *smu, enum smu_table_id table_index, intif (ret)return ret; -/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); - -if (!drv2smu) +if (!drv2smu) { +amdgpu_asic_flush_hdp (adev,NULL );memcpy (table_data, table->cpu_addr, table_size); + }return ret; }
drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c +4 -1
@@ -137,7 +137,7 @@ static int smu10_copy_table_from_smc(struct pp_hwmgr *hwmgr, priv->smu_tables.entry[table_id].table_id);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL );memcpy (table, (uint8_t *)priv->smu_tables.entry[table_id].table, priv->smu_tables.entry[table_id].size);
@@ -150,6 +150,7 @@ static int smu10_copy_table_to_smc(struct pp_hwmgr *hwmgr, {struct smu10_smumgr *priv = (struct smu10_smumgr *)(hwmgr->smu_backend); +struct amdgpu_device *adev = hwmgr->adev;PP_ASSERT_WITH_CODE (table_id <MAX_SMU_TABLE , "Invalid SMU Table ID!", return -EINVAL;);
@@ -161,6 +162,8 @@ static int smu10_copy_table_to_smc(struct pp_hwmgr *hwmgr,memcpy (priv->smu_tables.entry[table_id].table, table, priv->smu_tables.entry[table_id].size); +amdgpu_asic_flush_hdp (adev,NULL ); +smu10_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrHigh,upper_32_bits (priv->smu_tables.entry[table_id].mc_addr));
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +4 -1
@@ -58,7 +58,7 @@ static int vega10_copy_table_from_smc(struct pp_hwmgr *hwmgr, priv->smu_tables.entry[table_id].table_id);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL );memcpy (table, priv->smu_tables.entry[table_id].table, priv->smu_tables.entry[table_id].size);
@@ -70,6 +70,7 @@ static int vega10_copy_table_to_smc(struct pp_hwmgr *hwmgr, uint8_t *table, int16_t table_id) {struct vega10_smumgr *priv = hwmgr->smu_backend; +struct amdgpu_device *adev = hwmgr->adev;/* under sriov, vbios or hypervisor driver * has already copy table to smc so here only skip it
@@ -87,6 +88,8 @@ static int vega10_copy_table_to_smc(struct pp_hwmgr *hwmgr,memcpy (priv->smu_tables.entry[table_id].table, table, priv->smu_tables.entry[table_id].size); +amdgpu_asic_flush_hdp (adev,NULL ); +smu9_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrHigh,upper_32_bits (priv->smu_tables.entry[table_id].mc_addr));
drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c +4 -1
@@ -66,7 +66,7 @@ static int vega12_copy_table_from_smc(struct pp_hwmgr *hwmgr, return -EINVAL);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL );memcpy (table, priv->smu_tables.entry[table_id].table, priv->smu_tables.entry[table_id].size);
@@ -84,6 +84,7 @@ static int vega12_copy_table_to_smc(struct pp_hwmgr *hwmgr, {struct vega12_smumgr *priv = (struct vega12_smumgr *)(hwmgr->smu_backend); +struct amdgpu_device *adev = hwmgr->adev;PP_ASSERT_WITH_CODE (table_id <TABLE_COUNT ,"Invalid SMU Table ID!" , return -EINVAL );
@@ -95,6 +96,8 @@ static int vega12_copy_table_to_smc(struct pp_hwmgr *hwmgr,memcpy (priv->smu_tables.entry[table_id].table, table, priv->smu_tables.entry[table_id].size); +amdgpu_asic_flush_hdp (adev,NULL ); + PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetDriverDramAddrHigh, upper_32_bits(priv->smu_tables.entry[table_id].mc_addr)) == 0,
drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +8 -2
@@ -189,7 +189,7 @@ static int vega20_copy_table_from_smc(struct pp_hwmgr *hwmgr, return ret);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL );memcpy (table, priv->smu_tables.entry[table_id].table, priv->smu_tables.entry[table_id].size);
@@ -207,6 +207,7 @@ static int vega20_copy_table_to_smc(struct pp_hwmgr *hwmgr, {struct vega20_smumgr *priv = (struct vega20_smumgr *)(hwmgr->smu_backend); +struct amdgpu_device *adev = hwmgr->adev;int ret =0 ; PP_ASSERT_WITH_CODE(table_id < TABLE_COUNT,
@@ -219,6 +220,8 @@ static int vega20_copy_table_to_smc(struct pp_hwmgr *hwmgr,memcpy (priv->smu_tables.entry[table_id].table, table, priv->smu_tables.entry[table_id].size); +amdgpu_asic_flush_hdp (adev,NULL ); + PP_ASSERT_WITH_CODE((ret = vega20_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetDriverDramAddrHigh, upper_32_bits(priv->smu_tables.entry[table_id].mc_addr))) == 0,
@@ -242,11 +245,14 @@ int vega20_set_activity_monitor_coeff(struct pp_hwmgr *hwmgr, {struct vega20_smumgr *priv = (struct vega20_smumgr *)(hwmgr->smu_backend); +struct amdgpu_device *adev = hwmgr->adev;int ret =0 ;memcpy (priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].table, table, priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].size); +amdgpu_asic_flush_hdp (adev,NULL ); + PP_ASSERT_WITH_CODE((ret = vega20_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetDriverDramAddrHigh, upper_32_bits(priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].mc_addr))) == 0,
@@ -290,7 +296,7 @@ int vega20_get_activity_monitor_coeff(struct pp_hwmgr *hwmgr, return ret);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL );memcpy (table, priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].table, priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].size);
Signature · 6 lines
2.24.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Ping..
Quoted 223 lines
-----Original Message-----
From: Quan, Evan <[email protected]>
Sent: Friday, January 3, 2020 5:47 PM
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH] drm/amd/powerplay: issue proper hdp flush for table transferringGuard the content consistence between the view of GPU and CPU during the table transferring.
Change-Id Ib3cebb97a1c8fb302eb040483bbaf089ae00c6a9Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 15 ++++++++++----- .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 5 ++++- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 5 ++++- .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 5 ++++- .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 10 ++++++++-- 5 files changed, 30 insertions(+), 10 deletions(-)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0
-0@@ -529,8 +529,14 @@ int smu_update_table(struct smu_context *smu,enum
smu_table_idtable_index, intdrivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7
-1table_size = smu_table->tables[table_index].size; -if (drv2smu) +if (drv2smu) {memcpy (table->cpu_addr, table_data, table_size); +/* +* Flush hdp cache: to guard the content seen by +* GPU is consitent with CPU. +*/ +amdgpu_asic_flush_hdp (adev,NULL ); + } ret = smu_send_smc_msg_with_param(smu, drv2smu ? SMU_MSG_TransferTableDram2Smu :@@ -539,11 +545,10 @@ int smu_update_table(struct smu_context *smu,enum
smu_table_idtable_index, intdrivers/gpu/drm/amd/powerplay/amdgpu_smu.c +3
-4if (ret)return ret; -/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); - -if (!drv2smu) +if (!drv2smu) { +amdgpu_asic_flush_hdp (adev,NULL );memcpy (table_data, table->cpu_addr, table_size); + }return ret; }drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c +1
-1@@ -137,7 +137,7 @@ static int smu10_copy_table_from_smc(struct pp_hwmgr *hwmgr, priv->smu_tables.entry[table_id].table_id);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL ); memcpy(table, (uint8_t *)priv->smu_tables.entry[table_id].table,drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c +4
-0priv->smu_tables.entry[table_id].size);@@ -150,6 +150,7 @@ static int smu10_copy_table_to_smc(struct pp_hwmgr *hwmgr, {struct smu10_smumgr *priv = (struct smu10_smumgr *)(hwmgr->smu_backend); +struct amdgpu_device *adev = hwmgr->adev;PP_ASSERT_WITH_CODE (table_id <MAX_SMU_TABLE , "Invalid SMU Table ID!", return -EINVAL;); @@ -161,6 +162,8 @@ static int smu10_copy_table_to_smc(struct pp_hwmgr *hwmgr, memcpy(priv->smu_tables.entry[table_id].table, table, priv->smu_tables.entry[table_id].size); +amdgpu_asic_flush_hdp (adev,NULL ); + smu10_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetDriverDramAddrHigh, upper_32_bits(priv-Quoted 1 line
smu_tables.entry[table_id].mc_addr));
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +1
-1@@ -58,7 +58,7 @@ static int vega10_copy_table_from_smc(struct pp_hwmgr *hwmgr, priv->smu_tables.entry[table_id].table_id);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL ); memcpy(table, priv->smu_tables.entry[table_id].table,drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +1
-0priv->smu_tables.entry[table_id].size);@@ -70,6 +70,7 @@ static int vega10_copy_table_to_smc(struct pp_hwmgr *hwmgr, uint8_t *table, int16_t table_id) {struct vega10_smumgr *priv = hwmgr->smu_backend; +struct amdgpu_device *adev = hwmgr->adev;/* under sriov, vbios or hypervisor driver * has already copy table to smc so here only skip it @@ -87,6 +88,8
@@ static int vega10_copy_table_to_smc(structpp_hwmgr*hwmgr,drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +2
-0memcpy (priv->smu_tables.entry[table_id].table, table, priv->smu_tables.entry[table_id].size); +amdgpu_asic_flush_hdp (adev,NULL ); + smu9_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetDriverDramAddrHigh, upper_32_bits(priv-Quoted 1 line
smu_tables.entry[table_id].mc_addr));
drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c +1
-1@@ -66,7 +66,7 @@ static int vega12_copy_table_from_smc(struct pp_hwmgr *hwmgr, return -EINVAL);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL ); memcpy(table, priv->smu_tables.entry[table_id].table,drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c +4
-0priv->smu_tables.entry[table_id].size);@@ -84,6 +84,7 @@ static int vega12_copy_table_to_smc(struct pp_hwmgr *hwmgr, {struct vega12_smumgr *priv = (struct vega12_smumgr *)(hwmgr->smu_backend); +struct amdgpu_device *adev = hwmgr->adev;PP_ASSERT_WITH_CODE (table_id <TABLE_COUNT , "Invalid SMU Table ID!", return -EINVAL); @@ -95,6 +96,8 @@ static int vega12_copy_table_to_smc(struct pp_hwmgr *hwmgr, memcpy(priv->smu_tables.entry[table_id].table, table, priv->smu_tables.entry[table_id].size); +amdgpu_asic_flush_hdp (adev,NULL ); +PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(h
wmgr,drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c +0
-0PPSMC_MSG_SetDriverDramAddrHigh, upper_32_bits(priv-Quoted 1 line
smu_tables.entry[table_id].mc_addr)) == 0, diff --git
a/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.cb/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.cindexf604612f411f..0db57fb83d30100644drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +1
-1@@ -189,7 +189,7 @@ static int vega20_copy_table_from_smc(structpp_hwmgr *hwmgr, return ret);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL ); memcpy(table, priv->smu_tables.entry[table_id].table,drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +1
-0priv->smu_tables.entry[table_id].size);@@ -207,6 +207,7 @@ static int vega20_copy_table_to_smc(struct pp_hwmgr *hwmgr, {struct vega20_smumgr *priv = (struct vega20_smumgr *)(hwmgr->smu_backend); +struct amdgpu_device *adev = hwmgr->adev;int ret =0 ; PP_ASSERT_WITH_CODE(table_id < TABLE_COUNT, @@ -219,6 +220,8@@ static int vega20_copy_table_to_smc(struct
pp_hwmgr*hwmgr,drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +2
-0memcpy (priv->smu_tables.entry[table_id].table, table, priv->smu_tables.entry[table_id].size); +amdgpu_asic_flush_hdp (adev,NULL ); + PP_ASSERT_WITH_CODE((ret =vega20_send_msg_to_smc_with_parameter(hwmgr,
drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +0
-0PPSMC_MSG_SetDriverDramAddrHigh, upper_32_bits(priv-Quoted 1 line
smu_tables.entry[table_id].mc_addr))) == 0, @@ -242,11 +245,14 @@ int
vega20_set_activity_monitor_coeff(struct
pp_hwmgr*hwmgr, {drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +1
-0struct vega20_smumgr *priv = (struct vega20_smumgr *)(hwmgr->smu_backend); +struct amdgpu_device *adev = hwmgr->adev;int ret =0 ; memcpy(priv-Quoted 1 line
smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].table, table,
priv-
Quoted 1 line
smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].size);
drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +2
-0+amdgpu_asic_flush_hdp (adev,NULL ); + PP_ASSERT_WITH_CODE((ret =vega20_send_msg_to_smc_with_parameter(hwmgr,
drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +0
-0PPSMC_MSG_SetDriverDramAddrHigh, upper_32_bits(priv-Quoted 1 line
smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].mc_addr))) == 0, @@ -
290,7 +296,7 @@ int vega20_get_activity_monitor_coeff(struct
pp_hwmgr*hwmgr,drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +1
-1return ret);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL ); memcpy(table, priv-Quoted 1 line
smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].table,
Quoted 4 lines
priv-
Quoted 1 line
smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].size);
--
2.24.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
Reviewed-byQuoted 3 lines · Evan
Ping..
Quoted 224 lines
Quoted 224 lines
-----Original Message-----
From: Quan, Evan <[email protected]>
Sent: Friday, January 3, 2020 5:47 PM
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH] drm/amd/powerplay: issue proper hdp flush for table transferringGuard the content consistence between the view of GPU and CPU during the table transferring.
Change-Id Ib3cebb97a1c8fb302eb040483bbaf089ae00c6a9Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 15 ++++++++++----- .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 5 ++++- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 5 ++++- .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 5 ++++- .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 10 ++++++++-- 5 files changed, 30 insertions(+), 10 deletions(-)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0
-0@@ -529,8 +529,14 @@ int smu_update_table(struct smu_context *smu,enum
smu_table_idtable_index, inttable_size = smu_table->tables[table_index].size;drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7
-1-if (drv2smu) +if (drv2smu) {memcpy (table->cpu_addr, table_data, table_size); +/* +* Flush hdp cache: to guard the content seen by +* GPU is consitent with CPU. +*/ +amdgpu_asic_flush_hdp (adev,NULL ); + } ret = smu_send_smc_msg_with_param(smu, drv2smu ? SMU_MSG_TransferTableDram2Smu :@@ -539,11 +545,10 @@ int smu_update_table(struct smu_context *smu,enum
smu_table_idtable_index, intif (ret) return ret;drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +3
-4-/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); - -if (!drv2smu) +if (!drv2smu) { +amdgpu_asic_flush_hdp (adev,NULL );memcpy (table_data, table->cpu_addr, table_size); + }return ret; }drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c +1
-1@@ -137,7 +137,7 @@ static int smu10_copy_table_from_smc(struct pp_hwmgr *hwmgr, priv->smu_tables.entry[table_id].table_id);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL ); memcpy(table, (uint8_t *)priv->smu_tables.entry[table_id].table,priv->smu_tables.entry[table_id].size);drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c +4
-0@@ -150,6 +150,7 @@ static int smu10_copy_table_to_smc(struct pp_hwmgr *hwmgr, {struct smu10_smumgr *priv = (struct smu10_smumgr *)(hwmgr->smu_backend); +struct amdgpu_device *adev = hwmgr->adev;PP_ASSERT_WITH_CODE (table_id <MAX_SMU_TABLE , "Invalid SMU Table ID!", return -EINVAL;); @@ -161,6 +162,8 @@ static int smu10_copy_table_to_smc(struct pp_hwmgr *hwmgr, memcpy(priv->smu_tables.entry[table_id].table, table, priv->smu_tables.entry[table_id].size); +amdgpu_asic_flush_hdp (adev,NULL ); + smu10_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetDriverDramAddrHigh, upper_32_bits(priv-Quoted 1 line
smu_tables.entry[table_id].mc_addr));
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +1
-1@@ -58,7 +58,7 @@ static int vega10_copy_table_from_smc(struct pp_hwmgr *hwmgr, priv->smu_tables.entry[table_id].table_id);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL ); memcpy(table, priv->smu_tables.entry[table_id].table,priv->smu_tables.entry[table_id].size);drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +1
-0@@ -70,6 +70,7 @@ static int vega10_copy_table_to_smc(struct pp_hwmgr *hwmgr, uint8_t *table, int16_t table_id) {struct vega10_smumgr *priv = hwmgr->smu_backend; +struct amdgpu_device *adev = hwmgr->adev;/* under sriov, vbios or hypervisor driver * has already copy table to smc so here only skip it @@ -87,6 +88,8
@@ static int vega10_copy_table_to_smc(structpp_hwmgr*hwmgr,memcpy(priv->smu_tables.entry[table_id].table, table, priv->smu_tables.entry[table_id].size);drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +2
-0+amdgpu_asic_flush_hdp (adev,NULL ); + smu9_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetDriverDramAddrHigh, upper_32_bits(priv-Quoted 1 line
smu_tables.entry[table_id].mc_addr));
drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c +1
-1@@ -66,7 +66,7 @@ static int vega12_copy_table_from_smc(struct pp_hwmgr *hwmgr, return -EINVAL);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL ); memcpy(table, priv->smu_tables.entry[table_id].table,priv->smu_tables.entry[table_id].size);drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c +4
-0@@ -84,6 +84,7 @@ static int vega12_copy_table_to_smc(struct pp_hwmgr *hwmgr, {struct vega12_smumgr *priv = (struct vega12_smumgr *)(hwmgr->smu_backend); +struct amdgpu_device *adev = hwmgr->adev;PP_ASSERT_WITH_CODE (table_id <TABLE_COUNT , "Invalid SMU Table ID!", return -EINVAL); @@ -95,6 +96,8 @@ static int vega12_copy_table_to_smc(struct pp_hwmgr *hwmgr, memcpy(priv->smu_tables.entry[table_id].table, table, priv->smu_tables.entry[table_id].size); +amdgpu_asic_flush_hdp (adev,NULL ); + PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr,
PPSMC_MSG_SetDriverDramAddrHigh, upper_32_bits(priv-Quoted 1 line
smu_tables.entry[table_id].mc_addr)) == 0, diff --git
a/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.cb/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.cindexf604612f411f..0db57fb83d30100644drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +1
-1@@ -189,7 +189,7 @@ static int vega20_copy_table_from_smc(structpp_hwmgr *hwmgr, return ret);/* flush hdp cache */ - adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL ); memcpy(table, priv->smu_tables.entry[table_id].table,priv->smu_tables.entry[table_id].size);drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +1
-0@@ -207,6 +207,7 @@ static int vega20_copy_table_to_smc(struct pp_hwmgr *hwmgr, {struct vega20_smumgr *priv = (struct vega20_smumgr *)(hwmgr->smu_backend); +struct amdgpu_device *adev = hwmgr->adev;int ret =0 ; PP_ASSERT_WITH_CODE(table_id < TABLE_COUNT, @@ -219,6 +220,8@@ static int vega20_copy_table_to_smc(struct
pp_hwmgr*hwmgr,memcpy(priv->smu_tables.entry[table_id].table, table, priv->smu_tables.entry[table_id].size);drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +2
-0+amdgpu_asic_flush_hdp (adev,NULL ); + PP_ASSERT_WITH_CODE((ret =vega20_send_msg_to_smc_with_parameter(hwmgr,
PPSMC_MSG_SetDriverDramAddrHigh, upper_32_bits(priv-Quoted 1 line
smu_tables.entry[table_id].mc_addr))) == 0, @@ -242,11 +245,14 @@ int
vega20_set_activity_monitor_coeff(struct
pp_hwmgr*hwmgr, {
structvega20_smumgr*priv =
(structvega20_smumgr*)(hwmgr->smu_backend);+ struct amdgpu_device *adev = hwmgr->adev; int ret = 0; memcpy(priv-Quoted 1 line
smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].table, table,
priv-
Quoted 1 line
smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].size);
drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +2
-0+amdgpu_asic_flush_hdp (adev,NULL ); + PP_ASSERT_WITH_CODE((ret =vega20_send_msg_to_smc_with_parameter(hwmgr,
PPSMC_MSG_SetDriverDramAddrHigh, upper_32_bits(priv-Quoted 1 line
smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].mc_addr))) == 0, @@ -
290,7 +296,7 @@ int vega20_get_activity_monitor_coeff(struct
pp_hwmgr*hwmgr,return ret); /* flush hdp cache */drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +1
-1- adev->nbio.funcs->hdp_flush (adev,NULL ); +amdgpu_asic_flush_hdp (adev,NULL ); memcpy(table, priv-Quoted 1 line
smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].table,
priv-
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].size);
--
2.24.1_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx