Merge branch 'drm-next-4.5' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 23 Dec 2015 04:15:26 +0000 (14:15 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 23 Dec 2015 04:15:26 +0000 (14:15 +1000)
[airlied: fixup build problems on arm - added errno.h include]
* 'drm-next-4.5' of git://people.freedesktop.org/~agd5f/linux: (152 commits)
  amd/powerplay: fix copy paste typo in hardwaremanager.c
  amd/powerplay: disable powerplay by default initially
  amd/powerplay: don't enable ucode fan control if vbios has no fan table
  drm/amd/powerplay: show gpu load when print gpu performance for Cz. (v2)
  drm/amd/powerplay: check whether need to enable thermal control. (v2)
  drm/amd/powerplay: add point check to avoid NULL point hang.
  drm/amdgpu/powerplay: Program a calculated value as Deep Sleep clock.
  drm/amd/powerplay: Don't return an error if fan table is missing
  drm/powerplay/hwmgr: log errors in tonga_hwmgr_backend_init
  drm/powerplay: add debugging output to processpptables.c
  drm/powerplay: add debugging output to tonga_processpptables.c
  amd/powerplay: Add structures required to report configuration change
  amd/powerplay: Fix get dal power level
  amd\powerplay Implement get dal power level
  drm/amd/powerplay: display gpu load when print performance for tonga.
  drm/amdgpu/powerplay: enable sysfs and debugfs interfaces late
  drm/amd/powerplay: move shared function of vi to hwmgr. (v2)
  drm/amd/powerplay: check whether enable dpm in powerplay.
  drm/amd/powerplay: fix bug that dpm funcs in debugfs/sysfs missing.
  drm/amd/powerplay: fix boolreturn.cocci warnings
  ...

13 files changed:
1  2 
drivers/gpu/drm/Kconfig
drivers/gpu/drm/amd/amdgpu/amdgpu.h
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
drivers/gpu/drm/radeon/cik.c
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_dp_mst.c
drivers/gpu/drm/radeon/radeon_mode.h
include/drm/drmP.h

Simple merge
Simple merge
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,d9b8d3f768abc71952ab88c52a0ccfcaae99c4c2..e61a3e67852e27bffef8210f372dd916f21e5066
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,298 +1,299 @@@
+ /*
+  * Copyright 2015 Advanced Micro Devices, Inc.
+  *
+  * Permission is hereby granted, free of charge, to any person obtaining a
+  * copy of this software and associated documentation files (the "Software"),
+  * to deal in the Software without restriction, including without limitation
+  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  * and/or sell copies of the Software, and to permit persons to whom the
+  * Software is furnished to do so, subject to the following conditions:
+  *
+  * The above copyright notice and this permission notice shall be included in
+  * all copies or substantial portions of the Software.
+  *
+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+  * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  * OTHER DEALINGS IN THE SOFTWARE.
+  *
+  */
+ #ifndef _AMD_POWERPLAY_H_
+ #define _AMD_POWERPLAY_H_
+ #include <linux/seq_file.h>
+ #include <linux/types.h>
++#include <linux/errno.h>
+ #include "amd_shared.h"
+ #include "cgs_common.h"
+ enum amd_pp_event {
+       AMD_PP_EVENT_INITIALIZE = 0,
+       AMD_PP_EVENT_UNINITIALIZE,
+       AMD_PP_EVENT_POWER_SOURCE_CHANGE,
+       AMD_PP_EVENT_SUSPEND,
+       AMD_PP_EVENT_RESUME,
+       AMD_PP_EVENT_ENTER_REST_STATE,
+       AMD_PP_EVENT_EXIT_REST_STATE,
+       AMD_PP_EVENT_DISPLAY_CONFIG_CHANGE,
+       AMD_PP_EVENT_THERMAL_NOTIFICATION,
+       AMD_PP_EVENT_VBIOS_NOTIFICATION,
+       AMD_PP_EVENT_ENTER_THERMAL_STATE,
+       AMD_PP_EVENT_EXIT_THERMAL_STATE,
+       AMD_PP_EVENT_ENTER_FORCED_STATE,
+       AMD_PP_EVENT_EXIT_FORCED_STATE,
+       AMD_PP_EVENT_ENTER_EXCLUSIVE_MODE,
+       AMD_PP_EVENT_EXIT_EXCLUSIVE_MODE,
+       AMD_PP_EVENT_ENTER_SCREEN_SAVER,
+       AMD_PP_EVENT_EXIT_SCREEN_SAVER,
+       AMD_PP_EVENT_VPU_RECOVERY_BEGIN,
+       AMD_PP_EVENT_VPU_RECOVERY_END,
+       AMD_PP_EVENT_ENABLE_POWER_PLAY,
+       AMD_PP_EVENT_DISABLE_POWER_PLAY,
+       AMD_PP_EVENT_CHANGE_POWER_SOURCE_UI_LABEL,
+       AMD_PP_EVENT_ENABLE_USER2D_PERFORMANCE,
+       AMD_PP_EVENT_DISABLE_USER2D_PERFORMANCE,
+       AMD_PP_EVENT_ENABLE_USER3D_PERFORMANCE,
+       AMD_PP_EVENT_DISABLE_USER3D_PERFORMANCE,
+       AMD_PP_EVENT_ENABLE_OVER_DRIVE_TEST,
+       AMD_PP_EVENT_DISABLE_OVER_DRIVE_TEST,
+       AMD_PP_EVENT_ENABLE_REDUCED_REFRESH_RATE,
+       AMD_PP_EVENT_DISABLE_REDUCED_REFRESH_RATE,
+       AMD_PP_EVENT_ENABLE_GFX_CLOCK_GATING,
+       AMD_PP_EVENT_DISABLE_GFX_CLOCK_GATING,
+       AMD_PP_EVENT_ENABLE_CGPG,
+       AMD_PP_EVENT_DISABLE_CGPG,
+       AMD_PP_EVENT_ENTER_TEXT_MODE,
+       AMD_PP_EVENT_EXIT_TEXT_MODE,
+       AMD_PP_EVENT_VIDEO_START,
+       AMD_PP_EVENT_VIDEO_STOP,
+       AMD_PP_EVENT_ENABLE_USER_STATE,
+       AMD_PP_EVENT_DISABLE_USER_STATE,
+       AMD_PP_EVENT_READJUST_POWER_STATE,
+       AMD_PP_EVENT_START_INACTIVITY,
+       AMD_PP_EVENT_STOP_INACTIVITY,
+       AMD_PP_EVENT_LINKED_ADAPTERS_READY,
+       AMD_PP_EVENT_ADAPTER_SAFE_TO_DISABLE,
+       AMD_PP_EVENT_COMPLETE_INIT,
+       AMD_PP_EVENT_CRITICAL_THERMAL_FAULT,
+       AMD_PP_EVENT_BACKLIGHT_CHANGED,
+       AMD_PP_EVENT_ENABLE_VARI_BRIGHT,
+       AMD_PP_EVENT_DISABLE_VARI_BRIGHT,
+       AMD_PP_EVENT_ENABLE_VARI_BRIGHT_ON_POWER_XPRESS,
+       AMD_PP_EVENT_DISABLE_VARI_BRIGHT_ON_POWER_XPRESS,
+       AMD_PP_EVENT_SET_VARI_BRIGHT_LEVEL,
+       AMD_PP_EVENT_VARI_BRIGHT_MONITOR_MEASUREMENT,
+       AMD_PP_EVENT_SCREEN_ON,
+       AMD_PP_EVENT_SCREEN_OFF,
+       AMD_PP_EVENT_PRE_DISPLAY_CONFIG_CHANGE,
+       AMD_PP_EVENT_ENTER_ULP_STATE,
+       AMD_PP_EVENT_EXIT_ULP_STATE,
+       AMD_PP_EVENT_REGISTER_IP_STATE,
+       AMD_PP_EVENT_UNREGISTER_IP_STATE,
+       AMD_PP_EVENT_ENTER_MGPU_MODE,
+       AMD_PP_EVENT_EXIT_MGPU_MODE,
+       AMD_PP_EVENT_ENTER_MULTI_GPU_MODE,
+       AMD_PP_EVENT_PRE_SUSPEND,
+       AMD_PP_EVENT_PRE_RESUME,
+       AMD_PP_EVENT_ENTER_BACOS,
+       AMD_PP_EVENT_EXIT_BACOS,
+       AMD_PP_EVENT_RESUME_BACO,
+       AMD_PP_EVENT_RESET_BACO,
+       AMD_PP_EVENT_PRE_DISPLAY_PHY_ACCESS,
+       AMD_PP_EVENT_POST_DISPLAY_PHY_CCESS,
+       AMD_PP_EVENT_START_COMPUTE_APPLICATION,
+       AMD_PP_EVENT_STOP_COMPUTE_APPLICATION,
+       AMD_PP_EVENT_REDUCE_POWER_LIMIT,
+       AMD_PP_EVENT_ENTER_FRAME_LOCK,
+       AMD_PP_EVENT_EXIT_FRAME_LOOCK,
+       AMD_PP_EVENT_LONG_IDLE_REQUEST_BACO,
+       AMD_PP_EVENT_LONG_IDLE_ENTER_BACO,
+       AMD_PP_EVENT_LONG_IDLE_EXIT_BACO,
+       AMD_PP_EVENT_HIBERNATE,
+       AMD_PP_EVENT_CONNECTED_STANDBY,
+       AMD_PP_EVENT_ENTER_SELF_REFRESH,
+       AMD_PP_EVENT_EXIT_SELF_REFRESH,
+       AMD_PP_EVENT_START_AVFS_BTC,
+       AMD_PP_EVENT_MAX
+ };
+ enum amd_dpm_forced_level {
+       AMD_DPM_FORCED_LEVEL_AUTO = 0,
+       AMD_DPM_FORCED_LEVEL_LOW = 1,
+       AMD_DPM_FORCED_LEVEL_HIGH = 2,
+ };
+ struct amd_pp_init {
+       struct cgs_device *device;
+       uint32_t chip_family;
+       uint32_t chip_id;
+       uint32_t rev_id;
+ };
+ enum amd_pp_display_config_type{
+       AMD_PP_DisplayConfigType_None = 0,
+       AMD_PP_DisplayConfigType_DP54 ,
+       AMD_PP_DisplayConfigType_DP432 ,
+       AMD_PP_DisplayConfigType_DP324 ,
+       AMD_PP_DisplayConfigType_DP27,
+       AMD_PP_DisplayConfigType_DP243,
+       AMD_PP_DisplayConfigType_DP216,
+       AMD_PP_DisplayConfigType_DP162,
+       AMD_PP_DisplayConfigType_HDMI6G ,
+       AMD_PP_DisplayConfigType_HDMI297 ,
+       AMD_PP_DisplayConfigType_HDMI162,
+       AMD_PP_DisplayConfigType_LVDS,
+       AMD_PP_DisplayConfigType_DVI,
+       AMD_PP_DisplayConfigType_WIRELESS,
+       AMD_PP_DisplayConfigType_VGA
+ };
+ struct single_display_configuration
+ {
+       uint32_t controller_index;
+       uint32_t controller_id;
+       uint32_t signal_type;
+       uint32_t display_state;
+       /* phy id for the primary internal transmitter */
+       uint8_t primary_transmitter_phyi_d;
+       /* bitmap with the active lanes */
+       uint8_t primary_transmitter_active_lanemap;
+       /* phy id for the secondary internal transmitter (for dual-link dvi) */
+       uint8_t secondary_transmitter_phy_id;
+       /* bitmap with the active lanes */
+       uint8_t secondary_transmitter_active_lanemap;
+       /* misc phy settings for SMU. */
+       uint32_t config_flags;
+       uint32_t display_type;
+       uint32_t view_resolution_cx;
+       uint32_t view_resolution_cy;
+       enum amd_pp_display_config_type displayconfigtype;
+       uint32_t vertical_refresh; /* for active display */
+ };
+ #define MAX_NUM_DISPLAY 32
+ struct amd_pp_display_configuration {
+       bool nb_pstate_switch_disable;/* controls NB PState switch */
+       bool cpu_cc6_disable; /* controls CPU CState switch ( on or off) */
+       bool cpu_pstate_disable;
+       uint32_t cpu_pstate_separation_time;
+       uint32_t num_display;  /* total number of display*/
+       uint32_t num_path_including_non_display;
+       uint32_t crossfire_display_index;
+       uint32_t min_mem_set_clock;
+       uint32_t min_core_set_clock;
+       /* unit 10KHz x bit*/
+       uint32_t min_bus_bandwidth;
+       /* minimum required stutter sclk, in 10khz uint32_t ulMinCoreSetClk;*/
+       uint32_t min_core_set_clock_in_sr;
+       struct single_display_configuration displays[MAX_NUM_DISPLAY];
+       uint32_t vrefresh; /* for active display*/
+       uint32_t min_vblank_time; /* for active display*/
+       bool multi_monitor_in_sync;
+       /* Controller Index of primary display - used in MCLK SMC switching hang
+        * SW Workaround*/
+       uint32_t crtc_index;
+       /* htotal*1000/pixelclk - used in MCLK SMC switching hang SW Workaround*/
+       uint32_t line_time_in_us;
+       bool invalid_vblank_time;
+       uint32_t display_clk;
+       /*
+        * for given display configuration if multimonitormnsync == false then
+        * Memory clock DPMS with this latency or below is allowed, DPMS with
+        * higher latency not allowed.
+        */
+       uint32_t dce_tolerable_mclk_in_active_latency;
+ };
+ struct amd_pp_dal_clock_info {
+       uint32_t        engine_max_clock;
+       uint32_t        memory_max_clock;
+       uint32_t        level;
+ };
+ enum {
+       PP_GROUP_UNKNOWN = 0,
+       PP_GROUP_GFX = 1,
+       PP_GROUP_SYS,
+       PP_GROUP_MAX
+ };
+ #define PP_GROUP_MASK        0xF0000000
+ #define PP_GROUP_SHIFT       28
+ #define PP_BLOCK_MASK        0x0FFFFF00
+ #define PP_BLOCK_SHIFT       8
+ #define PP_BLOCK_GFX_CG         0x01
+ #define PP_BLOCK_GFX_MG         0x02
+ #define PP_BLOCK_SYS_BIF        0x01
+ #define PP_BLOCK_SYS_MC         0x02
+ #define PP_BLOCK_SYS_ROM        0x04
+ #define PP_BLOCK_SYS_DRM        0x08
+ #define PP_BLOCK_SYS_HDP        0x10
+ #define PP_BLOCK_SYS_SDMA       0x20
+ #define PP_STATE_MASK           0x0000000F
+ #define PP_STATE_SHIFT          0
+ #define PP_STATE_SUPPORT_MASK   0x000000F0
+ #define PP_STATE_SUPPORT_SHIFT  0
+ #define PP_STATE_CG             0x01
+ #define PP_STATE_LS             0x02
+ #define PP_STATE_DS             0x04
+ #define PP_STATE_SD             0x08
+ #define PP_STATE_SUPPORT_CG     0x10
+ #define PP_STATE_SUPPORT_LS     0x20
+ #define PP_STATE_SUPPORT_DS     0x40
+ #define PP_STATE_SUPPORT_SD     0x80
+ #define PP_CG_MSG_ID(group, block, support, state) (group << PP_GROUP_SHIFT |\
+                                                               block << PP_BLOCK_SHIFT |\
+                                                               support << PP_STATE_SUPPORT_SHIFT |\
+                                                               state << PP_STATE_SHIFT)
+ struct amd_powerplay_funcs {
+       int (*get_temperature)(void *handle);
+       int (*load_firmware)(void *handle);
+       int (*wait_for_fw_loading_complete)(void *handle);
+       int (*force_performance_level)(void *handle, enum amd_dpm_forced_level level);
+       enum amd_dpm_forced_level (*get_performance_level)(void *handle);
+       enum amd_pm_state_type (*get_current_power_state)(void *handle);
+       int (*get_sclk)(void *handle, bool low);
+       int (*get_mclk)(void *handle, bool low);
+       int (*powergate_vce)(void *handle, bool gate);
+       int (*powergate_uvd)(void *handle, bool gate);
+       int (*dispatch_tasks)(void *handle, enum amd_pp_event event_id,
+                                  void *input, void *output);
+       void (*print_current_performance_level)(void *handle,
+                                                     struct seq_file *m);
+       int (*set_fan_control_mode)(void *handle, uint32_t mode);
+       int (*get_fan_control_mode)(void *handle);
+       int (*set_fan_speed_percent)(void *handle, uint32_t percent);
+       int (*get_fan_speed_percent)(void *handle, uint32_t *speed);
+ };
+ struct amd_powerplay {
+       void *pp_handle;
+       const struct amd_ip_funcs *ip_funcs;
+       const struct amd_powerplay_funcs *pp_funcs;
+ };
+ int amd_powerplay_init(struct amd_pp_init *pp_init,
+                      struct amd_powerplay *amd_pp);
+ int amd_powerplay_fini(void *handle);
+ int amd_powerplay_display_configuration_change(void *handle, const void *input);
+ int amd_powerplay_get_display_power_level(void *handle,
+               struct amd_pp_dal_clock_info *output);
+ #endif /* _AMD_POWERPLAY_H_ */
Simple merge
Simple merge
Simple merge
Simple merge