Hi Dave, Last set of radeon and amdgpu changes for 4.9. This is mostly just the powerplay cleanup for dGPUs. Beyond that, just misc code cleanups and bug fixes. The following changes since commit af1f85ddecfa341e684db950c34a1813d36750db: drm/ttm: remove cpu_address member from ttm_tt (2016-09-16 15:53:05 -0400) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-4.9 for you to fetch changes up to beb86f29c9c7f2d04f9a42c4c61cc469c3689779: drm/amd/amdgpu: Clean up afmt allocation in DCEv6. (v2) (2016-09-22 14:15:59 -0400) ---------------------------------------------------------------- Alex Deucher (10): drm/amdgpu/dce6: fix off by one in interrupt setup Revert "drm/amdgpu: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF" Revert "drm/radeon: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF" drm/radeon: narrow asic_init for virtualization drm/amdgpu/vce: allow the clock table packet drm/amdgpu: bump version for new vce packet support drm/amdgpu/atpx: check for ATIF dGPU wake for display events support drm/amdgpu/atif: Send a hotplug event when we get dgpu display request drm/radeon/atpx: check for ATIF dGPU wake for display events support drm/radeon/atif: Send a hotplug event when we get dgpu display request Baoyou Xie (2): drm/amdgpu: remove unused functions drm/amdgpu: mark symbols static where possible Colin Ian King (1): drm/amdgpu: avoid out of bounds access on array interrupt_status_offsets Frank Min (1): drm/amdgpu:add fw version entry to info Huang Rui (3): drm/amdgpu: implement raster configuration for gfx v6 drm/amdgpu: implement raster configuration for gfx v7 drm/amdgpu: implement raster configuration for gfx v8 Markus Elfring (1): drm/amdgpu: Use kmalloc_array() in amdgpu_debugfs_gca_config_read() Monk Liu (3): drm/amdgpu:changes of virtualization cases probe (v3) drm/amdgpu:determine if vPost is needed indeed drm/amdgpu:cleanup virt related define Rex Zhu (23): drm/amd/powerplay: fix mclk not switching back after multi-head was disabled drm/amd/powerplay: fix potential issue of array access violation drm/amd/powerplay: add parameter of the mclk switch latency time drm/amd/powerplay: add common interface in smumgr to help to visit fw image. drm/amd/powerplay: implement smu7 hwmgr to manager asics with smu ip version 7. drm/amd/powerplay: implement fw image related smum interface for Polaris. drm/amd/powerplay: use smu7 hwmgr to manager polaris10/11 drm/amd/powerplay: implement fw image related smu interface for Fiji. drm/amd/powerplay: use smu7 hwmgr to manager fiji drm/amd/powerplay: implement fw image related smum interface for tonga. drm/amd/powerplay: use smu7_hwmgr to manager tonga. drm/amd/powerplay: implement smu7_smumgr for asics with smu ip version 7. drm/amd/powerplay: use smu7 common functions and data on Tonga. drm/amd/powerplay: use smu7 common functions and data on Polars10. drm/amd/powerplay: use smu7 common functions and data on Fiji. drm/amd/powerplay: use smu7 common functions and data on icelannd. drm/amd/powerplay: implement fw related smu interface for iceland. drm/amd/powerplay: use smu7 hwmgr to manager iceland drm/amd/powerplay: delete useless files. drm/amd/powerplay: export function to help to set cg by smu. drm/amdgpu: set system clock gating for tonga/polaris. drm/amdgpu: set gfx clock gating for tonga/polaris. drm/amdgpu: use powerplay module for dgpu in Vi. Tom St Denis (5): drm/amd/powerplay: Add read_sensor() callback to hwmgr (v3) drm/amd/amdgpu: Hook up read_sensor() to debugfs (v2) drm/amd/powerplay: Replace per-asic print_performance with generic drm/amd/amdgpu: Remove division from vblank_wait drm/amd/amdgpu: Clean up afmt allocation in DCEv6. (v2) drivers/gpu/drm/amd/amdgpu/Makefile | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 28 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 11 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 - drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 9 + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 42 + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 118 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 62 +- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 1 + .../amdgpu_virt.h} | 45 +- drivers/gpu/drm/amd/amdgpu/cik.c | 14 +- drivers/gpu/drm/amd/amdgpu/cikd.h | 36 + drivers/gpu/drm/amd/amdgpu/cz_smc.c | 7 - drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 32 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 6 +- drivers/gpu/drm/amd/amdgpu/fiji_dpm.c | 186 - drivers/gpu/drm/amd/amdgpu/fiji_smc.c | 863 --- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 131 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 160 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 245 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/iceland_dpm.c | 200 - drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 677 --- drivers/gpu/drm/amd/amdgpu/si.c | 14 +- drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | 186 - drivers/gpu/drm/amd/amdgpu/tonga_smc.c | 862 --- drivers/gpu/drm/amd/amdgpu/vi.c | 91 +- drivers/gpu/drm/amd/amdgpu/vid.h | 37 + drivers/gpu/drm/amd/include/asic_reg/si/sid.h | 35 + drivers/gpu/drm/amd/include/cgs_common.h | 1 + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 120 +- .../drm/amd/powerplay/eventmgr/eventactionchains.c | 2 + drivers/gpu/drm/amd/powerplay/eventmgr/psm.c | 3 +- drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 16 +- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 175 +- .../amd/powerplay/hwmgr/fiji_clockpowergating.c | 121 - .../drm/amd/powerplay/hwmgr/fiji_dyn_defaults.h | 105 - drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 5601 ----------------- drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.h | 350 -- .../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c | 610 -- .../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.h | 81 - drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.h | 62 - drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 126 +- .../amd/powerplay/hwmgr/iceland_clockpowergating.c | 119 - .../amd/powerplay/hwmgr/iceland_clockpowergating.h | 38 - .../drm/amd/powerplay/hwmgr/iceland_dyn_defaults.h | 41 - .../gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.c | 5684 ----------------- .../gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.h | 424 -- .../drm/amd/powerplay/hwmgr/iceland_powertune.c | 490 -- .../drm/amd/powerplay/hwmgr/iceland_powertune.h | 74 - .../gpu/drm/amd/powerplay/hwmgr/iceland_thermal.c | 595 -- .../gpu/drm/amd/powerplay/hwmgr/iceland_thermal.h | 58 - .../amd/powerplay/hwmgr/polaris10_dyn_defaults.h | 62 - .../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 5290 ---------------- .../drm/amd/powerplay/hwmgr/polaris10_thermal.c | 716 --- .../drm/amd/powerplay/hwmgr/polaris10_thermal.h | 62 - ..._clockpowergating.c => smu7_clockpowergating.c} | 160 +- ..._clockpowergating.h => smu7_clockpowergating.h} | 25 +- .../drm/amd/powerplay/hwmgr/smu7_dyn_defaults.h | 55 + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 4359 +++++++++++++ .../hwmgr/{polaris10_hwmgr.h => smu7_hwmgr.h} | 241 +- .../{polaris10_powertune.c => smu7_powertune.c} | 985 ++- .../{polaris10_powertune.h => smu7_powertune.h} | 43 +- .../hwmgr/{fiji_thermal.c => smu7_thermal.c} | 258 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h | 58 + .../amd/powerplay/hwmgr/tonga_clockpowergating.c | 350 -- .../drm/amd/powerplay/hwmgr/tonga_dyn_defaults.h | 107 - drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 6371 -------------------- drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h | 402 -- .../gpu/drm/amd/powerplay/hwmgr/tonga_powertune.c | 495 -- .../gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c | 590 -- .../gpu/drm/amd/powerplay/hwmgr/tonga_thermal.h | 61 - drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 19 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 4 +- .../gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h | 3 +- .../iceland_smum.h => powerplay/inc/smu7_common.h} | 43 +- drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h | 412 ++ drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 70 + drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 5 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 2374 ++++++++ .../fiji_smum.h => powerplay/smumgr/fiji_smc.h} | 41 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 612 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h | 32 +- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 2576 ++++++++ .../iceland_smc.h} | 26 +- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 613 +- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h | 63 +- .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 2287 +++++++ .../smumgr/polaris10_smc.h} | 32 +- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 703 +-- .../drm/amd/powerplay/smumgr/polaris10_smumgr.h | 41 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 589 ++ drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 87 + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 101 +- drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 3207 ++++++++++ .../tonga_powertune.h => smumgr/tonga_smc.h} | 56 +- .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 672 +-- .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.h | 46 +- drivers/gpu/drm/radeon/radeon_acpi.c | 17 + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 5 + drivers/gpu/drm/radeon/radeon_device.c | 11 +- 106 files changed, 18603 insertions(+), 35885 deletions(-) rename drivers/gpu/drm/amd/{powerplay/hwmgr/polaris10_clockpowergating.h => amdgpu/amdgpu_virt.h} (52%) delete mode 100644 drivers/gpu/drm/amd/amdgpu/fiji_dpm.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/fiji_smc.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_dpm.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_smc.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_dpm.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_smc.c mode change 100644 => 100755 drivers/gpu/drm/amd/include/cgs_common.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_clockpowergating.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_dyn_defaults.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_powertune.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_clockpowergating.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_clockpowergating.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_dyn_defaults.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_powertune.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_powertune.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_thermal.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_thermal.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_dyn_defaults.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.h rename drivers/gpu/drm/amd/powerplay/hwmgr/{polaris10_clockpowergating.c => smu7_clockpowergating.c} (76%) rename drivers/gpu/drm/amd/powerplay/hwmgr/{fiji_clockpowergating.h => smu7_clockpowergating.h} (62%) create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_dyn_defaults.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c rename drivers/gpu/drm/amd/powerplay/hwmgr/{polaris10_hwmgr.h => smu7_hwmgr.h} (59%) rename drivers/gpu/drm/amd/powerplay/hwmgr/{polaris10_powertune.c => smu7_powertune.c} (62%) rename drivers/gpu/drm/amd/powerplay/hwmgr/{polaris10_powertune.h => smu7_powertune.h} (64%) rename drivers/gpu/drm/amd/powerplay/hwmgr/{fiji_thermal.c => smu7_thermal.c} (65%) create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_clockpowergating.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_dyn_defaults.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_powertune.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.h rename drivers/gpu/drm/amd/{amdgpu/iceland_smum.h => powerplay/inc/smu7_common.h} (66%) create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c rename drivers/gpu/drm/amd/{amdgpu/fiji_smum.h => powerplay/smumgr/fiji_smc.h} (53%) mode change 100644 => 100755 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c rename drivers/gpu/drm/amd/powerplay/{hwmgr/tonga_clockpowergating.h => smumgr/iceland_smc.h} (63%) create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c rename drivers/gpu/drm/amd/{amdgpu/tonga_smum.h => powerplay/smumgr/polaris10_smc.h} (58%) create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c rename drivers/gpu/drm/amd/powerplay/{hwmgr/tonga_powertune.h => smumgr/tonga_smc.h} (53%) _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel