Hi Dave, A few more things for 4.12: - ttm and amdgpu support for non-contiguous vram CPU mappings - lots of bug fixes and cleanups for vega10 - misc bug fixes and code cleanups The following changes since commit e1b489d207c73e67810659a88c45b8db4bd62773: Merge tag 'omapdrm-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next (2017-04-04 05:45:49 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-4.12 for you to fetch changes up to f4e7c7c1b4ed4c28caf679bc94ca5aa096310c10: drm/amdgpu: use uintptr_t instead of unsigned long to store pointer (2017-04-06 13:28:08 -0400) ---------------------------------------------------------------- Alex Deucher (4): drm/amdgpu/powerplay: fix locking typo drm/amdgpu/soc15: Fix static checker warnings drm/amdgpu/vi: add defines for KIQ packets drm/amdgpu/gfx8: KIQ is also disabled when MEC is disabled Alex Xie (3): drm/amdgpu: Move function amdgpu_has_atpx near other similar functions drm/amdgpu: Avoid using signed integer to store pointer value drm/amdgpu: use uintptr_t instead of unsigned long to store pointer Christian König (17): drm/amdgpu: use a 64bit interval tree for VM management v2 drm/ttm: cleanup and optimize ttm_bo_mem_compat v2 drm/ttm: add io_mem_pfn callback drm/ttm: add TTM_PL_FLAG_CONTIGUOUS v2 drm/amdgpu: drop alpha support drm/amdgpu: fix VMHUB order to match the hardware drm/amdgpu: move VM related defines into amdgpu_vm.h drm/amdgpu: remove VMID first tracking drm/amdgpu: coding style of amdgpu_vm_is_gpu_reset drm/amdgpu: cleanup coding style in amdgpu_vm_flush drm/amdgpu: cleanup logic in amdgpu_vm_flush drm/amdgpu: move adjust_mc_addr into amdgpu_gart_funcs drm/amdgpu: use TTM_PL_FLAG_CONTIGUOUS v2 drm/amdgpu: handle CPU access for split VRAM buffers (v2) drm/amdgpu: cleanup VMHUB bit definitions v2 drm/amdgpu: cleanup get_invalidate_req v2 drm/amdgpu: fix over allocating of IRQ sources Dan Carpenter (3): drm/amd/powerplay: fix pp_dpm_get_current_power_state() (v2) drm/amd/powerplay: fix a couple locking issues drm/amdgpu: Fix a NULL deref in amdgpu_vm_add_prt_cb() Evan Quan (1): drm/amdgpu/smu9: update to latest driver interface Harry Wentland (1): drm/amdgpu: Read vram width from integrated system info table Monk Liu (6): drm/amdgpu:add PSP block only load_type=PSP (v2) drm/amdgpu:no need to involv HDP in KIQ drm/amdgpu:fix typo for mxgpu_ai drm/amdgpu:implement the reset MB func for vega10 drm/amdgpu/vega10:timeout set to equal with VI drm/amdgpu:invoke new implemented AI MB func Rex Zhu (2): drm/amdgpu: when resume failed, return error to avoid system hang. drm/amdgpu: various cleanups for uvd/vce. Tom St Denis (18): drm/amd/amdgpu: Clean up gfx_v8_0_kiq_set_interrupt_state() drm/amd/amdgpu: Clean up gfx_v8_0_inactive_hqd() drm/amd/amdgpu: clean up gfx_v8_0_kiq_init_register() drm/amd/amdgpu: de-numberify HQD_ACTIVE check. drm/amd/amdgpu: Clean up gfx_v8_0_mqd_init() drm/amd/amdgpu: Fix srbm_indexing in init/inactive hqd code drm/amd/amdgpu: Fix psp_v3_1 compare sram drm/amd/amdgpu: Clean up psp reload_quirk() drm/amd/amdgpu: cleanup gfx_v9_0_init_queue() drm/amd/amdgpu: cleanup gfx_v9_0_set_priv_inst_fault_state() drm/amd/amdgpu: cleanup gfx_v9_0_set_priv_reg_fault_state() drm/amd/amdgpu: cleanup gfx_v9_0_set_gfx_eop_interrupt_state() drm/amd/amdgpu: Drop gfx_v9_0_print_status() drm/amd/amdgpu: cleanup gfx_v9_0_kiq_init_register() drm/amd/amdgpu: simplify gfx_v9_0_cp_gfx_enable() drm/amd/amdgpu: cleanup gfx_v9_0_rlc_start() drm/amd/amdgpu: cleanup gfx_v9_0_rlc_reset() drm/amd/amdgpu: cleanup gfx_v9_0_gpu_init() Zhang, Jerry (2): drm/amdgpu: create a func to check vm size drm/amdgpu: fix vm size and block size for VMPT (v5) kbuild test robot (1): drm/amdgpu: fix semicolon.cocci warnings drivers/gpu/drm/amd/amdgpu/amdgpu.h | 31 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 29 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 20 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 64 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 40 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 - drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 230 +++++++++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 17 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 82 +++--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 274 ++------------------- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 35 +-- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 96 ++++---- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 96 ++++---- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 90 ++++--- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 35 +-- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 137 ++++++++++- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 7 +- drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 14 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 27 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 19 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 17 +- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 21 +- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/vid.h | 82 ++++++ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 12 +- drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h | 57 ++++- drivers/gpu/drm/ast/ast_ttm.c | 1 + drivers/gpu/drm/bochs/bochs_mm.c | 1 + drivers/gpu/drm/cirrus/cirrus_ttm.c | 1 + drivers/gpu/drm/mgag200/mgag200_ttm.c | 1 + drivers/gpu/drm/nouveau/nouveau_bo.c | 1 + drivers/gpu/drm/qxl/qxl_ttm.c | 1 + drivers/gpu/drm/radeon/radeon_ttm.c | 1 + drivers/gpu/drm/ttm/ttm_bo.c | 49 ++-- drivers/gpu/drm/ttm/ttm_bo_vm.c | 10 +- drivers/gpu/drm/virtio/virtgpu_ttm.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 1 + include/drm/ttm/ttm_bo_api.h | 11 + include/drm/ttm/ttm_bo_driver.h | 9 + include/drm/ttm/ttm_placement.h | 1 + 57 files changed, 900 insertions(+), 883 deletions(-)