summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/powerplay
diff options
context:
space:
mode:
authorTom St Denis2017-09-12 18:29:06 +0200
committerAlex Deucher2017-09-13 18:10:11 +0200
commitc9232d9ee85fade8a2020efe9f3bf64cdbbc6347 (patch)
treebe2b5a6214dd5a810f7849fe7b3efe88fbed983b /drivers/gpu/drm/amd/powerplay
parentdrm/amd/powerplay: Tidy up smu7_enable_didt() (diff)
downloadkernel-qcow2-linux-c9232d9ee85fade8a2020efe9f3bf64cdbbc6347.tar.gz
kernel-qcow2-linux-c9232d9ee85fade8a2020efe9f3bf64cdbbc6347.tar.xz
kernel-qcow2-linux-c9232d9ee85fade8a2020efe9f3bf64cdbbc6347.zip
drm/amd/powerplay: lock grbm_gfx index when changing instance
Signed-off-by: Tom St Denis <tom.stdenis@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay')
-rw-r--r--drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c
index 8c264c195e1a..0f75af33e581 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c
@@ -746,6 +746,7 @@ int smu7_enable_didt_config(struct pp_hwmgr *hwmgr)
PP_CAP(PHM_PlatformCaps_TCPRamping)) {
cgs_enter_safe_mode(hwmgr->device, true);
+ cgs_lock_grbm_idx(hwmgr->device, true);
value = 0;
value2 = cgs_read_register(hwmgr->device, mmGRBM_GFX_INDEX);
for (count = 0; count < num_se; count++) {
@@ -785,6 +786,7 @@ int smu7_enable_didt_config(struct pp_hwmgr *hwmgr)
PP_ASSERT_WITH_CODE((0 == result),
"Failed to enable DPM DIDT.", return result);
}
+ cgs_lock_grbm_idx(hwmgr->device, false);
cgs_enter_safe_mode(hwmgr->device, false);
}