mbox series

[pull] amdgpu, amdkfd drm-fixes-6.8

Message ID 20240115220841.1517007-1-alexander.deucher@amd.com (mailing list archive)
State New, archived
Headers show
Series [pull] amdgpu, amdkfd drm-fixes-6.8 | expand

Pull-request

https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-6.8-2024-01-15

Message

Deucher, Alexander Jan. 15, 2024, 10:08 p.m. UTC
Hi Dave, Sima,

Same PR as Friday, but with the new clang warning fixed.

The following changes since commit e54478fbdad20f2c58d0a4f99d01299ed8e7fe9c:

  Merge tag 'amd-drm-next-6.8-2024-01-05' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2024-01-09 09:07:50 +1000)

are available in the Git repository at:

  https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-6.8-2024-01-15

for you to fetch changes up to 86718cf93237a0f45773bbc49b6006733fc4e051:

  drm/amd/display: Avoid enum conversion warning (2024-01-15 16:28:05 -0500)

----------------------------------------------------------------
amd-drm-fixes-6.8-2024-01-15:

amdgpu:
- SubVP fixes
- VRR fixes
- USB4 fixes
- DCN 3.5 fixes
- GFX11 harvesting fix
- RAS fixes
- Misc small fixes
- KFD dma-buf import fixes
- Power reporting fixes
- ATHUB 3.3 fix
- SR-IOV fix
- Add missing fw release for fiji
- GFX 11.5 fix
- Debugging module parameter fix
- SMU 13.0.6 fixes
- Fix new clang warning

amdkfd:
- Fix lockdep warnings
- Fix sparse __rcu warnings
- Bump interface version so userspace knows that the kernel supports dma-bufs exported from KFD
  Most of the fixes for this went into 6.7, but the last fix is in this PR
- HMM fix
- SVM fix

----------------------------------------------------------------
Alex Deucher (4):
      drm/amdgpu: fix avg vs input power reporting on smu7
      drm/amdgpu: fall back to INPUT power for AVG power via INFO IOCTL
      drm/amdgpu/pm: clarify debugfs pm output
      drm/amdgpu: drop exp hw support check for GC 9.4.3

Aric Cyr (1):
      drm/amd/display: 3.2.266

Candice Li (2):
      drm/amdgpu: Drop unnecessary sentences about CE and deferred error.
      drm/amdgpu: Support poison error injection via ras_ctrl debugfs

Charlene Liu (1):
      drm/amd/display: Update z8 latency

Dafna Hirschfeld (1):
      drm/amdkfd: fixes for HMM mem allocation

Daniel Miess (1):
      Revert "drm/amd/display: Fix conversions between bytes and KB"

Felix Kuehling (4):
      drm/amdkfd: Fix lock dependency warning
      drm/amdkfd: Fix sparse __rcu annotation warnings
      drm/amdgpu: Auto-validate DMABuf imports in compute VMs
      drm/amdkfd: Bump KFD ioctl version

George Shen (1):
      drm/amd/display: Disconnect phantom pipe OPP from OPTC being disabled

Hawking Zhang (1):
      drm/amdgpu: Packed socket_id to ras feature mask

Ivan Lipski (1):
      Revert "drm/amd/display: fix bandwidth validation failure on DCN 2.1"

James Zhu (1):
      drm/amdgpu: make a correction on comment

Le Ma (3):
      Revert "drm/amdgpu: add param to specify fw bo location for front-door loading"
      drm/amdgpu: add debug flag to place fw bo on vram for frontdoor loading
      drm/amdgpu: move debug options init prior to amdgpu device init

Lijo Lazar (2):
      drm/amd/pm: Add error log for smu v13.0.6 reset
      drm/amd/pm: Fix smuv13.0.6 current clock reporting

Likun Gao (1):
      drm/amdgpu: correct the cu count for gfx v11

Martin Leung (2):
      drm/amd/display: revert "for FPO & SubVP/DRR config program vmin/max"
      drm/amd/display: revert "Optimize VRR updates to only necessary ones"

Martin Tsai (1):
      drm/amd/display: To adjust dprefclk by down spread percentage

Meenakshikumar Somasundaram (1):
      drm/amd/display: Dpia hpd status not in sync after S4

Melissa Wen (1):
      drm/amd/display: cleanup inconsistent indenting in amdgpu_dm_color

Nathan Chancellor (1):
      drm/amd/display: Avoid enum conversion warning

Peichen Huang (1):
      drm/amd/display: Request usb4 bw for mst streams

Philip Yang (1):
      drm/amdkfd: Fix lock dependency warning with srcu

Srinivasan Shanmugam (6):
      drm/amd/powerplay: Fix kzalloc parameter 'ATOM_Tonga_PPM_Table' in 'get_platform_power_management_table()'
      drm/amdgpu: Fix with right return code '-EIO' in 'amdgpu_gmc_vram_checking()'
      drm/amdgpu: Fix unsigned comparison with less than zero in vpe_u1_8_from_fraction()
      drm/amdgpu: Release 'adev->pm.fw' before return in 'amdgpu_device_need_post()'
      drm/amd/display: Fix variable deferencing before NULL check in edp_setup_replay()
      drm/amdkfd: Fix 'node' NULL check in 'svm_range_get_range_boundaries()'

Victor Lu (1):
      drm/amdgpu: Do not program VM_L2_CNTL under SRIOV

Yifan Zhang (3):
      drm/amdgpu: update headers for nbio v7.11
      drm/amdgpu: update ATHUB_MISC_CNTL offset for athub v3.3
      drm/amdgpu: update regGL2C_CTRL4 value in golden setting

 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |  3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h         | 12 +++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   | 43 +++++++------
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |  6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |  1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      |  2 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c        |  4 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            | 15 ++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            | 29 ++++++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c            | 21 ++++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |  7 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            | 26 ++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c          |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             | 67 +++++++++++++++++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h             | 14 +++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c            | 10 +--
 drivers/gpu/drm/amd/amdgpu/athub_v3_0.c            |  8 +++
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c             |  5 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c           | 10 +--
 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c             |  3 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c             |  3 +-
 drivers/gpu/drm/amd/amdgpu/umc_v6_7.c              |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c           |  6 +-
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h              |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c           |  7 ++-
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c               | 52 ++++++++--------
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |  2 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c    |  2 +-
 .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 71 +++++++++++++++++++++-
 .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.h | 11 ++++
 drivers/gpu/drm/amd/display/dc/core/dc.c           | 14 +++--
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c  | 14 -----
 drivers/gpu/drm/amd/display/dc/dc.h                |  3 +-
 drivers/gpu/drm/amd/display/dc/dc_stream.h         |  2 +
 drivers/gpu/drm/amd/display/dc/dc_types.h          | 12 ++--
 drivers/gpu/drm/amd/display/dc/dce/dce_audio.c     |  2 +-
 .../gpu/drm/amd/display/dc/dce/dce_clock_source.c  |  9 ++-
 .../amd/display/dc/dcn32/dcn32_resource_helpers.c  | 14 +++++
 .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c   | 11 ++--
 .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c   |  6 +-
 .../drm/amd/display/dc/dml2/display_mode_core.c    | 18 +++---
 .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c  |  2 +-
 .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c    |  2 +-
 .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c    | 45 ++------------
 drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h    |  1 +
 drivers/gpu/drm/amd/display/dc/inc/resource.h      |  3 -
 drivers/gpu/drm/amd/display/dc/link/link_dpms.c    | 42 ++++++++++---
 .../gpu/drm/amd/display/dc/link/link_validation.c  | 60 ++++++++++++++----
 .../amd/display/dc/link/protocols/link_dp_dpia.c   | 36 ++++++-----
 .../display/dc/link/protocols/link_dp_dpia_bw.c    | 60 +++++++++++++-----
 .../display/dc/link/protocols/link_dp_dpia_bw.h    |  9 +++
 .../dc/link/protocols/link_edp_panel_control.c     | 11 ++--
 .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 19 ++++--
 .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 12 ++--
 .../amd/display/dc/resource/dcn32/dcn32_resource.c |  2 +-
 .../amd/display/dc/resource/dcn32/dcn32_resource.h |  3 +
 .../display/dc/resource/dcn321/dcn321_resource.c   |  2 +-
 drivers/gpu/drm/amd/display/include/audio_types.h  |  2 +-
 .../amd/include/asic_reg/nbio/nbio_7_11_0_offset.h |  8 +--
 drivers/gpu/drm/amd/pm/amdgpu_pm.c                 | 28 ++++++---
 .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c |  2 +-
 .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c    | 17 +++++-
 .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c   | 15 +++--
 include/uapi/linux/kfd_ioctl.h                     |  3 +-
 65 files changed, 635 insertions(+), 302 deletions(-)

Comments

Felix Kuehling Jan. 15, 2024, 11:01 p.m. UTC | #1
On 2024-01-15 17:08, Alex Deucher wrote:
> Hi Dave, Sima,
>
> Same PR as Friday, but with the new clang warning fixed.
>
> The following changes since commit e54478fbdad20f2c58d0a4f99d01299ed8e7fe9c:
>
>    Merge tag 'amd-drm-next-6.8-2024-01-05' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2024-01-09 09:07:50 +1000)
>
> are available in the Git repository at:
>
>    https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-6.8-2024-01-15
>
> for you to fetch changes up to 86718cf93237a0f45773bbc49b6006733fc4e051:
>
>    drm/amd/display: Avoid enum conversion warning (2024-01-15 16:28:05 -0500)
>
> ----------------------------------------------------------------
> amd-drm-fixes-6.8-2024-01-15:
>
> amdgpu:
> - SubVP fixes
> - VRR fixes
> - USB4 fixes
> - DCN 3.5 fixes
> - GFX11 harvesting fix
> - RAS fixes
> - Misc small fixes
> - KFD dma-buf import fixes
> - Power reporting fixes
> - ATHUB 3.3 fix
> - SR-IOV fix
> - Add missing fw release for fiji
> - GFX 11.5 fix
> - Debugging module parameter fix
> - SMU 13.0.6 fixes
> - Fix new clang warning
>
> amdkfd:
> - Fix lockdep warnings
> - Fix sparse __rcu warnings
> - Bump interface version so userspace knows that the kernel supports dma-bufs exported from KFD
>    Most of the fixes for this went into 6.7, but the last fix is in this PR
> - HMM fix
> - SVM fix
>
> ----------------------------------------------------------------
> Alex Deucher (4):
>        drm/amdgpu: fix avg vs input power reporting on smu7
>        drm/amdgpu: fall back to INPUT power for AVG power via INFO IOCTL
>        drm/amdgpu/pm: clarify debugfs pm output
>        drm/amdgpu: drop exp hw support check for GC 9.4.3
>
> Aric Cyr (1):
>        drm/amd/display: 3.2.266
>
> Candice Li (2):
>        drm/amdgpu: Drop unnecessary sentences about CE and deferred error.
>        drm/amdgpu: Support poison error injection via ras_ctrl debugfs
>
> Charlene Liu (1):
>        drm/amd/display: Update z8 latency
>
> Dafna Hirschfeld (1):
>        drm/amdkfd: fixes for HMM mem allocation
>
> Daniel Miess (1):
>        Revert "drm/amd/display: Fix conversions between bytes and KB"
>
> Felix Kuehling (4):
>        drm/amdkfd: Fix lock dependency warning
>        drm/amdkfd: Fix sparse __rcu annotation warnings
>        drm/amdgpu: Auto-validate DMABuf imports in compute VMs
>        drm/amdkfd: Bump KFD ioctl version

I don't think the last two patches should be on -fixes. This is really 
for a new interoperability feature and not meant to fix other 
functionality that was already expected to work. That's why the user 
mode code checks for the API version.

Regards,
   Felix


>
> George Shen (1):
>        drm/amd/display: Disconnect phantom pipe OPP from OPTC being disabled
>
> Hawking Zhang (1):
>        drm/amdgpu: Packed socket_id to ras feature mask
>
> Ivan Lipski (1):
>        Revert "drm/amd/display: fix bandwidth validation failure on DCN 2.1"
>
> James Zhu (1):
>        drm/amdgpu: make a correction on comment
>
> Le Ma (3):
>        Revert "drm/amdgpu: add param to specify fw bo location for front-door loading"
>        drm/amdgpu: add debug flag to place fw bo on vram for frontdoor loading
>        drm/amdgpu: move debug options init prior to amdgpu device init
>
> Lijo Lazar (2):
>        drm/amd/pm: Add error log for smu v13.0.6 reset
>        drm/amd/pm: Fix smuv13.0.6 current clock reporting
>
> Likun Gao (1):
>        drm/amdgpu: correct the cu count for gfx v11
>
> Martin Leung (2):
>        drm/amd/display: revert "for FPO & SubVP/DRR config program vmin/max"
>        drm/amd/display: revert "Optimize VRR updates to only necessary ones"
>
> Martin Tsai (1):
>        drm/amd/display: To adjust dprefclk by down spread percentage
>
> Meenakshikumar Somasundaram (1):
>        drm/amd/display: Dpia hpd status not in sync after S4
>
> Melissa Wen (1):
>        drm/amd/display: cleanup inconsistent indenting in amdgpu_dm_color
>
> Nathan Chancellor (1):
>        drm/amd/display: Avoid enum conversion warning
>
> Peichen Huang (1):
>        drm/amd/display: Request usb4 bw for mst streams
>
> Philip Yang (1):
>        drm/amdkfd: Fix lock dependency warning with srcu
>
> Srinivasan Shanmugam (6):
>        drm/amd/powerplay: Fix kzalloc parameter 'ATOM_Tonga_PPM_Table' in 'get_platform_power_management_table()'
>        drm/amdgpu: Fix with right return code '-EIO' in 'amdgpu_gmc_vram_checking()'
>        drm/amdgpu: Fix unsigned comparison with less than zero in vpe_u1_8_from_fraction()
>        drm/amdgpu: Release 'adev->pm.fw' before return in 'amdgpu_device_need_post()'
>        drm/amd/display: Fix variable deferencing before NULL check in edp_setup_replay()
>        drm/amdkfd: Fix 'node' NULL check in 'svm_range_get_range_boundaries()'
>
> Victor Lu (1):
>        drm/amdgpu: Do not program VM_L2_CNTL under SRIOV
>
> Yifan Zhang (3):
>        drm/amdgpu: update headers for nbio v7.11
>        drm/amdgpu: update ATHUB_MISC_CNTL offset for athub v3.3
>        drm/amdgpu: update regGL2C_CTRL4 value in golden setting
>
>   drivers/gpu/drm/amd/amdgpu/amdgpu.h                |  3 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h         | 12 +++-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   | 43 +++++++------
>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |  6 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |  1 +
>   drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      |  2 -
>   drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c        |  4 ++
>   drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            | 15 ++---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            | 29 ++++++++-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c            | 21 ++++---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |  7 ++-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |  2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            | 26 ++++----
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c          |  2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             | 67 +++++++++++++++++---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h             | 14 +++--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c            | 10 +--
>   drivers/gpu/drm/amd/amdgpu/athub_v3_0.c            |  8 +++
>   drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c             |  5 +-
>   drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c           | 10 +--
>   drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c             |  3 +-
>   drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c             |  3 +-
>   drivers/gpu/drm/amd/amdgpu/umc_v6_7.c              |  2 +-
>   drivers/gpu/drm/amd/amdkfd/kfd_migrate.c           |  6 +-
>   drivers/gpu/drm/amd/amdkfd/kfd_priv.h              |  2 +-
>   drivers/gpu/drm/amd/amdkfd/kfd_process.c           |  7 ++-
>   drivers/gpu/drm/amd/amdkfd/kfd_svm.c               | 52 ++++++++--------
>   drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |  2 +-
>   .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c    |  2 +-
>   .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 71 +++++++++++++++++++++-
>   .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.h | 11 ++++
>   drivers/gpu/drm/amd/display/dc/core/dc.c           | 14 +++--
>   drivers/gpu/drm/amd/display/dc/core/dc_resource.c  | 14 -----
>   drivers/gpu/drm/amd/display/dc/dc.h                |  3 +-
>   drivers/gpu/drm/amd/display/dc/dc_stream.h         |  2 +
>   drivers/gpu/drm/amd/display/dc/dc_types.h          | 12 ++--
>   drivers/gpu/drm/amd/display/dc/dce/dce_audio.c     |  2 +-
>   .../gpu/drm/amd/display/dc/dce/dce_clock_source.c  |  9 ++-
>   .../amd/display/dc/dcn32/dcn32_resource_helpers.c  | 14 +++++
>   .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c   | 11 ++--
>   .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c   |  6 +-
>   .../drm/amd/display/dc/dml2/display_mode_core.c    | 18 +++---
>   .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c  |  2 +-
>   .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c    |  2 +-
>   .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c    | 45 ++------------
>   drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h    |  1 +
>   drivers/gpu/drm/amd/display/dc/inc/resource.h      |  3 -
>   drivers/gpu/drm/amd/display/dc/link/link_dpms.c    | 42 ++++++++++---
>   .../gpu/drm/amd/display/dc/link/link_validation.c  | 60 ++++++++++++++----
>   .../amd/display/dc/link/protocols/link_dp_dpia.c   | 36 ++++++-----
>   .../display/dc/link/protocols/link_dp_dpia_bw.c    | 60 +++++++++++++-----
>   .../display/dc/link/protocols/link_dp_dpia_bw.h    |  9 +++
>   .../dc/link/protocols/link_edp_panel_control.c     | 11 ++--
>   .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 19 ++++--
>   .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 12 ++--
>   .../amd/display/dc/resource/dcn32/dcn32_resource.c |  2 +-
>   .../amd/display/dc/resource/dcn32/dcn32_resource.h |  3 +
>   .../display/dc/resource/dcn321/dcn321_resource.c   |  2 +-
>   drivers/gpu/drm/amd/display/include/audio_types.h  |  2 +-
>   .../amd/include/asic_reg/nbio/nbio_7_11_0_offset.h |  8 +--
>   drivers/gpu/drm/amd/pm/amdgpu_pm.c                 | 28 ++++++---
>   .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c |  2 +-
>   .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c    | 17 +++++-
>   .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c   | 15 +++--
>   include/uapi/linux/kfd_ioctl.h                     |  3 +-
>   65 files changed, 635 insertions(+), 302 deletions(-)