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

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/include/kgd_pp_interface.h b/drivers/gpu/drm/amd/include/kgd_pp_interface.h
index bd7404532029..980e696989b1 100644
--- a/drivers/gpu/drm/amd/include/kgd_pp_interface.h
+++ b/drivers/gpu/drm/amd/include/kgd_pp_interface.h
@@ -114,6 +114,8 @@ enum amd_pp_sensors {
         AMDGPU_PP_SENSOR_STABLE_PSTATE_SCLK,
         AMDGPU_PP_SENSOR_STABLE_PSTATE_MCLK,
         AMDGPU_PP_SENSOR_ENABLED_SMC_FEATURES_MASK,
+        AMDGPU_PP_SENSOR_MIN_FAN_RPM,
+        AMDGPU_PP_SENSOR_MAX_FAN_RPM,
 };
 
 enum amd_pp_task {
@@ -228,6 +230,7 @@ struct amd_pm_funcs {
         enum amd_dpm_forced_level (*get_performance_level)(void *handle);
         enum amd_pm_state_type (*get_current_power_state)(void *handle);
         int (*get_fan_speed_rpm)(void *handle, uint32_t *rpm);
+        int (*set_fan_speed_rpm)(void *handle, uint32_t rpm);
         int (*get_pp_num_states)(void *handle, struct pp_states_info *data);
         int (*get_pp_table)(void *handle, char **table);
         int (*set_pp_table)(void *handle, const char *buf, size_t size);
@@ -272,6 +275,7 @@ struct amd_pm_funcs {
         int (*get_display_mode_validation_clocks)(void *handle,
                 struct amd_pp_simple_clock_info *clocks);
         int (*notify_smu_enable_pwe)(void *handle);
+        int (*enable_mgpu_fan_boost)(void *handle);
 };
 
 #endif