Hi Dave, More stuff for 4.16: - Further radeon cleanup after dropping kfd support - Fix S3 on raven - Further GPU reset clean ups and fixes - Move the amd gpu scheduler into common code so it can be shared with other drivers, notably etnaviv - Various ttm fixes - Support for 2+1 level GPU page tables - Support profiling clocks interface for RV - Rework soc15 IP block offset handling - More DC cleanup - DCN fixes for RV - Various clean ups and bug fixes The following changes since commit 9c606cd4117a3c45e04a6616b1a0dbeb18eeee62: Merge branch 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux into drm-next (2017-12-07 06:28:22 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-4.16 for you to fetch changes up to 4f4b94ee616500f326650f5b25439f1f7d606ea7: drm/amdgpu: fix test for shadow page tables (2017-12-20 16:02:48 -0500) ---------------------------------------------------------------- Alex Deucher (30): drm/amdgpu: add license to Makefiles drm/amdgpu: add license to files where it was missing drm/scheduler: add license to the Makefile drm/amdgpu: make function names consistent in nbio files drm/amdgpu: convert nbio to use callbacks (v2) drm/amdgpu: drop the bios scratch reg callbacks from nbio drm/amdgpu: drop soc15_init_golden_registers drm/amdgpu: remove some old gc 9.x registers drm/amdgpu: drop scratch regs save and restore from S3/S4 handling drm/amdgpu: drop scratch regs save and restore from GPU reset handling drm/amdgpu: drop amdgpu_atombios_scratch_regs_save/restore drm/amdgpu: setup the shared and private apertures on gfx9 drm/amdgpu: move atom functions from amdgpu_device.c drm/amdgpu: use consistent naming for static funcs in amdgpu_device.c drm/amdgpu: rename amdgpu_suspend to amdgpu_device_ip_suspend drm/amdgpu: move debugfs functions to their own file drm/amdgpu: rename amdgpu_wb_* functions drm/amdgpu: rename amdgpu_program_register_sequence drm/amdgpu: rename amdgpu_pci_config_reset drm/amdgpu: move amdgpu_doorbell_get_kfd_info to amdgpu_amdkfd.c drm/amdgpu: rename amdgpu_*_location functions drm/amdgpu: move fw_reserve functions to amdgpu_ttm.c drm/amdgpu: rename ip block helper functions drm/amdgpu: rename amdgpu_need_post drm/amdgpu: move dummy page functions to amdgpu_gart.c drm/amdgpu: rename amdgpu_gpu_recover drm/amdgpu: move amdgpu_need_backup to amdgpu_object.c drm/amdgpu: rename amdgpu_get_pcie_info drm/amdgpu: only check mmBIF_IOV_FUNC_IDENTIFIER on tonga/fiji drm/amdgpu: use defines for mmBIF_IOV_FUNC_IDENTIFIER fields Andrew Jiang (4): drm/amd/display: Change optimized_required logic drm/amd/display: Add dcc_change surface update flag drm/amd/display: Refine update flags usage in update_dchubp_dpp drm/amd/display: dal 3.1.27 Andrey Grodzovsky (4): drm/amdgpu: Fix amdgpu_sync_add_later to preserve explicit flag. drm/amdgpu: Add gpu_recovery parameter drm/amdgpu: Simplify amdgpu_lockup_timeout usage. Revert "drm/amd/amdgpu: set gtt size according to system memory size only" Anthony Koo (1): drm/amd/display: Fix check for whether dmcu fw is running Charlene Liu (2): drm/amd/display: fix seq issue: turn on clock before programming afmt. drm/amd/display: try to find matching audio inst for enc inst first Christian König (15): drm/amdgpu: cleanup debugfs handling a bit drm/amdgpu: add amdgpu_evict_vram debugfs file drm/amdgpu: stop joining PDEs drm/amdgpu: update one PDE at a time v2 drm/amdgpu: avoid the modulo in amdgpu_vm_get_entry drm/amdgpu: remove last_entry_used from the VM code drm/amdgpu: remove keeping the addr of the VM PDs drm/amdgpu: batch PDE updates again drm/amdgpu: allow get_vm_pde to change flags as well drm/ttm: use try_lock in ttm_bo_delayed_delete again drm/ttm: cleanup some more resv->lock uses drm/ttm: cleanup some old defines drm/amdgpu: implement 2+1 PD support for Raven v3 MAINTAINERS: add separate entry for DRM TTM v2 drm/amdgpu: fix test for shadow page tables Chunming Zhou (2): drm/amdgpu: fix huge page setting for ATS case drm/amdgpu: add enumerate for PDB/PTB v3 Colin Ian King (1): drm/amd/display: remove redundant null check of array 'data' Dmytro Laktyushkin (8): drm/amd/display: set chroma taps to 1 when not scaling drm/amd/display: Add dppclk to dcn_bw_clocks drm/amd/display: add assert to verify dcn_calc input validity drm/amd/display: use clamping rather than truncation for CM fp conversions drm/amd/display: clean up dcn soc params drm/amd/display: fix rotated surface scaling drm/amd/display: fix global sync param retrieval when not pipe splitting drm/amd/display: fix 180 full screen pipe split Eric Bernstein (11): drm/amd/display: Integrating MPC pseudocode drm/amd/display: MPC updates drm/amd/display: Reset MPCC muxes during init drm/amd/display: OPP DPG test pattern drm/amd/display: use REG_UPDATE for MPC mux drm/amd/display: Move OPP mpc tree initialization to hw_init drm/amd/display: Update HUBP drm/amd/display: Remove dwbc from pipe_ctx drm/amd/display: Clean up DCN cursor code drm/amd/display: Put dcn_mi_registers with other structs drm/amd/display: Update FMT and OPPBUF functions Eric Murphy-Zaremba (1): drm/amd/display: Add is_tiling_rotated flag to plane_state Eric Yang (3): drm/amd/display: fix missing pixel clock adjustment for dongle drm/amd/display: dal 3.1.26 drm/amd/display: reprogram surface config on scaling change Frank Min (1): drm/amdgpu: correct vce fw data and stack size Harry Wentland (18): drm/amd/display: Remove PSR functions in Linux drm/amd/display: Remove plane_res.mi check in dce110_apply_ctx_for_surface drm/amd/display: Remove redundant checks in set_default_colors drm/amd/display: Fix potential mem leak in DC construct drm/amd/display: Add optimized_required flag drm/amd/display: Fix access of wrong array element TF format conversion drm/amd/display: Clean up os_types.h a bit drm/amd/display: Use macro for isnan check drm/amd/display: Add disclaimer to BW and DML code provided by HW drm/amd/display: Print DC_VER at DC init drm/amd/display: Remove redundant NULL check in DCE11 HWSS drm/amd/display: Remove grph_object_id.c and move function to bios_parser drm/amd/display: Add TODO item to remove vector.c drm/amd/display: Print type if we get wrong ObjectID from bios drm/amd/display: Remove dead enable_plane function definition and call drm/amd/display: Error print when ATOM BIOS implementation is missing drm/amd/display: Don't spam debug log on long reg waits drm/amd/display: Call validate_fbc should_enable_fbc Hugo Hu (1): drm/amd/display: Use the maximum link setting which EDP reported. Jerry (Fangzhi) Zuo (1): drm/amd/display: Fix rehook MST display not light back on Jim Qu (2): drm/amdgpu: always cancel uvd idle handler in uvd suspend drm/amdgpu: restore uvd fence seq in uvd resume Leo (Sunpeng) Li (2): drm/amd/display: Do DC mode-change check after stream creation drm/amd/display: Fix unused variable warnings. Lucas Stach (2): drm: move amd_gpu_scheduler into common location drm/sched: move fence slab handling to module init/exit Michel Dänzer (5): Revert "drm/radeon: adding synchronization for GRBM GFX" Revert "drm/radeon: Report doorbell configuration to amdkfd" Revert "drm/radeon/cik: Don't touch int of pipes 1-7" Revert "drm/radeon: reduce number of free VMIDs and pipes in KV" drm/radeon: Remove KFD_CIK_SDMA_QUEUE_OFFSET Monk Liu (5): drm/ttm: fix incorrect calculate on shrink_pages drm/ttm: max_cpages is in unit of native page drm/amdgpu: no need to evict VRAM in device_fini drm/amdgpu: no need with INT for fence polling drm/amdgpu: fix MAP_QUEUES paramter Pixel Ding (1): drm/amdgpu: use polling mem to set SDMA3 wptr for VF Rex Zhu (10): drm/amd/pp: implement dpm_get_sclk/mclk for RV drm/amd/pp: reset dpm level when adjust power state drm/amd/pp: delete dead code of arbiter overdriver clk drm/amd/pp: implement phm_reset_power_profile_state drm/amd/pp: delete repeated call of force_dpm_level drm/amd/pp: export more smu message on Rv drm/amd/pp: Move smu_version to common code drm/amd/pp: update smu_version value for CI/VI drm/amd/pp: Get and save Rv smu version drm/amd/pp: Implement force_dpm_level on Rv Roger He (5): drm/ttm: init locked again to prevent incorrect unlock drm/ttm: add allow_reserved_eviction and resv into ttm_operation_ctx drm/amdgpu: set allow_reserved_eviction and resv when bo allocation and cs drm/ttm: enable eviction for Per-VM-BO drm/ttm: use an ttm operation ctx for ttm_bo_move_xxx Shaoyun Liu (5): drm/amdgpu: Dynamic initialize IP base offset drm/amdgpu: Use dynamic IP offset for register access on SOC15 drm/amdgpu: Avoid use SOC15_REG_OFFSET in static const array drm/amdgpu: Change SOC15_REG_OFFSET to use dynamic register offset drm/admgpu: Reduce the usage of soc15ip.h Tony Cheng (7): drm/amd/display: dal 3.1.21 drm/amd/display: dal 3.1.22 drm/amd/display: dal 3.1.23 drm/amd/display: Set mpcc_disconnect_pending during MPC reset drm/amd/display: dal 3.1.24 drm/amd/display: really fix time out in init sequence drm/amd/display: dal 3.1.25 Vitaly Prosyak (5): drm/amd/display: Build unity lut for shaper drm/amd/display: Move unity TF type to predefined types drm/amd/display: Correct fixed point calculation. drm/amd/display: Define BLNDGAM_CONFIG_STATUS drm/amd/display: Declare and share color space types for dcn's Yongqiang Sun (10): drm/amd/display: Remove unnecessary wait mpcc idle. drm/amd/display: Fixed read wrong reg to get bot_sel. drm/amd/display: Use same wait mpcc idle function. drm/amd/display: Implement work around for optc underflow. drm/amd/display: Disable plane right after disconnected drm/amd/display: fix recout_skip calculation when rotating 180 or 270 drm/amd/display: Program cursor regs after context swapped. drm/amd/display: Cache cursor position. drm/amd/display: Move wait for hpd ready out from edp power control. drm/amd/display: Add hdr_supported flag Yue Hin Lau (9): drm/amd/display: CNVC pseudocode review follow up drm/amd/display: dpp clean up drm/amd/display: OPTC cleanup/implementation drm/amd/display: remove format_control from set_cursor_attributes drm/amd/display: integrating optc pseudocode drm/amd/display: hubp refactor drm/amd/display: Only blank DCN when we have set_blank implementation drm/amd/display: check for null before calling is_blanked drm/amd/display: Expose dpp1_set_cursor_attributes MAINTAINERS | 9 + drivers/gpu/drm/Kconfig | 5 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/amd/acp/Makefile | 21 + drivers/gpu/drm/amd/amdgpu/Makefile | 31 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 197 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 33 + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 258 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 38 +- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 792 +++++++++++ .../grph_object_id.c => amdgpu/amdgpu_debugfs.h} | 73 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1498 +++----------------- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 49 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 19 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 20 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 30 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 20 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 24 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 122 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 32 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 24 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 398 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 27 +- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 8 +- drivers/gpu/drm/amd/amdgpu/cik.c | 212 +-- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 10 +- drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h | 8 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 24 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 30 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 136 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 269 ++-- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 43 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 22 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 64 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 90 +- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 8 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 50 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 5 +- drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 52 +- drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 117 +- drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h | 26 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 151 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h | 22 +- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 10 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 22 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 97 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 258 ++-- drivers/gpu/drm/amd/amdgpu/si.c | 156 +- drivers/gpu/drm/amd/amdgpu/si_dma.c | 10 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 252 ++-- drivers/gpu/drm/amd/amdgpu/soc15.h | 20 + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 62 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 48 +- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 42 +- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 13 +- drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 56 + drivers/gpu/drm/amd/amdgpu/vi.c | 186 +-- drivers/gpu/drm/amd/amdkfd/Makefile | 22 +- drivers/gpu/drm/amd/display/Makefile | 21 + drivers/gpu/drm/amd/display/TODO | 3 + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 21 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 35 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 51 + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 1 + drivers/gpu/drm/amd/display/dc/Makefile | 21 + drivers/gpu/drm/amd/display/dc/basics/Makefile | 23 +- drivers/gpu/drm/amd/display/dc/basics/conversion.c | 2 +- drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 28 + drivers/gpu/drm/amd/display/dc/bios/Makefile | 21 + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 60 +- .../gpu/drm/amd/display/dc/bios/command_table.c | 21 + .../gpu/drm/amd/display/dc/bios/command_table2.c | 13 + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 21 + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 9 + .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.c | 17 +- .../gpu/drm/amd/display/dc/calcs/dcn_calc_math.c | 27 +- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 70 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 51 +- drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 22 + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 145 ++ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 183 +-- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 6 + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 11 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 101 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 +- drivers/gpu/drm/amd/display/dc/dc.h | 9 +- drivers/gpu/drm/amd/display/dc/dc_helper.c | 22 + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 2 - drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + drivers/gpu/drm/amd/display/dc/dce/Makefile | 21 + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 18 +- drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 8 +- drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 4 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 34 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 3 + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 3 +- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 15 - drivers/gpu/drm/amd/display/dc/dce100/Makefile | 21 + .../drm/amd/display/dc/dce100/dce100_resource.c | 2 +- .../drm/amd/display/dc/dce100/dce100_resource.h | 23 + drivers/gpu/drm/amd/display/dc/dce110/Makefile | 21 + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 90 +- .../amd/display/dc/dce110/dce110_hw_sequencer.h | 4 + .../drm/amd/display/dc/dce110/dce110_resource.c | 2 +- .../display/dc/dce110/dce110_timing_generator_v.c | 23 + drivers/gpu/drm/amd/display/dc/dce112/Makefile | 21 + drivers/gpu/drm/amd/display/dc/dce120/Makefile | 23 +- drivers/gpu/drm/amd/display/dc/dce80/Makefile | 21 + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 23 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 294 +++- .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 10 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 19 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 493 +++---- .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 67 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 91 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 224 +-- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 568 ++------ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 532 ++++--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 91 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 74 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.h | 43 +- .../{dcn10_timing_generator.c => dcn10_optc.c} | 353 +++-- .../{dcn10_timing_generator.h => dcn10_optc.h} | 117 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 13 +- drivers/gpu/drm/amd/display/dc/dml/Makefile | 21 + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 29 - .../drm/amd/display/dc/dml/display_mode_structs.h | 4 - .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 9 + .../drm/amd/display/dc/dml/display_rq_dlg_calc.c | 9 + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 9 + .../gpu/drm/amd/display/dc/dml/soc_bounding_box.c | 10 + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 21 + drivers/gpu/drm/amd/display/dc/i2caux/Makefile | 21 + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 6 +- drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 4 +- drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 4 +- drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 14 + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 63 +- .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 22 + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 159 ++- drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 39 +- .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 22 + .../drm/amd/display/dc/inc/hw/timing_generator.h | 60 +- drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 11 +- drivers/gpu/drm/amd/display/dc/irq/Makefile | 21 + drivers/gpu/drm/amd/display/dc/os_types.h | 14 +- drivers/gpu/drm/amd/display/dc/virtual/Makefile | 21 + drivers/gpu/drm/amd/display/include/fixed31_32.h | 7 + .../gpu/drm/amd/display/include/grph_object_id.h | 4 - .../gpu/drm/amd/display/modules/freesync/Makefile | 21 + .../drm/amd/include/asic_reg/gc/gc_9_0_default.h | 7 - .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 14 - .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 45 - .../drm/amd/include/asic_reg/gc/gc_9_1_offset.h | 14 - drivers/gpu/drm/amd/lib/Makefile | 21 + drivers/gpu/drm/amd/powerplay/Makefile | 22 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 10 +- drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 22 +- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 29 +- .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 33 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 1 + .../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c | 24 +- drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 4 + drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 182 ++- drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h | 15 + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 35 - drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 48 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 1 - .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 1 + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 35 +- drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h | 7 +- drivers/gpu/drm/amd/powerplay/inc/smu72.h | 24 +- drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h | 24 +- drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 22 +- drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 6 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 5 +- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 7 +- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 5 +- drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 8 + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 2 +- .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 5 +- drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 60 - drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 186 --- drivers/gpu/drm/nouveau/nouveau_bo.c | 7 +- drivers/gpu/drm/qxl/qxl_ttm.c | 3 +- drivers/gpu/drm/radeon/cik.c | 114 +- drivers/gpu/drm/radeon/cik_reg.h | 2 - drivers/gpu/drm/radeon/radeon.h | 6 - drivers/gpu/drm/radeon/radeon_device.c | 32 - drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- drivers/gpu/drm/scheduler/Makefile | 26 + .../gpu/drm/{amd => }/scheduler/gpu_scheduler.c | 296 ++-- drivers/gpu/drm/{amd => }/scheduler/sched_fence.c | 122 +- drivers/gpu/drm/ttm/ttm_bo.c | 55 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 10 +- drivers/gpu/drm/ttm/ttm_page_alloc.c | 3 +- include/drm/gpu_scheduler.h | 173 +++ include/drm/gpu_scheduler_trace.h | 82 ++ .../drm/amd/scheduler => include/drm}/spsc_queue.h | 7 +- include/drm/ttm/ttm_bo_api.h | 4 + include/drm/ttm/ttm_bo_driver.h | 4 +- 229 files changed, 7486 insertions(+), 5939 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c rename drivers/gpu/drm/amd/{display/dc/basics/grph_object_id.c => amdgpu/amdgpu_debugfs.h} (50%) create mode 100644 drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c rename drivers/gpu/drm/amd/display/dc/dcn10/{dcn10_timing_generator.c => dcn10_optc.c} (76%) rename drivers/gpu/drm/amd/display/dc/dcn10/{dcn10_timing_generator.h => dcn10_optc.h} (83%) delete mode 100644 drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h delete mode 100644 drivers/gpu/drm/amd/scheduler/gpu_scheduler.h create mode 100644 drivers/gpu/drm/scheduler/Makefile rename drivers/gpu/drm/{amd => }/scheduler/gpu_scheduler.c (65%) rename drivers/gpu/drm/{amd => }/scheduler/sched_fence.c (58%) create mode 100644 include/drm/gpu_scheduler.h create mode 100644 include/drm/gpu_scheduler_trace.h rename {drivers/gpu/drm/amd/scheduler => include/drm}/spsc_queue.h (95%)