diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-04-28 14:56:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-04-28 14:56:04 +1000 |
| commit | 4eaf02db9c2680ca92af92e2de7b33c6e079b2cd (patch) | |
| tree | f8d2ccc9f89003a1a90c95ed3ae9e95bd13e045c /drivers/gpu/drm/amd/pm/amdgpu_dpm.c | |
| parent | dbe946287e0825f0e9cd4cbeacfcde9d9b2dd168 (diff) | |
| parent | e15c9d06e9ad70df41285ca41d535de6215e0b21 (diff) | |
| download | linux-4eaf02db9c2680ca92af92e2de7b33c6e079b2cd.tar.bz2 | |
Merge tag 'amd-drm-next-5.19-2022-04-22' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-5.19-2022-04-22:
amdgpu:
- SMU message documentation update
- Misc code cleanups
- Documenation updates
- PSP TA updates
- Runtime PM regression fix
- SR-IOV header cleanup
- Misc fixes
amdkfd:
- TLB flush fixes
- GWS fixes
- CRIU GWS support
radeon:
- Misc code cleanups
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220422150049.5859-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/pm/amdgpu_dpm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c index 5504d81c77b7..6caf48cec9f3 100644 --- a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c +++ b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c @@ -751,7 +751,7 @@ int amdgpu_dpm_force_performance_level(struct amdgpu_device *adev, AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK | AMD_DPM_FORCED_LEVEL_PROFILE_PEAK; - if (!pp_funcs->force_performance_level) + if (!pp_funcs || !pp_funcs->force_performance_level) return 0; if (adev->pm.dpm.thermal_active) |