Hi Dave,

First feature pull for 4.15. Highlights: - Per VM BO support - Lots of powerplay cleanups - Powerplay support for CI - pasid mgr for kfd - interrupt infrastructure for recoverable page faults - SR-IOV fixes - initial GPU reset for vega10 - prime mmap support - ttm page table debugging improvements - lots of bug fixes

The following changes since commit 7846b12fe0b5feab5446d892f41b5140c1419109:

Merge branch 'drm-vmwgfx-next' of git://people.freedesktop.org/~syeh/repos_linux into drm-next (2017-08-29 10:38:14 +1000)

are available in the git repository at:

git://people.freedesktop.org/~agd5f/linux drm-next-4.15

for you to fetch changes up to 6f87a895709eecc1542fe947e349364ad061ac00:

drm/amdgpu: clarify license in amdgpu_trace_points.c (2017-09-26 15:14:37 -0400)

---------------------------------------------------------------- Alex Deucher (14): drm/amdgpu/gfx8: fix spelling typo in mqd allocation drm/amdgpu: add automatic per asic settings for gart_size drm/amdgpu: refine default gart size drm/amdgpu: move default gart size setting into gmc modules drm/amdgpu: set sched_hw_submission higher for KIQ (v3) drm/amdgpu/powerplay/vega10: fix typo in register base index drm/amdgpu/gfx8: apply dynamic cu mask to APUs as well drm/amdgpu/gfx8: drop cz mqd drm/amdgpu/gfx9: update mqd to include dynamic CU mask drm/amdgpu/gfx9: adjust mqd allocation size drm/amd/powerplay: fix sclk setting for profile mode for CZ/ST drm/amdgpu/gfx9: properly set the hdp flush reg for Raven drm/amdgpu/psp: declare raven psp firmware drm/amdgpu: clarify license in amdgpu_trace_points.c

Allen Pais (1): drivers:gpu:Use ARRAY_SIZE() for the size calculation of the array.

Arnd Bergmann (1): drm/radeon: properly initialize r600_audio_status() data

Bas Nieuwenhuizen (1): drm/amdgpu: Account for shadow PTs in mapping update IB size.

Christian König (45): drm/amdgpu: fix and cleanup shadow handling drm/amdgpu: discard commands of killed processes drm/amdgpu: remove the GART copy hack drm/amdgpu: fix amdgpu_ttm_bind drm/amdgpu: inline amdgpu_ttm_do_bind again drm/amdgpu: fix amdgpu_vm_bo_map trace point drm/amdgpu: fix and cleanup VM ready check drm/amdgpu: cleanup GWS, GDS and OA allocation drm/amdgpu: rework moved handling in the VM v2 drm/amdgpu: add bo_va cleared flag again v2 drm/amdgpu: fix comment on amdgpu_bo_va drm/amdgpu: track evicted page tables v2 drm/amdgpu: rework page directory filling v2 drm/amdgpu: cleanup the VM code a bit more drm/amdgpu: move hw generation check into amdgpu_doorbell_init v2 drm/amdgpu: fix new PD update code for Vega10 v2 drm/amdgpu: restrict userptr even more drm/amdgpu: add support for per VM BOs v2 drm/amdgpu: add IOCTL interface for per VM BOs v3 drm/amdgpu: bump version for support of local BOs drm/amdgpu: fix moved list handling in the VM drm/amdgpu: fix placement flags in amdgpu_ttm_bind drm/amdgpu: fix userptr put_page handling drm/amdgpu: revert "fix deadlock of reservation between cs and gpu reset v2" drm/ttm: fix ttm_bo_cleanup_refs_or_queue once more drm/amdgpu: move taking mmap_sem into get_user_pages v2 drm/amdgpu: stop using BO status for user pages drm/amdgpu: move userptr BOs to CPU domain during CS v2 drm/amdgpu: use a rw_semaphore for MMU notifiers drm/amdgpu: stop reserving the BO in the MMU callback v3 drm/ttm: allow mapping BOs while they are still on the swap list drm/amdgpu: move amdgpu_cs_sysvm_access_required into find_mapping drm/amdgpu: rework amdgpu_cs_find_mapping drm/amdgpu: keep the MMU lock until the update ends v4 drm/amdgpu: move amdgpu_ttm_tt_* declarations into amdgpu_ttm.h drm/amdgpu: move MMU notifier related defines to amdgpu_mn.h drm/amdgpu: fix VM sync with always valid BOs v2 drm/amdgpu: fix amdgpu_vm_handle_moved as well v2 drm/amdgpu: fix cgs alignment handling drm/amd: remove min/max addr handling from cgs drm/amdgpu: fix and cleanup amdgpu_bo_create v2 drm/ttm: fix memory leak while individualizing BOs drm/ttm: cleanup ttm_page_alloc_dma.c drm/amdgpu: use 2MB fragment size for GFX6,7 and 8 drm/amdgpu: simplify pinning into visible VRAM

Christophe JAILLET (1): drm/amdgpu: check memory allocation failure

Colin Ian King (1): drm/amdgpu: remove duplicate return statement

Emily Deng (1): drm/amdgpu/virtual_dce: Virtual display doesn't support disable vblank immediately

Eric Huang (4): drm/amdgpu: add cgs query info of pci bus devfn drm/amd/powerplay: add register thermal interrupt in hwmgr_hw_init drm/amd/powerplay: implement register thermal interrupt for Vega10 drm/amd/powerplay: change alert temperature range

Evan Quan (11): drm/amd/powerplay: unhalt mec after loading drm/amd/powerplay: ACG frequency added in PPTable drm/amdgpu: support polaris10/11/12 new cp firmwares drm/amdgpu: declare the new firmware files needed by polaris asics drm/amdgpu: fixed raven psp cmd prepare and submit drm/amdgpu: added api for stopping psp ring (v2) drm/amdgpu: stop psp ring on suspend drm/amdgpu: enable raven to load firmwares by psp at default (v2) drm/amd/amgpu: update raven sdma golden setting drm/amd/amgpu: update vega10 sdma golden setting drm/amd/amdgpu: add vega10/raven mmhub/athub golden settings

Felix Kuehling (9): drm/amdgpu: Fix huge page updates with CPU drm/amdgpu: Fix error handling in amdgpu_vm_init drm/amdgpu: Add PASID management drm/radeon: Add PASID manager for KFD drm/amdkfd: Separate doorbell allocation from PASID drm/amdkfd: Use PASID manager from KGD drm/amdgpu: Add prescreening stage in IH processing (v2) drm/amd: Closed hash table with low overhead (v2) drm/amdgpu: Track pending retry faults in IH and VM (v2)

Harry Wentland (1): drm/amd/include: Add hdmi_redriver_set to atomfirmware

Himanshu Jha (3): drm/amd: Remove null check before kfree drm/amd/powerplay/hwmgr: Remove null check before kfree drm/amd/powerplay: remove unnecessary call to memset

Horace Chen (1): drm/amdgpu/sriov:increate mailbox polling timeout

Ken Wang (1): drm/amdgpu: Add GPU reset functionality for Vega10

Kent Russell (2): drm/amdgpu: Add debugfs file for VBIOS and version drm/amdgpu: Move VBIOS version to sysfs

Leo Liu (1): drm/amdgpu: remove the clearance of vce 4.0 interrupt mask

Michel Dänzer (2): amdgpu: Only destroy fbdev framebuffer if it was initialized radeon: Only destroy fbdev framebuffer if it was initialized

Monk Liu (19): drm/ttm: fix missing inc bo_count drm/ttm:fix wrong decoding of bo_count drm/amdgpu: fix wait_any_fence drm/amdgpu/sriov:fix missing error handling drm/amdgpu:no kiq in IH drm/amdgpu/sriov:move in_reset to adev and rename drm/amdgpu/sriov:don't load psp fw during gpu reset drm/amdgpu:insert TMZ_BEGIN drm/amdgpu:hdp flush should be put it initialized drm/amdgpu:use formal register to trigger hdp invalidate drm/amdgpu/sriov:fix page fault issue of driver unload drm/amdgpu/sriov:init csb for gfxv9 drm/amdgpu:make ctx_add_fence interruptible(v2) drm/amdgpu/sriov:fix memory leak after gpu reset drm/amdgpu:halt when vm fault drm/amdgpu:unmap KCQ in gfx hw_fini(v2) drm/amdgpu/sriov:alloc KIQ MQD in VRAM(v2) drm/amdgpu:fix uvd ring fini routine(v2) drm/amdgpu:fix firmware memoryleak(v2)

Rex Zhu (44): drm/amd/powerplay: refine pp code for raven drm/amd/powerplay: add dummy pp table for raven. (v2) drm/amd/powerplay: notify smu once display changed on Rv. drm/amd/powerplay: delete eventmgr layer in poweprlay drm/amd/powerplay: delete eventmgr related files. drm/amd/powerplay: add UMD P-state in powerplay. drm/amd/powerplay: set uvd/vce/nb/mclk level as UMD P-state required drm/amd/powerplay: refine code for thermal control in powerplay drm/amd/powerplay: refine powerplay code for CZ/ST drm/amd/powerplay: refine powerplay code for RV drm/amd/powerplay: delete dead code in powerplay drm/amdgpu: rename amdgpu_dpm_funcs to amd_pm_funcs drm/amd/powerplay: use struct amd_pm_funcs in powerplay drm/amdgpu: unify the interface of amd_pm_funcs drm/amdgpu: add support for request SI/CI firmware in CGS drm/amd/powerplay: fix spelling typo in function name drm/amd/powerplay: fix pcie max lane define error drm/amd/powerplay: add CI asics support to smumgr (v3) drm/amd/powerplay: fix set target TDP error on tonga/iceland drm/amd/powerplay: refine dmesg info under powerplay drm/amd/powerplay: Add support functions for CI to ppatomctrl.c drm/amd/powerplay: Add support for CI asics to hwmgr drm/amdgpu: add powerplay support for CI asics drm/amd/powerplay: Simplify smu7_voting_clients() drm/amdgpu: fix checkpatch.pl warning to amdgpu_drv.c drm/amd/powerplay: refine phm_register_thermal_interrupt interface drm/amd/powerplay: refine interface in struct pp_smumgr_func drm/amd/powerplay: delete dead code in hwmgr.h drm/amd/powerplay: refine powerplay code. drm/amd/powerplay: use SMU_IND_INDEX/DATA_11 pair drm/amd/powerplay: add new helper functions in hwmgr.h drm/amd/powerplay: move SMUM_WAIT_INDIRECT_FIELD_UNEQUAL to hwmgr.h drm/amd/powerplay: move SMUM_WAIT_VFPF_INDIRECT_FIELD_UNEQUAL to hwmgr.h drm/amd/powerplay: move PHM_WAIT_VFPF_INDIRECT_FIELD to hwmgr.h drm/amd/powerplay: move macros to hwmgr.h drm/amd/powerplay: delete SMU_WRITE_INDIRECT_FIELD drm/amd/powerplay: delete SMUM_WRITE_FIELD drm/amd/powerplay: delete SMUM_WRITE_VFPF_INDIRECT_FIELD drm/amd/powerplay: delete SMUM_READ_VFPF_INDIRECT_FIELD drm/amd/powerplay: delete SMUM_SET_FIELD drm/amd/powerplay: delete SMUM_READ_FIELD drm/amd/powerplay: delete SMUM_WAIT_INDIRECT_FIELD drm/amd/powerplay: delete SMUM_FIELD_MASK drm/amd/powerplay: delete dead code in smumgr

Roger He (2): drm/amd/amdgpu: fix BANK_SELECT on Vega10 (v2) drm/amdgpu: handle all fragment sizes v4

Samuel Li (1): drm/amdgpu: Add gem_prime_mmap support

Thierry Reding (2): drm/amdgpu: Use correct path to trace include drm/radeon: Use correct path to trace include

Tom St Denis (58): drm/ttm: Add DMA map/unmap tracepoint (v3) drm/amd/amdgpu: Remove AMDGPU tracepoint and use new TTM tracepoint (v2) drm/ttm: Add helper functions to populate/map in one call (v2) drm/amd/amdgpu: Use new TTM populate/map helper function drm/radeon: use new TTM populate/dma map helper functions drm/ttm: Remove needless 'extern' on functions in header. drm/amd/amdgpu: Add write() method to VRAM debugfs entry (v2) drm/amd/amdgpu: Tidy up register list formatting. drm/amd/amdgpu: Tidy up gfx_v9_0_ngg_en() drm/amd/amdgpu: Tidy up gfx_v9_0_enable_save_restore_machine() drm/amd/amdgpu: Tidy up gfx_v9_0_enable_sck_slow_down_on_power_up() drm/amd/amdgpu: Tidy up gfx_v9_0_enable_sck_slow_down_on_power_down() drm/amd/amdgpu: Tidy up gfx_v9_0_enable_cp_power_gating() drm/amd/amdgpu: Tidy up gfx_v9_0_enable_gfx_cg_power_gating() drm/amd/amdgpu: Tidy up gfx_v9_0_enable_gfx_pipeline_powergating() drm/amd/amdgpu: Tidy up gfx_v9_0_enable_gfx_static_mg_power_gating() drm/amd/amdgpu: Tidy up gfx_v9_0_enable_gfx_dynamic_mg_power_gating() drm/amd/amdgpu: Tidy up gfx_v9_0_rlc_stop() drm/amd/amdgpu: Fix indentation in gfx_v9_0_mqd_init() drm/amd/amdgpu: Simplify gfx_v9_0_wait_for_idle() drm/amd/amdgpu: Support full range of GFX ring names drm/amd/amdgpu: Simplify gmc_v9_0_vm_fault_interrupt_state() drm/amd/amdgpu: Tidy up gmc_v9_0_gart_enable() drm/amd/amdgpu: Tidy up gmc_v9_0_hw_init() drm/amd/amdgpu: Cleanup gmc_v9_0_suspend() drm/ttm: Fix trace include path (v2) drm/ttm: Fix configuration error around populate_and_map() functions drm/amd/powerplay: Fix psm_set_user_performance_state() drm/amd/powerplay: Simplify vega10_patch_voltage_dependency_tables_with_lookup_table() drm/amd/powerplay: Simplify vega10_acg_disable() drm/amd/powerplay: Introduction of bitmask macros for registers drm/amd/powerplay: Port vega10_didt_set_mask() to new macros drm/amd/powerplay: Add PP_CAP() macro drm/amd/powerplay: Port vega10_hwmgr.c over to PP_CAP drm/amd/powerplay: Port vega10_powertune.c over to PP_CAP drm/amd/powerplay: Port vega10_thermal.c over to PP_CAP drm/amd/powerplay: Tidy up vega10_fan_ctrl_get_fan_speed_rpm() drm/amd/powerplay: Tidy up vega10_fan_ctrl_set_static_mode() drm/amd/powerplay: Tidy up vega10_fan_ctrl_set_default_mode() drm/amd/powerplay: Tidy up vega10_fan_ctrl_set_fan_speed_percent() drm/amd/powerplay: Fix indentation in vega10_fan_ctrl_reset_fan_speed_to_default() drm/amd/powerplay: Tidy up vega10_fan_ctrl_set_fan_speed_rpm() drm/amd/powerplay: Tidy up vega10_thermal_set_temperature_range() drm/amd/powerplay: Tidy up vega10_thermal_initialize() drm/amd/powerplay: Tidy up smu7_fan_ctrl_get_fan_speed_info() drm/amd/powerplay: Tidy up smu7_fan_ctrl_get_fan_speed_rpm() drm/amd/powerplay: Make use of PP_CAP in smu7_thermal.c drm/amd/powerplay: Remove unneeded return from pp_smu7_thermal_fini() drm/amd/powerplay: Make use of PP_CAP in smu7_powertune.c drm/amd/powerplay: Tidy up smu7_enable_didt() drm/amd/powerplay: lock grbm_gfx index when changing instance drm/amd/amdgpu: Change vram debugfs to NO_KIQ for VM environments drm/amd/amdgpu: Support VM environments in amdgpu_ttm_access_memory() drm/amd/amdgpu: Fold TTM debugfs entries into array (v2) drm/amd/amdgpu: add support for iova_to_phys to replace TTM trace (v5) drm/amd/amdgpu: remove usage of ttm trace drm/ttm: Remove TTM dma tracepoint since it's not required anymore drm/amd/amdgpu: Partial revert of iova debugfs

Xiangliang.Yu (3): drm/amdgpu/sdma3: Enable sdma wptr polling for SRIOV drm/amdgpu/sdma3: set wptr shadow atomically drm/amdgpu: Fix driver reloading failure

Yong Zhao (3): drm/amdgpu: Correct bytes limit for SDMA 3.0 copy and fill drm/amdgpu: Fix a bug in amdgpu_fill_buffer() drm/amdgpu: Add copy_pte_num_dw member in amdgpu_vm_pte_funcs

drivers/gpu/drm/Kconfig | 3 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/amd/amdgpu/Makefile | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 82 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 130 +- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 194 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 97 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 165 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 24 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 12 - drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 121 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 82 + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 12 + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 112 +- .../eventmgr/psm.h => amdgpu/amdgpu_mn.h} | 42 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 128 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 246 +- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 37 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 56 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 58 +- drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | 19 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 346 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 24 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 70 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 20 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 644 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 53 +- drivers/gpu/drm/amd/amdgpu/atom.c | 5 +- drivers/gpu/drm/amd/amdgpu/atom.h | 1 + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 108 +- drivers/gpu/drm/amd/amdgpu/cik_dpm.h | 3 +- drivers/gpu/drm/amd/amdgpu/cik_ih.c | 14 + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 14 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 162 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 358 ++- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 11 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 23 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 26 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 25 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 120 +- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 14 + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 61 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 16 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 2 +- drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 40 +- drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 4 + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 49 +- drivers/gpu/drm/amd/amdgpu/psp_v3_1.h | 3 + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 5 + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 31 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 16 +- drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 77 +- drivers/gpu/drm/amd/amdgpu/si_dpm.h | 1 + drivers/gpu/drm/amd/amdgpu/si_ih.c | 14 + drivers/gpu/drm/amd/amdgpu/soc15.c | 27 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 14 + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 4 - drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 94 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 - drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 50 +- drivers/gpu/drm/amd/amdkfd/kfd_module.c | 6 - drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 90 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 10 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 6 + drivers/gpu/drm/amd/include/amd_shared.h | 66 + .../amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h | 2 + drivers/gpu/drm/amd/include/atomfirmware.h | 19 +- drivers/gpu/drm/amd/include/cgs_common.h | 24 +- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 6 + drivers/gpu/drm/amd/include/linux/chash.h | 366 +++ drivers/gpu/drm/amd/include/v9_structs.h | 12 +- drivers/gpu/drm/amd/include/vi_structs.h | 263 +- drivers/gpu/drm/amd/lib/Kconfig | 27 + drivers/gpu/drm/amd/lib/Makefile | 11 + drivers/gpu/drm/amd/lib/chash.c | 638 +++++ drivers/gpu/drm/amd/powerplay/Makefile | 5 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 269 +- drivers/gpu/drm/amd/powerplay/eventmgr/Makefile | 11 - .../drm/amd/powerplay/eventmgr/eventactionchains.c | 291 --- .../drm/amd/powerplay/eventmgr/eventactionchains.h | 62 - drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c | 195 -- .../drm/amd/powerplay/eventmgr/eventmanagement.c | 215 -- .../drm/amd/powerplay/eventmgr/eventmanagement.h | 59 - drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c | 104 - .../drm/amd/powerplay/eventmgr/eventsubchains.c | 410 --- .../drm/amd/powerplay/eventmgr/eventsubchains.h | 100 - .../gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 445 ---- .../gpu/drm/amd/powerplay/eventmgr/eventtasks.h | 89 - drivers/gpu/drm/amd/powerplay/eventmgr/psm.c | 119 - drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 5 +- .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 46 +- .../drm/amd/powerplay/hwmgr/cz_clockpowergating.h | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 559 ++-- .../gpu/drm/amd/powerplay/hwmgr/functiontables.c | 161 -- .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 151 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 418 ++- drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 246 ++ .../{eventmgr/eventinit.h => hwmgr/pp_psm.h} | 24 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 88 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h | 8 +- .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 20 - .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 157 +- drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 378 +-- drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h | 4 +- .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 66 +- .../amd/powerplay/hwmgr/smu7_clockpowergating.h | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 436 ++-- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 9 +- .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 110 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 183 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h | 5 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 452 ++-- .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 125 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 277 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h | 13 +- drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 143 +- drivers/gpu/drm/amd/powerplay/inc/eventmanager.h | 109 - drivers/gpu/drm/amd/powerplay/inc/eventmgr.h | 124 - .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 6 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 194 +- drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 4 - drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h | 6 +- drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 206 +- drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c | 2753 ++++++++++++++++++++ drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.h | 52 + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 86 + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.h | 78 + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 308 ++- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 120 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 130 +- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 120 +- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 76 +- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h | 2 +- .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 152 +- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 126 +- drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 130 +- drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.h | 8 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 218 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 36 +- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 261 +- drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 144 +- drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.h | 2 +- .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 64 +- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 194 +- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h | 16 +- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 23 +- drivers/gpu/drm/radeon/Makefile | 2 - drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- drivers/gpu/drm/radeon/radeon_fb.c | 4 +- drivers/gpu/drm/radeon/radeon_kfd.c | 31 + drivers/gpu/drm/radeon/radeon_trace.h | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 33 +- drivers/gpu/drm/ttm/ttm_bo.c | 38 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +- drivers/gpu/drm/ttm/ttm_page_alloc.c | 43 + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 42 +- include/drm/ttm/ttm_debug.h | 31 + include/drm/ttm/ttm_page_alloc.h | 33 +- include/uapi/drm/amdgpu_drm.h | 2 + 181 files changed, 10030 insertions(+), 8323 deletions(-) rename drivers/gpu/drm/amd/{powerplay/eventmgr/psm.h => amdgpu/amdgpu_mn.h} (56%) create mode 100644 drivers/gpu/drm/amd/include/linux/chash.h create mode 100644 drivers/gpu/drm/amd/lib/Kconfig create mode 100644 drivers/gpu/drm/amd/lib/Makefile create mode 100644 drivers/gpu/drm/amd/lib/chash.c delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/Makefile delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.h delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.c delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.h delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/psm.c delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c rename drivers/gpu/drm/amd/powerplay/{eventmgr/eventinit.h => hwmgr/pp_psm.h} (65%) delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/eventmanager.h delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/eventmgr.h create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.h create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.h create mode 100644 include/drm/ttm/ttm_debug.h