diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-04-10 06:42:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-04-10 06:42:53 +1000 |
| commit | 74bd4f0c921cc9cf5f99ba4129dafe35496de6f3 (patch) | |
| tree | 45f17b3da19fca4f6fdc2d12f702da6c4a0e6268 /drivers/gpu/drm/amd/powerplay/amd_powerplay.c | |
| parent | 1287c880ba45924ab41166cdf02766b2e3ac9d56 (diff) | |
| parent | 7e7ea24f0b46cd3078bc9af29d1c1aced89d1c8e (diff) | |
| download | linux-74bd4f0c921cc9cf5f99ba4129dafe35496de6f3.tar.bz2 | |
Merge tag 'amd-drm-fixes-5.7-2020-04-08' of git://people.freedesktop.org/~agd5f/linux into drm-next
amd-drm-fixes-5.7-2020-04-08:
amdgpu:
- Various Renoir fixes
- Fix gfx clockgating sequence on gfx10
- RAS fixes
- Avoid MST property creation after registration
- Various cursor/viewport fixes
- Fix a confusing log message about optional firmwares
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200408222240.3942-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/amd_powerplay.c')
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c index c195575366a3..2a12614a12c2 100644 --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c @@ -1452,7 +1452,8 @@ static int pp_get_asic_baco_state(void *handle, int *state) if (!hwmgr) return -EINVAL; - if (!hwmgr->pm_en || !hwmgr->hwmgr_func->get_asic_baco_state) + if (!(hwmgr->not_vf && amdgpu_dpm) || + !hwmgr->hwmgr_func->get_asic_baco_state) return 0; mutex_lock(&hwmgr->smu_lock); |