diff options
author | Dave Airlie <airlied@redhat.com> | 2018-10-11 00:53:40 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-10-11 00:53:45 -0400 |
commit | ca4b869240d5810ebac6b1570ad7beffcfbac2f5 (patch) | |
tree | d7e36e551b058316ab35e28f1bb992ce06b2ce0c /drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | |
parent | 46972c03ab667dc298cad0c9db517fb9b1521b5f (diff) | |
parent | df2fc43d09d3ee5ede82cab9299df5e78aa427b5 (diff) |
Merge branch 'drm-next-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-next
Add a new list.h helper for doing bulk updates. Used by ttm.
- Fixes for display underflow on VI APUs at 4K with UVD running
- Endian fixes for powerplay on vega
- DC fixes for interlaced video
- Vega20 powerplay fixes
- RV/RV2/PCO powerplay fixes
- Fix for spurious ACPI events on HG laptops
- Fix a memory leak in DC on driver unload
- Fixes for manual fan control mode switching
- Suspend/resume robustness fixes
- Fix display handling on RV2
- VCN fixes for DPG on PCO
- Misc code cleanups and warning fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181011014739.3117-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h index ff24e1cc5b65..f972cd156795 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | |||
@@ -278,6 +278,9 @@ enum amdgpu_pcie_gen { | |||
278 | #define amdgpu_dpm_get_fan_speed_rpm(adev, s) \ | 278 | #define amdgpu_dpm_get_fan_speed_rpm(adev, s) \ |
279 | ((adev)->powerplay.pp_funcs->get_fan_speed_rpm)((adev)->powerplay.pp_handle, (s)) | 279 | ((adev)->powerplay.pp_funcs->get_fan_speed_rpm)((adev)->powerplay.pp_handle, (s)) |
280 | 280 | ||
281 | #define amdgpu_dpm_set_fan_speed_rpm(adev, s) \ | ||
282 | ((adev)->powerplay.pp_funcs->set_fan_speed_rpm)((adev)->powerplay.pp_handle, (s)) | ||
283 | |||
281 | #define amdgpu_dpm_get_sclk(adev, l) \ | 284 | #define amdgpu_dpm_get_sclk(adev, l) \ |
282 | ((adev)->powerplay.pp_funcs->get_sclk((adev)->powerplay.pp_handle, (l))) | 285 | ((adev)->powerplay.pp_funcs->get_sclk((adev)->powerplay.pp_handle, (l))) |
283 | 286 | ||
@@ -357,6 +360,10 @@ enum amdgpu_pcie_gen { | |||
357 | ((adev)->powerplay.pp_funcs->odn_edit_dpm_table(\ | 360 | ((adev)->powerplay.pp_funcs->odn_edit_dpm_table(\ |
358 | (adev)->powerplay.pp_handle, type, parameter, size)) | 361 | (adev)->powerplay.pp_handle, type, parameter, size)) |
359 | 362 | ||
363 | #define amdgpu_dpm_enable_mgpu_fan_boost(adev) \ | ||
364 | ((adev)->powerplay.pp_funcs->enable_mgpu_fan_boost(\ | ||
365 | (adev)->powerplay.pp_handle)) | ||
366 | |||
360 | struct amdgpu_dpm { | 367 | struct amdgpu_dpm { |
361 | struct amdgpu_ps *ps; | 368 | struct amdgpu_ps *ps; |
362 | /* number of valid power states */ | 369 | /* number of valid power states */ |