[pull] ttm and amdgpu drm-next-4.15

Alex Deucher alexdeucher at gmail.com
Thu Oct 19 19:47:18 UTC 2017


Hi Dave,

Last set of features for 4.15.  Highlights:
- Add a bo flag to allow buffers to opt out of implicit sync
- Add ctx priority setting interface
- Lots more powerplay cleanups
- Start to plumb through vram lost infrastructure for gpu reset
- ttm support for huge pages
- misc cleanups and bug fixes

The following changes since commit bb7a9c8d712f37385a706a594d6edf6e6d2669d0:

  Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-next (2017-10-09 11:00:16 +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 96687ec0bb478088cb6941a7dca3bb6808a19313:

  drm/amd/powerplay: Place the constant on the right side of the test (2017-10-19 15:27:23 -0400)

----------------------------------------------------------------
Alex Deucher (2):
      drm/amdgpu: bump version for new AMDGPU_SCHED ioctl
      drm/amdgpu: bump version for vram lost counter query (v2)

Andres Rodriguez (11):
      drm/amdgpu: add helper to convert a ttm bo to amdgpu_bo
      drm/amdgpu: introduce AMDGPU_GEM_CREATE_EXPLICIT_SYNC v2
      drm/amdgpu: add parameter to allocate high priority contexts v11
      drm/amdgpu: add framework for HW specific priority settings v9
      drm/amdgpu: implement ring set_priority for gfx_v8 compute v9
      drm/amdgpu: make amdgpu_to_sched_priority detect invalid parameters
      drm/amd/sched: allow clients to edit an entity's rq v2
      drm/amdgpu: introduce AMDGPU_CTX_PRIORITY_UNSET
      drm/amdgpu: add plumbing for ctx priority changes v2
      drm/amdgpu: add interface for editing a foreign process's priority v3
      drm/amdgpu: rename context priority levels

Andrey Grodzovsky (3):
      drm/amdgpu: Refactor amdgpu_cs_ib_vm_chunk and amdgpu_cs_ib_fill.
      drm/amdgpu: Move old fence waiting before reservation lock is aquired v2
      drm/amdgpu: Fix extra call to amdgpu_ctx_put.

Christian König (18):
      drm/ttm: allocate/free multiple pages in a single call
      drm/ttm: DMA map/unmap consecutive pages as a whole v2
      drm/amdgpu: add VM support for huge pages v2
      drm/ttm: don't use compound pages for now
      drm/ttm: add transparent huge page support for cached allocations v2
      drm/ttm: move more logic into ttm_page_pool_get_pages
      drm/ttm: add transparent huge page support for wc or uc allocations v2
      drm/amdgpu: partial revert VRAM lost handling v2
      drm/amdgpu: keep copy of VRAM lost counter in job
      drm/amdgpu: move the VRAM lost counter per context
      drm/amdgpu: set -ECANCELED when dropping jobs
      drm/amdgpu: add VRAM lost query
      drm/amd/sched: fix job tear down order v2
      drm/amdgpu: minor CS optimization
      drm/ttm: fix the fix for huge compound pages
      drm/amdgpu: reserve root PD while releasing it
      drm/amdgpu: linear validate first then bind to GART
      drm/amdgpu: allow GTT overcommit during bind

Colin Ian King (1):
      drm/amdgpu: make function uvd_v6_0_enc_get_destroy_msg static

Georgiana Chelu (3):
      drm/amd/powerplay: Don't cast kzalloc() return value
      drm/amd/powerplay: Remove useless variable
      drm/amd/powerplay: Place the constant on the right side of the test

Harish Kasiviswanathan (2):
      drm/amdgpu: Refactor amdgpu_move_blit
      drm/amdgpu: Add amdgpu_find_mm_node()

Horace Chen (2):
      drm/amdgpu: Reserve shared memory on VRAM for SR-IOV
      drm/amdgpu: SR-IOV data exchange between PF&VF

Jérémy Lefaure (1):
      drm/amdgpu: use ARRAY_SIZE

Ken Wang (1):
      drm/amdgpu: correct reference clock value on vega10

Monk Liu (3):
      drm/amdgpu:reduce wb to 512 slot
      drm/amdgpu:fix duplicated setting job's vram_lost
      drm/amdgpu:don't check soft_reset for sriov

Rex Zhu (14):
      drm/amd/pp: export new smu messages for vega10
      drm/amd/pp: add new function point in hwmgr.
      drm/amd/pp: implement function notify_cac_buffer_info on Vega
      drm/amd/pp: implement function notify_cac_buffer_info on VI
      drm/amd/pp: move common function to smu7_smumgr.c
      drm/amdgpu: refine code delete duplicated error handling
      drm/amd/pp: rename ci_smc.c to ci_smumgr.c
      drm/amd/pp: remove fiji_smc/smumgr split.
      drm/amd/pp: remove iceland_smc/smumgr split.
      drm/amd/pp: remove tonga_smc/smumgr split.
      drm/amd/pp: remove polaris10_smc/smumgr split.
      drm/amdgpu: fix regresstion on SR-IOV gpu reset failed
      drm/amd/pp: thermal control not enabled on vega10.
      drm/amd/pp: Fix overflow when setup decf/pix/disp dpm table.

Satyajit Sahu (1):
      drm/amd/powerplay: get the temperature on CZ

Tom St Denis (8):
      drm/ttm: Fix unused variables with huge page support
      drm/amd/powerplay: Tidy up cz_start_dpm()
      drm/amd/powerplay: Tidy up cz_dpm_powerdown_uvd()
      drm/amd/powerplay: Tidy up cz_dpm_powerup_uvd()
      drm/amd/powerplay: Tidy up cz_dpm_update_uvd_dpm()
      drm/amd/powerplay: Tidy up cz_dpm_update_vce_dpm()
      drm/amd/powerplay: Tidy up cz_dpm_powerdown_vce()
      drm/amd/powerplay: Tidy up cz_dpm_powerup_vce()

Yong Zhao (1):
      drm/amdgpu: Set the correct value for PDEs/PTEs of ATC memory on Raven

pding (2):
      drm/amdgpu: report more amdgpu_fence_info
      drm/amdgpu: busywait KIQ register accessing (v4)

 drivers/gpu/drm/amd/amdgpu/Makefile                |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |   37 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c       |   18 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |  172 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c            |  106 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |  100 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |    4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          |   63 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |    9 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c            |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c        |    8 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_job.c            |   18 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |   15 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |    8 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.h         |   13 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c      |    5 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |    9 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c           |   76 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h           |   19 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c          |  109 +
 .../smumgr/iceland_smc.h => amdgpu/amdgpu_sched.h} |   24 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c           |    7 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h           |    3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |  219 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h            |   12 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c           |  105 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h           |  178 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |   55 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h             |   10 +
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              |  108 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |    9 +-
 drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c              |    6 +
 drivers/gpu/drm/amd/amdgpu/soc15.c                 |    5 +-
 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c              |    5 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c     |  101 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   |   42 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c |   35 +-
 .../amd/powerplay/hwmgr/vega10_processpptables.c   |   35 +-
 .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h   |    3 +-
 drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h  | 2007 ------------
 drivers/gpu/drm/amd/powerplay/inc/hwmgr.h          |    6 +
 drivers/gpu/drm/amd/powerplay/inc/smumgr.h         |    5 +
 drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h   |    2 +
 drivers/gpu/drm/amd/powerplay/smumgr/Makefile      |    6 +-
 .../amd/powerplay/smumgr/{ci_smc.c => ci_smumgr.c} |   10 +
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c    | 2486 ---------------
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h    |   53 -
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 2422 ++++++++++++++-
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h |    9 +
 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 2568 ---------------
 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c  | 2489 ++++++++++++++-
 .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c   | 2344 --------------
 .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.h   |   44 -
 .../drm/amd/powerplay/smumgr/polaris10_smumgr.c    | 2269 +++++++++++++-
 drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c |   46 +-
 drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h |    4 +-
 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c   | 3261 --------------------
 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.h   |   62 -
 .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c    | 3117 ++++++++++++++++++-
 .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.h    |   20 +-
 drivers/gpu/drm/amd/scheduler/gpu_scheduler.c      |   29 +-
 drivers/gpu/drm/amd/scheduler/gpu_scheduler.h      |   19 +-
 drivers/gpu/drm/ttm/ttm_page_alloc.c               |  367 ++-
 drivers/gpu/drm/ttm/ttm_page_alloc_dma.c           |    1 +
 include/uapi/drm/amdgpu_drm.h                      |   31 +-
 65 files changed, 12036 insertions(+), 13396 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
 rename drivers/gpu/drm/amd/{powerplay/smumgr/iceland_smc.h => amdgpu/amdgpu_sched.h} (60%)
 delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h
 rename drivers/gpu/drm/amd/powerplay/smumgr/{ci_smc.c => ci_smumgr.c} (99%)
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.h
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.h


More information about the dri-devel mailing list