summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
diff options
context:
space:
mode:
authorKevin Wang2019-04-23 08:16:52 +0200
committerAlex Deucher2019-06-22 01:59:29 +0200
commit0a6430da0c7c6603aeb99b5b91418e6665c77561 (patch)
tree0f76b70457f7dddedd94910cdfdb028862e72895 /drivers/gpu/drm/amd/powerplay/smu_v11_0.c
parentdrm/amd/powerplay: add function pre_display_config_changed for navi10 (diff)
downloadkernel-qcow2-linux-0a6430da0c7c6603aeb99b5b91418e6665c77561.tar.gz
kernel-qcow2-linux-0a6430da0c7c6603aeb99b5b91418e6665c77561.tar.xz
kernel-qcow2-linux-0a6430da0c7c6603aeb99b5b91418e6665c77561.zip
drm/amd/powerplay: add function display_configuration_changed for navi10
1.add callback function to support navi10 asic. 2.Remove unnecessary logical code. Signed-off-by: Kevin Wang <kevin1.wang@amd.com> Reviewed-by: Huang Rui <ray.huang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/smu_v11_0.c')
-rw-r--r--drivers/gpu/drm/amd/powerplay/smu_v11_0.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
index b0b8aeebe2ba..ec7862ea299d 100644
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
@@ -714,9 +714,21 @@ static int smu_v11_0_write_pptable(struct smu_context *smu)
static int smu_v11_0_write_watermarks_table(struct smu_context *smu)
{
- return smu_update_table(smu, SMU_TABLE_WATERMARKS,
- smu->smu_table.tables[SMU_TABLE_WATERMARKS].cpu_addr,
+ int ret = 0;
+ struct smu_table_context *smu_table = &smu->smu_table;
+ struct smu_table *table = NULL;
+
+ table = &smu_table->tables[SMU_TABLE_WATERMARKS];
+ if (!table)
+ return -EINVAL;
+
+ if (!table->cpu_addr)
+ return -EINVAL;
+
+ ret = smu_update_table(smu, SMU_TABLE_WATERMARKS, table->cpu_addr,
true);
+
+ return ret;
}
static int smu_v11_0_set_deep_sleep_dcefclk(struct smu_context *smu, uint32_t clk)