[pull] amdgpu, amdkfd drm-next-5.17

Daniel Vetter daniel at ffwll.ch
Fri Jan 14 13:13:30 UTC 2022


On Wed, Jan 12, 2022 at 10:05:37PM -0500, Alex Deucher wrote:
> Hi Dave, Daniel,
> 
> Fixes for 5.17.
> 
> The following changes since commit cb6846fbb83b574c85c2a80211b402a6347b60b1:
> 
>   Merge tag 'amd-drm-next-5.17-2021-12-30' of ssh://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-12-31 10:59:17 +1000)
> 
> are available in the Git repository at:
> 
>   https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.17-2022-01-12
> 
> for you to fetch changes up to 5eb877b282fecc8b8a6ac6d4ce0d5057f9d3bad0:
> 
>   drm/amdkfd: Fix ASIC name typos (2022-01-11 15:44:28 -0500)

The baseline you picked here is a bit funny because you have a bugfix here
for a problem which is only in 5.16, and your branch isn't including 5.16.

Maybe add this dim check to your script?

dim: f38b0d48cae8 ("drm/amd/pm: keep the BACO feature enabled for suspend"): Fixes: SHA1 in not pointing at an ancestor:
dim:     daf8de0874ab5b ("drm/amdgpu: always reset the asic in suspend (v2)")

Anyway pulled into drm-next, thanks.
-Daniel

> 
> ----------------------------------------------------------------
> amd-drm-next-5.17-2022-01-12:
> 
> amdgpu:
> - SR-IOV fixes
> - Suspend/resume fixes
> - Display fixes
> - DMCUB fixes
> - DP alt mode fixes
> - RAS fixes
> - UBSAN fix
> - Navy Flounder VCN fix
> - ttm resource manager cleanup
> - default_groups change for kobj_type
> - vkms fix
> - Aldebaran fixes
> 
> amdkfd:
> - SDMA ECC interrupt fix
> - License clarification
> - Pointer check fix
> - DQM fixes for hawaii
> - default_groups change for kobj_type
> - Typo fixes
> 
> ----------------------------------------------------------------
> Charlene Liu (1):
>       drm/amd/display: Add check for forced_clocks debug option
> 
> Evan Quan (1):
>       drm/amd/pm: keep the BACO feature enabled for suspend
> 
> Felix Kuehling (3):
>       drm/amdkfd: Use prange->list head for insert_list
>       drm/amdkfd: Use prange->update_list head for remove_list
>       drm/amdkfd: Fix DQM asserts on Hawaii
> 
> Greg Kroah-Hartman (2):
>       drm/amdgpu: use default_groups in kobj_type
>       drm/amdkfd: use default_groups in kobj_type
> 
> Guchun Chen (1):
>       drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
> 
> Harry Wentland (1):
>       drm/amdgpu: Use correct VIEWPORT_DIMENSION for DCN2
> 
> James Yao (1):
>       drm/amdgpu: add dummy event6 for vega10
> 
> Jiasheng Jiang (1):
>       drm/amdkfd: Check for null pointer after calling kmemdup
> 
> Jiawei Gu (1):
>       drm/amdgpu: Clear garbage data in err_data before usage
> 
> José Expósito (1):
>       drm/amd/display: invalid parameter check in dmub_hpd_callback
> 
> Kent Russell (1):
>       drm/amdkfd: Fix ASIC name typos
> 
> Leslie Shi (1):
>       drm/amdgpu: Unmap MMIO mappings when device is not unplugged
> 
> Lukas Bulwahn (1):
>       drm/amdkfd: make SPDX License expression more sound
> 
> Mario Limonciello (4):
>       drm/amdgpu: explicitly check for s0ix when evicting resources
>       drm/amdgpu: don't set s3 and s0ix at the same time
>       drm/amd/display: explicitly set is_dsc_supported to false before use
>       drm/amd/display: reset dcn31 SMU mailbox on failures
> 
> Mikita Lipski (1):
>       drm/amd/display: introduce mpo detection flags
> 
> Nicholas Kazlauskas (2):
>       drm/amd/display: Don't reinitialize DMCUB on s0ix resume
>       drm/amd/display: Add version check before using DP alt query interface
> 
> Nirmoy Das (4):
>       drm/amdgpu: do not pass ttm_resource_manager to gtt_mgr
>       drm/amdkfd: remove unused function
>       drm/amdgpu: do not pass ttm_resource_manager to vram_mgr
>       drm/amdgpu: recover gart table at resume
> 
> Peng Ju Zhou (1):
>       drm/amdgpu: Enable second VCN for certain Navy Flounder.
> 
> Prike Liang (1):
>       drm/amdgpu: not return error on the init_apu_flags
> 
> Rajneesh Bhardwaj (1):
>       Revert "drm/amdgpu: Don't inherit GEM object VMAs in child process"
> 
> Tao Zhou (1):
>       drm/amd/pm: only send GmiPwrDnControl msg on master die (v3)
> 
> Tom St Denis (1):
>       drm/amd/amdgpu: Add pcie indirect support to amdgpu_mm_wreg_mmio_rlc()
> 
> Wenjing Liu (1):
>       drm/amd/display: unhard code link to phy idx mapping in dc link and clean up
> 
> Yi-Ling Chen (1):
>       drm/amd/display: Fix underflow for fused display pipes case
> 
> yipechai (1):
>       drm/amdkfd: enable sdma ecc interrupt event can be handled by event_interrupt_wq_v9
> 
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |   7 -
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h         |   1 -
>  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |   5 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |  36 ++---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      |   3 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |   6 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c           |  84 +-----------
>  drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |   3 -
>  drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c        |  17 +--
>  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |  14 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |  12 ++
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |   7 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |  11 ++
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h            |  12 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c           |   9 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c           |   5 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c       |  40 +++---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c           |   3 +-
>  drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c             |   3 +-
>  drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c              |   3 +-
>  drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c              |   3 +-
>  drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c              |   3 +-
>  drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c              |  17 ++-
>  drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c              |  11 ++
>  drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h              |   2 +
>  drivers/gpu/drm/amd/amdkfd/kfd_crat.c              |   3 +
>  drivers/gpu/drm/amd/amdkfd/kfd_device.c            |   6 +-
>  .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |   9 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c    |   1 +
>  drivers/gpu/drm/amd/amdkfd/kfd_process.c           |   3 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_svm.c               |  23 ++--
>  drivers/gpu/drm/amd/amdkfd/kfd_svm.h               |   4 -
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |  44 ++++++-
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h  |   2 +
>  .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c   |   6 +
>  drivers/gpu/drm/amd/display/dc/core/dc_link.c      | 145 +++++++++------------
>  drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |  33 +++++
>  .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  |   7 +-
>  .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c  | 114 +++++++++++++---
>  .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c  |   2 +-
>  drivers/gpu/drm/amd/display/dc/dm_cp_psp.h         |   4 +-
>  drivers/gpu/drm/amd/display/dc/inc/resource.h      |   1 +
>  drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h |   2 +-
>  drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c          |   8 +-
>  drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c |  16 ++-
>  include/uapi/linux/kfd_sysfs.h                     |   2 +-
>  46 files changed, 422 insertions(+), 330 deletions(-)

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list