[pull] amdgpu and ttm drm-next-4.16

Alex Deucher alexdeucher at gmail.com
Sun Dec 31 03:37:12 UTC 2017


Hi Dave,

Last few updates for 4.16:
- Misc fixes for amdgpu
- Enable swapout for reserved BOs during allocation for ttm
- Misc cleanups for ttm

The following changes since commit df2869abd92b740af141ee2eb081bfc69bd80877:

  Merge branch 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux into drm-next (2017-12-21 11:17:45 +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 104bd2ca1124dfd9aa904d5f5a96253ef2b580f6:

  drm/amdgpu: Correct the IB size of bo update mapping. (2017-12-30 22:24:20 -0500)

----------------------------------------------------------------
Christian K├Ânig (5):
      drm/amdgpu: separate VMID and PASID handling
      drm/amdgpu: rename vm_id to vmid
      drm/amdgpu: drop client_id from VM
      drm/ttm: drop the spin in delayed delete if the trylock doesn't work
      drm/amdgpu: fix VM faults with per VM BOs

Emily Deng (1):
      drm/amdgpu: Correct the IB size of bo update mapping.

Rex Zhu (1):
      drm/amd/pp: Get and save CZ/ST smu version

Roger He (7):
      drm/ttm: call ttm_bo_swapout directly when ttm shrink
      drm/ttm: use an operation ctx for ttm_mem_global_alloc
      drm/ttm: use an operation ctx for ttm_mem_global_alloc_page
      drm/ttm: use an operation ctx for ttm_tt_populate in ttm_bo_driver (v2)
      drm/ttm: use an operation ctx for ttm_tt_bind
      drm/ttm: add new function to check if bo is allowable to evict or swapout
      drm/ttm: enable swapout for reserved BOs during allocation

Tan Xiaojun (10):
      drm/ttm: add ttm_bo_io_mem_pfn to check io_mem_pfn
      drm/ast: remove the default io_mem_pfn set
      drm/bochs: remove the default io_mem_pfn set
      drm/cirrus: remove the default io_mem_pfn set
      drm/mgag200: remove the default io_mem_pfn set
      drm/nouveau: remove the default io_mem_pfn set
      drm/qxl: remove the default io_mem_pfn set
      drm/radeon: remove the default io_mem_pfn set
      drm/virtio: remove the default io_mem_pfn set
      drm/vmwgfx: remove the default io_mem_pfn set

 drivers/gpu/drm/amd/amdgpu/Makefile               |   3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h               |   6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c           |   2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c            |   9 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c           | 459 +++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h           |  91 +++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h            |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_job.c           |   8 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h          |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h         |  28 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c           |   9 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c           |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h           |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c            | 468 +++-------------------
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h            |  48 +--
 drivers/gpu/drm/amd/amdgpu/cik_ih.c               |   2 +-
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c             |  14 +-
 drivers/gpu/drm/amd/amdgpu/cz_ih.c                |   2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c             |  14 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c             |  18 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c             |  18 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c             |  18 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c             |   2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c             |   2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c             |   2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c             |  16 +-
 drivers/gpu/drm/amd/amdgpu/iceland_ih.c           |   2 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c            |  16 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c            |  16 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c            |  18 +-
 drivers/gpu/drm/amd/amdgpu/si_dma.c               |  16 +-
 drivers/gpu/drm/amd/amdgpu/si_ih.c                |   2 +-
 drivers/gpu/drm/amd/amdgpu/tonga_ih.c             |   2 +-
 drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c             |   2 +-
 drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c             |   2 +-
 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c             |  26 +-
 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c             |  36 +-
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c             |  10 +-
 drivers/gpu/drm/amd/amdgpu/vce_v4_0.c             |  18 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c             |  36 +-
 drivers/gpu/drm/amd/amdgpu/vega10_ih.c            |   4 +-
 drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c  |  13 +
 drivers/gpu/drm/ast/ast_ttm.c                     |   6 +-
 drivers/gpu/drm/bochs/bochs_mm.c                  |   1 -
 drivers/gpu/drm/cirrus/cirrus_ttm.c               |   6 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c       |   5 +-
 drivers/gpu/drm/mgag200/mgag200_ttm.c             |   6 +-
 drivers/gpu/drm/nouveau/nouveau_bo.c              |  11 +-
 drivers/gpu/drm/qxl/qxl_ttm.c                     |   6 +-
 drivers/gpu/drm/radeon/radeon_ttm.c               |  12 +-
 drivers/gpu/drm/ttm/ttm_agp_backend.c             |   4 +-
 drivers/gpu/drm/ttm/ttm_bo.c                      |  78 ++--
 drivers/gpu/drm/ttm/ttm_bo_util.c                 |  13 +-
 drivers/gpu/drm/ttm/ttm_bo_vm.c                   |  20 +-
 drivers/gpu/drm/ttm/ttm_memory.c                  |  37 +-
 drivers/gpu/drm/ttm/ttm_object.c                  |  13 +-
 drivers/gpu/drm/ttm/ttm_page_alloc.c              |   9 +-
 drivers/gpu/drm/ttm/ttm_page_alloc_dma.c          |   7 +-
 drivers/gpu/drm/ttm/ttm_tt.c                      |   5 +-
 drivers/gpu/drm/virtio/virtgpu_object.c           |   6 +-
 drivers/gpu/drm/virtio/virtgpu_ttm.c              |   6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_binding.c           |   6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c            |  17 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_context.c           |   6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c           |   6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fence.c             |   6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_mob.c               |  13 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_shader.c            |  18 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c   |   6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_so.c                |   6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_surface.c           |  12 +-
 drivers/staging/vboxvideo/vbox_ttm.c              |   5 +-
 include/drm/ttm/ttm_bo_api.h                      |   2 +
 include/drm/ttm/ttm_bo_driver.h                   |   9 +-
 include/drm/ttm/ttm_memory.h                      |  75 +---
 include/drm/ttm/ttm_page_alloc.h                  |  11 +-
 78 files changed, 1057 insertions(+), 870 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h


More information about the dri-devel mailing list