Hi Dave, More stuff for 4.17. Highlights: - More fixes for "wattman" like functionality (fine grained clk/voltage control) - Add more power profile infrastucture (context based dpm) - SR-IOV fixes - Add iomem debugging interface for use with umr - Powerplay and cgs cleanups - DC fixes and cleanups - ttm improvements - Misc cleanups all over The following changes since commit 9aff8b2ae71dcf7f02443821a894a736f40e4919: Revert "drm/radeon/pm: autoswitch power state when in balanced mode" (2018-02-20 16:27:16 -0500) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-4.17 for you to fetch changes up to f6c3b601bd490eda08c27b03607448abd4b4841b: drm/amdgpu:Always save uvd vcpu_bo in VM Mode (2018-03-07 16:12:18 -0500) ---------------------------------------------------------------- Alex Deucher (5): drm/amdgpu/powerplay/smu7: use proper dep table for mclk drm/amdgpu: fix module parameter descriptions drm/amdgpu: used cached pcie gen info for SI (v2) drm/radeon: fix KV harvesting drm/amdgpu: fix KV harvesting Amber Lin (1): drm/amdgpu: Map all visible VRAM at startup Arnd Bergmann (1): radeon: hide pointless #warning when compile testing Ben Crocker (1): drm/radeon: insist on 32-bit DMA for Cedar on PPC64/PPC64LE Bhawanpreet Lakha (2): drm/amd/display: Use MACROS instead of dm_logger drm/amd/display: define DC_LOGGER for logger Christian König (25): drm/ttm: set page mapping during allocation drm/amdgpu: use the TTM dummy page instead of allocating one drm/ttm: add default implementations for ttm_tt_(un)populate drm/virtio: remove ttm_pool_* wrappers drm/mgag200: remove ttm_pool_* wrappers drm/hisilicon: remove ttm_pool_* wrappers drm/ast: remove ttm_pool_* wrappers drm/qxl: remove ttm_pool_* wrappers drm/cirrus: remove ttm_pool_* wrappers drm/bochs: remove the default ttm_tt_populate callbacks staging: vboxvideo: remove ttm_pool_* wrappers drm/ttm: drop bo->glob drm/ttm: drop ttm->glob drm/ttm: drop ttm->dummy_read_page drm/ttm: drop persistent_swap_storage from ttm_bo_init and co drm/ttm: move ttm_tt_create into ttm_tt.c v2 drm/ttm: cleanup ttm_tt_create drm/amdgpu: move some functions into amdgpu_ttm.h drm/amdgpu: change amdgpu_ttm_set_active_vram_size drm/amdgpu: ignore changes of buffer function status because of GPU resets drm/amdgpu: use separate status for buffer funcs availability v2 drm/amd/pp: fix "Delete the wrapper layer of smu_allocate/free_memory" drm/amdgpu: add amdgpu_evict_gtt debugfs entry drm/amdgpu: drop gtt->adev drm/amdgpu: further mitigate workaround for i915 Corentin Labbe (2): drm/amd: remove inclusion of non-existing scheduler directory drm/amd: Remove inclusion of non-existing include directories Dmytro Laktyushkin (4): drm/amd/display: Update DCN OPTC registers drm/amd/display: add per pipe dppclk drm/amd/display: add diags clock programming drm/amd/display: fix dcn1 dppclk when min dispclk patch applies Emily Deng (2): drm/amdgpu: Correct sdma_v4 get_wptr(v2) drm/amdgpu: Clean sdma wptr register when only enable wptr polling Eric Bernstein (1): drm/amd/display: Fix DAL surface change test Eric Huang (2): drm/amd/powerplay: fix thermal interrupts on vega10 drm/amd/powerplay: fix power over limit on Fiji Eric Yang (2): drm/amd/display: fix missing az disable in reset backend drm/amd/display: update infoframe after dig fe is turned on Harry Wentland (6): drm/amd/display: Remove duplicate dm_pp_power_level enum drm/amd/display: Use crtc enable/disable_vblank hooks drm/amd/display: Return success when enabling interrupt drm/amd/display: Clean up formatting in irq_service_dce110.c drm/amd/display: Don't blow up if TG is NULL in dce110_vblank_set drm/amd/display: Default HDMI6G support to true. Log VBIOS table error. Hersen Wu (2): drm/amd/display: move MST branch initialize to before link training drm/amd/display: Check DCN PState ASSERT failure James Zhu (3): drm/amdgpu:Fixed wrong emit frame size for enc drm/amdgpu:Correct max uvd handles drm/amdgpu:Always save uvd vcpu_bo in VM Mode John Barberiz (1): drm/amd/display: Add passive dongle support for HPD Rearch Leo (Sunpeng) Li (2): drm/amd/display: Use 4096 lut entries drm/amd/display: Add regamma lut write mask to SOC base Matthias Kaehlcke (1): drm/radeon/mkregtable: Delete unused list functions and macros Michel Dänzer (1): drm/amdgpu/dce6: Use DRM_DEBUG instead of DRM_INFO for HPD IRQ info Monk Liu (15): drm/amdgpu: fix&cleanups for wb_clear drm/amdgpu: skip ECC for SRIOV in gmc late_init drm/amdgpu: only flush hotplug work without DC drm/amdgpu: cond_exec only for schedule with a job drm/amdgpu: change gfx9 ib test to use WB drm/amdgpu: move WB_FREE to correct place drm/amdgpu: increase gart size to 512MB drm/amdgpu: don't use MM idle_work for SRIOV(v2) drm/amdgpu: adjust timeout for ib_ring_tests(v2) drm/amdgpu: cleanup SA inti and fini(v2) drm/amdgpu: disable GFX ring and disable PQ wptr in hw_fini drm/amdgpu: stop all rings before doing gpu recover drm/amdgpu: cleanups for vram lost handling drm/amdgpu: try again kiq access if not in IRQ(v4) drm/amdgpu: give warning before sleep in kiq_r/wreg Rex Zhu (38): drm/amd/pp: Fix error handling when smu return failed on Vega10. drm/amd/pp: Fix bug that dpm level was not really locked drm/amdgpu: Add query vram width in CGS query system info drm/amdgpu: Change default value of module parameter amdgpu_pp_feature_mask drm/amd/pp: Add a pp feature mask bit for AutoWattman feature drm/amd/pp: Remove duplicated vega10_is_smc_ram_running calls drm/amd/pp: Add debug info when smu failed on Vega10 drm/amd/pp: Remove dead error checking code on Vega10 drm/amd/pp: Refine code in powerplay for Cz/Vega10 drm/amd/pp: Cleaning up vega10_enable_dpm_tasks function drm/amd/pp: Move common dpm check functions to hardwaremanager.c drm/amd/pp: Print more smu failed info on Vega10 drm/amd/pp: Fix incorrect return value in smu7_check_clk_voltage_valid drm/amd/dc: Use forward declaration instand of include header file drm/amd/pp: Simplify the create of powerplay instance drm/amd/pp: Refine powerplay instance drm/amdgpu: Notify sbios device ready before send request drm/amd/pp: Use amdgpu acpi helper functions in powerplay drm/amd/pp: Remove the wrap functions for acpi in powerplay drm/amd/pp: Remove cgs_query_system_info drm/amd/pp: Export new smu message for PCC feature on Vega10 drm/amd/pp: Add PCC feature support on Vega drm/amd/pp: Add common interface in smu for update dpm setting drm/amd/pp: Add a helper to set field in u32 drm/amd/pp: Implement update_dpm_settings on Polaris drm/amd/pp: Implement update_dpm_settings on Fiji drm/amd/pp: Implement update_dpm_settings on Tonga drm/amd/pp: Implement update_dpm_settings on CI drm/amd/pp: Implement get/set_power_profile_mode on smu7 drm/amd/pp: Fix sclk in highest two levels when compute on smu7 drm/amd/pp: Revert gfx/compute profile switch sysfs drm/amd/pp: Add auto power profilng switch based on workloads (v2) Revert "drm/amd/pp: Add a pp feature mask bit for AutoWattman feature" drm/amd/pp: Remove cgs wrapper function for temperature update drm/amd/pp: Delete the wrapper layer of smu_allocate/free_memory drm/amdgpu: Delete cgs wrapper functions for gpu memory manager drm/amd/pp: Drop wrapper functions for upper/lower_32_bits drm/amd/pp: Add #ifdef checks for CONFIG_ACPI Roger He (4): drm/ttm: use bit flag to replace allow_reserved_eviction in ttm_operation_ctx drm/ttm: add bit flag TTM_OPT_FLAG_FORCE_ALLOC drm/ttm: set TTM_OPT_FLAG_FORCE_ALLOC in ttm_bo_force_list_clean drm/ttm: check if free mem space is under the lower limit Roman Li (1): drm/amd/display: Fix active dongle hotplug Shirish S (8): drm/amd/display: make dm_dp_aux_transfer return payload bytes instead of size drm/amd/display: check for ipp before calling cursor operations drm/amd/display: allocate fbc buffer in AMDGPU_GEM_DOMAIN_GTT drm/amd/display: defer modeset check in dm_update_planes_state drm/amd/display: validate plane in dce110 for scaling drm/amd/display: update plane params before validation drm/amd/display: disable CRTCs with NULL FB on their primary plane (V2) drm/amd/display: validate plane format on primary plane Thierry Reding (1): drm/amdgpu: Remove duplicate setting of ->need_swiotlb Tom St Denis (4): drm/amd/amdgpu: Correct VRAM width for APUs with GMC9 drm/amd/amdgpu: Mask rptr as well in ring debugfs drm/amd/amdgpu: re-add missing GC 9.1 and SDMA0 4.1 sh_mask header files drm/amdgpu: replace iova debugfs file with iomem (v3) Tony Cheng (3): drm/amd/display: dal 3.1.35 drm/amd/display: dal 3.1.36 drm/amd/display: dal 3.1.37 Vitaly Prosyak (1): drm/amd/display: Handle HDR use cases. Wenjing Liu (1): drm/amd/display: Update Link Training Fallback logic Xingyue Tao (1): drm/amd/display: add psr_version to stream Yongqiang Sun (1): drm/amd/display: Clear dmps off for eDP when resume. Yue Hin Lau (1): drm/amd/display: update cur_clock correctly within set bandwidth drivers/gpu/drm/amd/amdgpu/Makefile | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 19 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 434 - drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 192 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 29 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 41 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 180 - drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 62 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 180 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 7 + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 71 +- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 256 - drivers/gpu/drm/amd/amdgpu/ci_dpm.h | 7 - drivers/gpu/drm/amd/amdgpu/cik_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 +- drivers/gpu/drm/amd/amdgpu/cz_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 30 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 115 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 2 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 11 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 22 +- drivers/gpu/drm/amd/amdgpu/si.c | 22 +- drivers/gpu/drm/amd/amdgpu/si_dma.c | 4 +- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 50 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 +- drivers/gpu/drm/amd/display/Makefile | 2 - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 68 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 4 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 77 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 14 + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 9 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 6 +- .../gpu/drm/amd/display/dc/bios/command_table2.c | 11 +- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 13 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 17 +- drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 13 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 67 +- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 7 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 151 +- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 1 + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 9 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 6 +- drivers/gpu/drm/amd/display/dc/dc.h | 15 +- drivers/gpu/drm/amd/display/dc/dc_link.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 +- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 5 +- drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 17 +- .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 32 +- drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 8 +- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 38 +- .../drm/amd/display/dc/dce/dce_stream_encoder.c | 9 +- drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 11 +- drivers/gpu/drm/amd/display/dc/dce/dce_transform.h | 1 + .../drm/amd/display/dc/dce110/dce110_compressor.c | 14 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 49 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 26 +- .../display/dc/dce110/dce110_timing_generator_v.c | 17 +- .../drm/amd/display/dc/dce110/dce110_transform_v.c | 5 +- .../drm/amd/display/dc/dce112/dce112_compressor.c | 27 +- .../drm/amd/display/dc/dce112/dce112_resource.c | 7 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 153 + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 5 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 6 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 77 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 1 + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 82 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 6 +- drivers/gpu/drm/amd/display/dc/dm_helpers.h | 10 + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 21 +- drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c | 21 +- .../dc/i2caux/dce110/i2c_hw_engine_dce110.c | 6 +- drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 1 + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 26 +- drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 2 + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 75 +- drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 10 +- .../drm/amd/display/include/link_service_types.h | 5 +- drivers/gpu/drm/amd/display/include/logger_types.h | 33 + .../drm/amd/display/modules/color/color_gamma.c | 143 +- .../drm/amd/include/asic_reg/gc/gc_9_1_sh_mask.h | 31150 +++++++++++++++++++ .../amd/include/asic_reg/sdma0/sdma0_4_1_sh_mask.h | 1658 + drivers/gpu/drm/amd/include/cgs_common.h | 205 - drivers/gpu/drm/amd/include/kgd_pp_interface.h | 33 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 166 +- drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 54 +- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h | 1 - .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 31 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 93 +- drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 114 - drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 11 +- .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 17 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 320 +- .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 9 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 313 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 4 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 50 +- .../amd/powerplay/hwmgr/vega10_processpptables.c | 13 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 14 +- drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 2 +- .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 1 - drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 18 +- drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h | 26 - drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 8 +- drivers/gpu/drm/amd/powerplay/inc/smu9.h | 4 +- drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 16 +- drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h | 1 + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 138 +- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 112 +- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.h | 7 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 139 +- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 7 +- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 137 +- drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 71 +- drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.h | 7 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 68 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 5 +- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 69 +- .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 150 +- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 295 +- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h | 7 +- drivers/gpu/drm/ast/ast_ttm.c | 20 +- drivers/gpu/drm/bochs/bochs_mm.c | 9 +- drivers/gpu/drm/cirrus/cirrus_ttm.c | 20 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 20 +- drivers/gpu/drm/mgag200/mgag200_ttm.c | 20 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 8 +- drivers/gpu/drm/nouveau/nouveau_sgdma.c | 5 +- drivers/gpu/drm/nouveau/nouveau_ttm.h | 3 +- drivers/gpu/drm/qxl/qxl_object.c | 2 +- drivers/gpu/drm/qxl/qxl_release.c | 2 +- drivers/gpu/drm/qxl/qxl_ttm.c | 28 +- drivers/gpu/drm/radeon/cik.c | 31 +- drivers/gpu/drm/radeon/mkregtable.c | 433 - drivers/gpu/drm/radeon/radeon_device.c | 4 + drivers/gpu/drm/radeon/radeon_object.c | 7 +- drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- drivers/gpu/drm/ttm/ttm_agp_backend.c | 8 +- drivers/gpu/drm/ttm/ttm_bo.c | 91 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 5 +- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 6 +- drivers/gpu/drm/ttm/ttm_memory.c | 93 + drivers/gpu/drm/ttm/ttm_page_alloc.c | 9 +- drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 14 +- drivers/gpu/drm/ttm/ttm_tt.c | 79 +- drivers/gpu/drm/virtio/virtgpu_object.c | 2 +- drivers/gpu/drm/virtio/virtgpu_ttm.c | 22 +- drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 5 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +- drivers/staging/vboxvideo/vbox_ttm.c | 20 +- include/drm/ttm/ttm_bo_api.h | 28 +- include/drm/ttm/ttm_bo_driver.h | 33 +- include/drm/ttm/ttm_memory.h | 5 + 181 files changed, 35627 insertions(+), 4308 deletions(-) create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_1_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_1_sh_mask.h delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h