* [pull] amdgpu, amdkfd drm-next-5.17
@ 2021-12-29 16:46 Alex Deucher
2021-12-30 5:24 ` Dave Airlie
0 siblings, 1 reply; 7+ messages in thread
From: Alex Deucher @ 2021-12-29 16:46 UTC (permalink / raw)
To: amd-gfx, dri-devel, airlied, daniel.vetter; +Cc: Alex Deucher
Hi Dave, Daniel,
Fixes for 5.17.
The following changes since commit a342655865b2f14d1fbf346356d3b3360e63e872:
drm/radeon: Fix syntax errors in comments (2021-12-14 16:11:02 -0500)
are available in the Git repository at:
https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.17-2021-12-29
for you to fetch changes up to 46dbcbf47e6871e142ada8a8188b7a4fc8f1d808:
drm/amdgpu: no DC support for headless chips (2021-12-28 16:17:49 -0500)
----------------------------------------------------------------
amd-drm-next-5.17-2021-12-29:
- Suspend/resume fixes
- Fence fix
- Misc code cleanups
- IP discovery fixes
- SRIOV fixes
- RAS fixes
- GMC 8 VRAM detection fix
- FRU fixes for Aldebaran
- Display fixes
amdkfd:
- SVM fixes
- IP discovery fixes
----------------------------------------------------------------
Alex Deucher (5):
drm/amdgpu: clean up some leftovers from bring up
drm/amdgpu: add support for IP discovery gc_info table v2
drm/amdgpu: fix runpm documentation
drm/amdgpu: always reset the asic in suspend (v2)
drm/amdgpu: no DC support for headless chips
Alvin Lee (1):
drm/amd/display: Fix check for null function ptr
Angus Wang (1):
drm/amd/display: Changed pipe split policy to allow for multi-display pipe split
Anthony Koo (1):
drm/amd/display: [FW Promotion] Release 0.0.98
Aric Cyr (1):
drm/amd/display: 3.2.167
Bokun Zhang (1):
drm/amdgpu: Filter security violation registers
Changcheng Deng (1):
drm/amdkfd: use max() and min() to make code cleaner
Charlene Liu (1):
drm/amd/display: fix B0 TMDS deepcolor no dislay issue
Evan Quan (1):
drm/amdgpu: put SMU into proper state on runpm suspending for BOCO capable platform
George Shen (2):
drm/amd/display: Limit max link cap with LTTPR caps
drm/amd/display: Remove CR AUX RD Interval limit for LTTPR
Guchun Chen (2):
drm/amdkfd: correct sdma queue number in kfd device init (v3)
drm/amdgpu: drop redundant semicolon
Huang Rui (1):
drm/amdgpu: introduce new amdgpu_fence object to indicate the job embedded fence
Jiapeng Chong (1):
drm/amd/display: Fix warning comparing pointer to 0
José Expósito (1):
drm/amd/display: fix dereference before NULL check
Kent Russell (4):
drm/amdgpu: Increase potential product_name to 64 characters
drm/amdgpu: Enable unique_id for Aldebaran
drm/amdgpu: Only overwrite serial if field is empty
drm/amdgpu: Access the FRU on Aldebaran
Lai, Derek (1):
drm/amd/display: Added power down for DCN10
Leslie Shi (1):
drm/amdgpu: Call amdgpu_device_unmap_mmio() if device is unplugged to prevent crash in GPU initialization failure
Lijo Lazar (1):
drm/amd/pm: Fix xgmi link control on aldebaran
Marina Nikolic (1):
amdgpu/pm: Make sysfs pm attributes as read-only for VFs
Mario Limonciello (2):
drivers/amd/pm: smu13: use local variable adev
drm/amd/pm: restore SMU version print statement for dGPUs
Martin Leung (1):
drm/amd/display: Undo ODM combine
Nicholas Kazlauskas (4):
drm/amd/display: Fix USB4 null pointer dereference in update_psp_stream_config
drm/amd/display: Block z-states when stutter period exceeds criteria
drm/amd/display: Send s0i2_rdy in stream_count == 0 optimization
drm/amd/display: Set optimize_pwr_state for DCN31
Philip Yang (1):
drm/amdkfd: fix svm_bo release invalid wait context warning
Prike Liang (1):
drm/amd/pm: skip setting gfx cgpg in the s0ix suspend-resume
Rajneesh Bhardwaj (1):
drm/amdgpu: Don't inherit GEM object VMAs in child process
Shen, George (1):
drm/amd/display: Refactor vendor specific link training sequence
Surbhi Kakarya (1):
drm/amdgpu: Check the memory can be accesssed by ttm_device_clear_dma_mappings.
Tao Zhou (5):
drm/amdgpu: add gpu reset control for umc page retirement
drm/amdkfd: add reset parameter for unmap queues
drm/amdkfd: add reset queue function for RAS poison (v2)
drm/amdkfd: reset queue which consumes RAS poison (v2)
drm/amdgpu: save error count in RAS poison handler
Victor Skvortsov (6):
drm/amdgpu: Separate vf2pf work item init from virt data exchange
drm/amdgpu: Add *_SOC15_IP_NO_KIQ() macro definitions
drm/amdgpu: Modify indirect register access for gmc_v9_0 sriov
drm/amdgpu: Modify indirect register access for amdkfd_gfx_v9 sriov
drm/amdgpu: get xgmi info before ip_init
drm/amdgpu: Modify indirect register access for gfx9 sriov
Wenjing Liu (5):
drm/amd/display: define link res and make it accessible to all link interfaces
drm/amd/display: populate link res in both detection and validation
drm/amd/display: access hpo dp link encoder only through link resource
drm/amd/display: support dynamic HPO DP link encoder allocation
drm/amd/display: get and restore link res map
Wesley Chalmers (1):
drm/amd/display: Add reg defs for DCN303
Yizhuo Zhai (1):
drm/amd/display: Fix the uninitialized variable in enable_stream_features()
Zongmin Zhou (1):
drm/amdgpu: fixup bad vram size on gmc v8
chen gong (1):
drm/amdgpu: When the VCN(1.0) block is suspended, powergating is explicitly enabled
sashank saye (1):
drm/amdgpu: Send Message to SMU on aldebaran passthrough for sbr handling
yipechai (1):
drm/amdgpu: Remove the redundant code of psp bootloader functions
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 27 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 46 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 78 +++-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 27 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 126 ++++--
drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 25 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 +
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 167 ++++---
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 36 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 1 +
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 117 +++--
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 6 -
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 +-
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 63 ++-
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 78 +---
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 83 ++--
drivers/gpu/drm/amd/amdgpu/soc15_common.h | 5 +
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 7 +
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 80 +++-
.../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 28 +-
.../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 5 +
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 44 +-
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +
drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 35 +-
drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 3 +-
.../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 2 +-
.../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 1 +
drivers/gpu/drm/amd/display/dc/core/dc.c | 18 -
drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 +
drivers/gpu/drm/amd/display/dc/core/dc_link.c | 241 +++++++---
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 501 ++++++++++++++++++---
drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c | 48 +-
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 63 +--
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 199 +++++---
drivers/gpu/drm/amd/display/dc/dc.h | 3 +-
drivers/gpu/drm/amd/display/dc/dc_link.h | 15 +-
.../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 14 +-
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 +
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 2 +-
.../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 5 +-
.../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 3 +-
.../drm/amd/display/dc/dcn201/dcn201_resource.c | 2 +-
.../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +-
.../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 13 +-
.../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +-
.../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +-
.../gpu/drm/amd/display/dc/dcn303/dcn303_dccg.h | 20 +-
.../drm/amd/display/dc/dcn303/dcn303_resource.c | 2 +-
.../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6 +-
.../display/dc/dcn31/dcn31_hpo_dp_link_encoder.h | 3 +-
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 1 +
.../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 27 +-
.../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 31 ++
drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c | 2 +-
drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 +
drivers/gpu/drm/amd/display/dc/inc/core_types.h | 17 +
drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 15 +-
drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h | 5 +-
.../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 +-
drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 10 +-
drivers/gpu/drm/amd/display/dc/inc/resource.h | 6 +-
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +-
drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 4 +-
.../amd/include/asic_reg/nbio/nbio_7_2_0_offset.h | 2 -
.../amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h | 12 -
drivers/gpu/drm/amd/include/discovery.h | 49 ++
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 9 +-
drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 4 +-
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 6 +-
drivers/gpu/drm/amd/pm/inc/smu_types.h | 3 +-
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 +-
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 13 +-
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 2 +-
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +-
drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 3 +-
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 15 +-
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 15 +-
83 files changed, 1814 insertions(+), 747 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [pull] amdgpu, amdkfd drm-next-5.17
2021-12-29 16:46 [pull] amdgpu, amdkfd drm-next-5.17 Alex Deucher
@ 2021-12-30 5:24 ` Dave Airlie
0 siblings, 0 replies; 7+ messages in thread
From: Dave Airlie @ 2021-12-30 5:24 UTC (permalink / raw)
To: Alex Deucher; +Cc: Daniel Vetter, dri-devel, amd-gfx mailing list
Hey,
dim: 3be2709660dc ("drm/amdgpu: Call amdgpu_device_unmap_mmio() if
device is unplugged to prevent crash in GPU initialization failure"):
committer Signed-off-by missing.
is missing your sob as you committed it. Please fix it up.
Thanks,
Dave.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [pull] amdgpu, amdkfd drm-next-5.17
2022-01-14 13:13 ` Daniel Vetter
@ 2022-01-14 13:50 ` Daniel Vetter
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2022-01-14 13:50 UTC (permalink / raw)
To: Alex Deucher; +Cc: daniel.vetter, dri-devel, amd-gfx
On Fri, Jan 14, 2022 at 02:13:30PM +0100, Daniel Vetter wrote:
> 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.
Ok I lied, it fails to compile on 32bit arm at least:
ERROR: modpost: "__bad_udelay" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
make[1]: *** [scripts/Makefile.modpost:134: modules-only.symvers] Error 1
make[1]: *** Deleting file 'modules-only.symvers'
make: *** [Makefile:1761: modules] Error 2
make: *** Waiting for unfinished jobs....
Dropping the pull.
-Daniel
> -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
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [pull] amdgpu, amdkfd drm-next-5.17
2022-01-13 3:05 Alex Deucher
@ 2022-01-14 13:13 ` Daniel Vetter
2022-01-14 13:50 ` Daniel Vetter
0 siblings, 1 reply; 7+ messages in thread
From: Daniel Vetter @ 2022-01-14 13:13 UTC (permalink / raw)
To: Alex Deucher; +Cc: daniel.vetter, dri-devel, amd-gfx
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [pull] amdgpu, amdkfd drm-next-5.17
@ 2022-01-13 3:05 Alex Deucher
2022-01-14 13:13 ` Daniel Vetter
0 siblings, 1 reply; 7+ messages in thread
From: Alex Deucher @ 2022-01-13 3:05 UTC (permalink / raw)
To: amd-gfx, dri-devel, airlied, daniel.vetter; +Cc: Alex Deucher
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)
----------------------------------------------------------------
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(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [pull] amdgpu, amdkfd drm-next-5.17
@ 2021-12-30 14:10 Alex Deucher
0 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2021-12-30 14:10 UTC (permalink / raw)
To: amd-gfx, dri-devel, airlied, daniel.vetter; +Cc: Alex Deucher
Hi Dave, Daniel,
Fixes for 5.17. Now with more S-o-b.
The following changes since commit a342655865b2f14d1fbf346356d3b3360e63e872:
drm/radeon: Fix syntax errors in comments (2021-12-14 16:11:02 -0500)
are available in the Git repository at:
https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.17-2021-12-30
for you to fetch changes up to 0637d41786a3a9551f33ad8e15bdb40416362028:
drm/amdgpu: no DC support for headless chips (2021-12-30 08:54:45 -0500)
----------------------------------------------------------------
amd-drm-next-5.17-2021-12-30:
amdgpu:
- Suspend/resume fixes
- Fence fix
- Misc code cleanups
- IP discovery fixes
- SRIOV fixes
- RAS fixes
- GMC 8 VRAM detection fix
- FRU fixes for Aldebaran
- Display fixes
amdkfd:
- SVM fixes
- IP discovery fixes
----------------------------------------------------------------
Alex Deucher (5):
drm/amdgpu: clean up some leftovers from bring up
drm/amdgpu: add support for IP discovery gc_info table v2
drm/amdgpu: fix runpm documentation
drm/amdgpu: always reset the asic in suspend (v2)
drm/amdgpu: no DC support for headless chips
Alvin Lee (1):
drm/amd/display: Fix check for null function ptr
Angus Wang (1):
drm/amd/display: Changed pipe split policy to allow for multi-display pipe split
Anthony Koo (1):
drm/amd/display: [FW Promotion] Release 0.0.98
Aric Cyr (1):
drm/amd/display: 3.2.167
Bokun Zhang (1):
drm/amdgpu: Filter security violation registers
Changcheng Deng (1):
drm/amdkfd: use max() and min() to make code cleaner
Charlene Liu (1):
drm/amd/display: fix B0 TMDS deepcolor no dislay issue
Evan Quan (1):
drm/amdgpu: put SMU into proper state on runpm suspending for BOCO capable platform
George Shen (2):
drm/amd/display: Limit max link cap with LTTPR caps
drm/amd/display: Remove CR AUX RD Interval limit for LTTPR
Guchun Chen (2):
drm/amdkfd: correct sdma queue number in kfd device init (v3)
drm/amdgpu: drop redundant semicolon
Huang Rui (1):
drm/amdgpu: introduce new amdgpu_fence object to indicate the job embedded fence
Jiapeng Chong (1):
drm/amd/display: Fix warning comparing pointer to 0
José Expósito (1):
drm/amd/display: fix dereference before NULL check
Kent Russell (4):
drm/amdgpu: Increase potential product_name to 64 characters
drm/amdgpu: Enable unique_id for Aldebaran
drm/amdgpu: Only overwrite serial if field is empty
drm/amdgpu: Access the FRU on Aldebaran
Lai, Derek (1):
drm/amd/display: Added power down for DCN10
Leslie Shi (1):
drm/amdgpu: Call amdgpu_device_unmap_mmio() if device is unplugged to prevent crash in GPU initialization failure
Lijo Lazar (1):
drm/amd/pm: Fix xgmi link control on aldebaran
Marina Nikolic (1):
amdgpu/pm: Make sysfs pm attributes as read-only for VFs
Mario Limonciello (2):
drivers/amd/pm: smu13: use local variable adev
drm/amd/pm: restore SMU version print statement for dGPUs
Martin Leung (1):
drm/amd/display: Undo ODM combine
Nicholas Kazlauskas (4):
drm/amd/display: Fix USB4 null pointer dereference in update_psp_stream_config
drm/amd/display: Block z-states when stutter period exceeds criteria
drm/amd/display: Send s0i2_rdy in stream_count == 0 optimization
drm/amd/display: Set optimize_pwr_state for DCN31
Philip Yang (1):
drm/amdkfd: fix svm_bo release invalid wait context warning
Prike Liang (1):
drm/amd/pm: skip setting gfx cgpg in the s0ix suspend-resume
Rajneesh Bhardwaj (1):
drm/amdgpu: Don't inherit GEM object VMAs in child process
Shen, George (1):
drm/amd/display: Refactor vendor specific link training sequence
Surbhi Kakarya (1):
drm/amdgpu: Check the memory can be accesssed by ttm_device_clear_dma_mappings.
Tao Zhou (5):
drm/amdgpu: add gpu reset control for umc page retirement
drm/amdkfd: add reset parameter for unmap queues
drm/amdkfd: add reset queue function for RAS poison (v2)
drm/amdkfd: reset queue which consumes RAS poison (v2)
drm/amdgpu: save error count in RAS poison handler
Victor Skvortsov (6):
drm/amdgpu: Separate vf2pf work item init from virt data exchange
drm/amdgpu: Add *_SOC15_IP_NO_KIQ() macro definitions
drm/amdgpu: Modify indirect register access for gmc_v9_0 sriov
drm/amdgpu: Modify indirect register access for amdkfd_gfx_v9 sriov
drm/amdgpu: get xgmi info before ip_init
drm/amdgpu: Modify indirect register access for gfx9 sriov
Wenjing Liu (5):
drm/amd/display: define link res and make it accessible to all link interfaces
drm/amd/display: populate link res in both detection and validation
drm/amd/display: access hpo dp link encoder only through link resource
drm/amd/display: support dynamic HPO DP link encoder allocation
drm/amd/display: get and restore link res map
Wesley Chalmers (1):
drm/amd/display: Add reg defs for DCN303
Yizhuo Zhai (1):
drm/amd/display: Fix the uninitialized variable in enable_stream_features()
Zongmin Zhou (1):
drm/amdgpu: fixup bad vram size on gmc v8
chen gong (1):
drm/amdgpu: When the VCN(1.0) block is suspended, powergating is explicitly enabled
sashank saye (1):
drm/amdgpu: Send Message to SMU on aldebaran passthrough for sbr handling
yipechai (1):
drm/amdgpu: Remove the redundant code of psp bootloader functions
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 27 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 46 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 78 +++-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 27 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 126 ++++--
drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 25 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 +
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 167 ++++---
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 36 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 1 +
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 117 +++--
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 6 -
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 +-
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 63 ++-
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 78 +---
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 83 ++--
drivers/gpu/drm/amd/amdgpu/soc15_common.h | 5 +
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 7 +
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 80 +++-
.../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 28 +-
.../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 5 +
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 44 +-
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +
drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 35 +-
drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 3 +-
.../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 2 +-
.../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 1 +
drivers/gpu/drm/amd/display/dc/core/dc.c | 18 -
drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 +
drivers/gpu/drm/amd/display/dc/core/dc_link.c | 241 +++++++---
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 501 ++++++++++++++++++---
drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c | 48 +-
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 63 +--
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 199 +++++---
drivers/gpu/drm/amd/display/dc/dc.h | 3 +-
drivers/gpu/drm/amd/display/dc/dc_link.h | 15 +-
.../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 14 +-
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 +
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 2 +-
.../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 5 +-
.../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 3 +-
.../drm/amd/display/dc/dcn201/dcn201_resource.c | 2 +-
.../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +-
.../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 13 +-
.../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +-
.../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +-
.../gpu/drm/amd/display/dc/dcn303/dcn303_dccg.h | 20 +-
.../drm/amd/display/dc/dcn303/dcn303_resource.c | 2 +-
.../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6 +-
.../display/dc/dcn31/dcn31_hpo_dp_link_encoder.h | 3 +-
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 1 +
.../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 27 +-
.../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 31 ++
drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c | 2 +-
drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 +
drivers/gpu/drm/amd/display/dc/inc/core_types.h | 17 +
drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 15 +-
drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h | 5 +-
.../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 +-
drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 10 +-
drivers/gpu/drm/amd/display/dc/inc/resource.h | 6 +-
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +-
drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 4 +-
.../amd/include/asic_reg/nbio/nbio_7_2_0_offset.h | 2 -
.../amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h | 12 -
drivers/gpu/drm/amd/include/discovery.h | 49 ++
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 9 +-
drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 4 +-
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 6 +-
drivers/gpu/drm/amd/pm/inc/smu_types.h | 3 +-
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 +-
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 13 +-
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 2 +-
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +-
drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 3 +-
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 15 +-
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 15 +-
83 files changed, 1814 insertions(+), 747 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [pull] amdgpu, amdkfd drm-next-5.17
@ 2021-12-10 22:56 Alex Deucher
0 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2021-12-10 22:56 UTC (permalink / raw)
To: amd-gfx, dri-devel, airlied, daniel.vetter; +Cc: Alex Deucher
Hi Dave, Daniel,
More stuff for 5.17.
The following changes since commit 70897848730470cc477d5d89e6222c0f6a9ac173:
drm/amdgpu/display: Only set vblank_disable_immediate when PSR is not enabled (2021-12-01 16:00:58 -0500)
are available in the Git repository at:
https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.17-2021-12-10
for you to fetch changes up to 3c021931023a30316db415044531b116b85e6ebd:
drm/amdgpu: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi (2021-12-07 13:13:07 -0500)
----------------------------------------------------------------
amd-drm-next-5.17-2021-12-10:
amdgpu:
- warning fixes
- vkms fixes
- Misc code cleanups
- RAS fixes
- IH fixes
- DP to HDMI PCON support
- DSC MST fixes
- LTTPR fixes
- Misc display fixes
amdkfd:
- Misc code cleanups
- Double free fix
- More IP version enumeration changes and cleanups
----------------------------------------------------------------
Alex Deucher (1):
drm/amdgpu: handle SRIOV VCN revision parsing
Anthony Koo (2):
drm/amd/display: [FW Promotion] Release 0.0.95
drm/amd/display: [FW Promotion] Release 0.0.96
Aric Cyr (2):
drm/amd/display: 3.2.164
drm/amd/display: Reduce stack usage
Brandon Syu (1):
drm/amd/display: Fix dual eDP abnormal display issue
Christophe JAILLET (2):
drm/amdkfd: Use bitmap_zalloc() when applicable
drm/amdkfd: Slighly optimize 'init_doorbell_bitmap()'
Claudio Suarez (3):
drm/amdgpu: update drm_display_info correctly when the edid is read
drm/amdgpu: use drm_edid_get_monitor_name() instead of duplicating the code
drm/amdgpu: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi
Dale Zhao (1):
drm/amd/display: add hdmi disable debug check
Darren Powell (2):
amdgpu/pm: Create shared array of power profile name strings
amdgpu/pm: Modify implmentations of get_power_profile_mode to use amdgpu_pp_profile_name
Evgenii Krasnikov (1):
drm/amd/display: add function for eDP and backlight power on
Fangzhi Zuo (2):
drm/amd/display: Add DP-HDMI FRL PCON SST Support in DM
drm/amd/display: Add DP-HDMI FRL PCON Support in DC
Flora Cui (5):
drm/amdgpu: cancel the correct hrtimer on exit
drm/amdgpu: fix vkms crtc settings
drm/amdgpu: check atomic flag to differeniate with legacy path
drm/amdgpu: drop the critial WARN_ON in amdgpu_vkms
drm/amdgpu: free vkms_output after use
George Shen (5):
drm/amd/display: Add vendor specific LTTPR workarounds for DCN31
drm/amd/display: Skip vendor specific LTTPR w/a outside link training
drm/amd/display: Add 16ms AUX RD interval W/A for specific LTTPR
drm/amd/display: Apply LTTPR workarounds to non-transparent mode
drm/amd/display: Add W/A for PHY tests with certain LTTPR
Graham Sider (3):
drm/amdkfd: replace asic_name with amdgpu_asic_name
drm/amdkfd: add kfd_device_info_init function
drm/amdkfd: remove hardcoded device_info structs
Guchun Chen (2):
drm/amdgpu: declare static function to fix compiler warning
drm/amdgpu: fix the missed handling for SDMA2 and SDMA3
Jane Jian (1):
drm/amdgpu/sriov/vcn: add new vcn ip revision check case for SIENNA_CICHLID
Jarif Aftab (1):
drm/amd/display: Added Check For dc->res_pool
Jiapeng Chong (1):
drm/amd/display: Fix warning comparing pointer to 0
Jimmy Kizito (1):
drm/amd/display: Add work around for tunneled MST.
Jude Shih (1):
drm/amd/display: Move link_enc init logic to DC
Lijo Lazar (3):
drm/amd/pm: Add warning for unexpected PG requests
drm/amdgpu: Use MAX_HWIP instead of HW_ID_MAX
drm/amdgpu: Don't halt RLC on GFX suspend
Lv Ruyi (1):
drm/amd/display: fix application of sizeof to pointer
Meenakshikumar Somasundaram (2):
drm/amd/display: Fix for otg synchronization logic
drm/amd/display: Adding dpia debug bits for hpd delay
Michael Strauss (1):
drm/amd/display: Add force detile buffer size debug flag
Mikita Lipski (2):
drm/amd/display: PSR panel capability debugfs
drm/amd/display: prevent reading unitialized links
Mustapha Ghaddar (1):
drm/amd/display: Fix for the no Audio bug with Tiled Displays
Nicholas Kazlauskas (4):
drm/amd/display: Allow DSC on supported MST branch devices
drm/amd/display: Fix DPIA outbox timeout after S3/S4/reset
drm/amd/display: Query DMCUB for dp alt status
drm/amd/display: Fix out of bounds access on DNC31 stream encoder regs
Oliver Logush (1):
drm/amd/display: Rename a struct field to describe a cea component better
Perry Yuan (1):
drm/amd/display: add connector type check for CRC source set
Philip Yang (5):
drm/amdgpu: handle IH ring1 overflow
drm/amdkfd: set "r = 0" explicitly before goto
drm/amdkfd: fix double free mem structure
drm/amdkfd: process_info lock not needed for svm
drm/amdkfd: err_pin_bo path leaks kfd_bo_list
Shen, George (1):
drm/amd/display: Clear DPCD lane settings after repeater training
Stanley.Yang (4):
drm/amdgpu: fix disable ras feature failed when unload drvier v2
drm/amdgpu: skip query ecc info in gpu recovery
drm/amdgpu: only skip get ecc info for aldebaran
drm/amdgpu: skip umc ras error count harvest
Stylon Wang (1):
drm/amd/display: Enable P010 for DCN3x ASICs
Vlad Zahorodnii (1):
drm/amd/display: Use oriented source size when checking cursor scaling
Wayne Lin (1):
drm/amd/display: Fix bug in debugfs crc_win_update entry
Wenjing Liu (1):
drm/amd/display: add a debug option to force dp2 lt fallback method
Wyatt Wood (1):
drm/amd/display: Prevent PSR disable/reenable in HPD IRQ
Yann Dirson (1):
drm/amdgpu: update fw_load_type module parameter doc to match code
Zhou Qingyang (2):
drm/amdgpu: Fix a NULL pointer dereference in amdgpu_connector_lcd_native_mode()
drm/radeon/radeon_kms: Fix a NULL pointer dereference in radeon_driver_open_kms()
chen gong (1):
drm/amdkfd: Correct the value of the no_atomic_fw_version variable
shaoyunl (1):
drm/amdgpu: adjust the kfd reset sequence in reset sriov function
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 22 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 23 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 21 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 18 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 55 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 16 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 +
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 11 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 1 -
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 57 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h | 5 +-
drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 6 +-
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +-
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 1 +
drivers/gpu/drm/amd/amdgpu/nv.c | 1 -
drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 1 +
drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 1 +
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 744 +++++----------------
.../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 8 +-
drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 8 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 18 +-
drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 6 +-
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +-
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 13 +-
.../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 9 +-
drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 15 +-
drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 18 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 99 ++-
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 8 +
.../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 49 +-
.../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 50 +-
.../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 20 +-
drivers/gpu/drm/amd/display/dc/core/dc.c | 47 +-
drivers/gpu/drm/amd/display/dc/core/dc_link.c | 31 +
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 408 ++++++++++-
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 78 ++-
drivers/gpu/drm/amd/display/dc/dc.h | 27 +-
drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 31 +
drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 3 +
drivers/gpu/drm/amd/display/dc/dc_link.h | 9 +
drivers/gpu/drm/amd/display/dc/dc_types.h | 1 +
.../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 5 +-
.../amd/display/dc/dce110/dce110_hw_sequencer.c | 16 +-
.../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 5 +-
.../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +
.../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +
.../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +-
.../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +-
.../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +-
.../drm/amd/display/dc/dcn303/dcn303_resource.c | 2 +-
.../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 97 +--
.../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 13 +-
drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 +-
drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c | 4 +-
.../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 2 +-
drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 +
drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 2 +
drivers/gpu/drm/amd/display/dc/inc/resource.h | 11 +
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 35 +-
drivers/gpu/drm/amd/include/kgd_pp_interface.h | 4 +
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 10 +
.../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 9 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 14 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 12 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 10 +-
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 +-
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 10 +-
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 10 +-
.../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 10 +-
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 10 +-
drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 10 +-
drivers/gpu/drm/radeon/radeon_kms.c | 36 +-
85 files changed, 1338 insertions(+), 1016 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-01-14 13:50 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-29 16:46 [pull] amdgpu, amdkfd drm-next-5.17 Alex Deucher
2021-12-30 5:24 ` Dave Airlie
-- strict thread matches above, loose matches on Subject: below --
2022-01-13 3:05 Alex Deucher
2022-01-14 13:13 ` Daniel Vetter
2022-01-14 13:50 ` Daniel Vetter
2021-12-30 14:10 Alex Deucher
2021-12-10 22:56 Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).