Re: [pull] amdgpu, amdkfd drm-next-5.18
On Fri, Mar 25, 2022 at 2:36 PM Alex Deucher wrote: > > Hi Dave, Daniel, > > Fixes for 5.18. Just wanted to make sure this didn't get missed. This fixes some warning splat reported by Linus, et al. Alex > > The following changes since commit c6e90a1c660874736bd09c1fec6312b4b4c2ff7b: > > Merge tag 'amd-drm-next-5.18-2022-03-18' of > https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-03-21 13:48:20 > +1000) > > are available in the Git repository at: > > https://gitlab.freedesktop.org/agd5f/linux.git > tags/amd-drm-next-5.18-2022-03-25 > > for you to fetch changes up to 15f9cd4334c83716fa32647652a609e3ba6c998d: > > drm/amdgpu/gfx10: enable gfx1037 clock counter retrieval function > (2022-03-25 12:40:25 -0400) > > > amd-drm-next-5.18-2022-03-25: > > amdgpu: > - GFX 10.3.7 fixes > - noretry updates > - VCN fixes > - TMDS fix > - zstate fix for freesync video > - DCN 3.1.5 fix > - Display stack size fix > - Audio fix > - DCN 3.1 pstate fix > - TMZ VCN fix > - APU passthrough fix > - Misc other fixes > > amdkfd: > - Error handling fix > - xgmi p2p fix > - HWS VMIDs fix > > > Alex Deucher (2): > drm/amdgpu/gmc: use PCI BARs for APUs in passthrough > drm/amdgpu: add more cases to noretry=1 > > Aurabindo Pillai (1): > drm/amd: Add USBC connector ID > > Charlene Liu (2): > drm/amd/display: fix audio format not updated after edid updated > drm/amd/display: remove destructive verify link for TMDS > > Chiawen Huang (1): > drm/amd/display: FEC check in timing validation > > Dan Carpenter (1): > drm/amdgpu: fix off by one in amdgpu_gfx_kiq_acquire() > > Divya Shikre (1): > drm/amdkfd: Check use_xgmi_p2p before reporting hive_id > > Emily Deng (1): > drm/amdgpu/vcn: Fix the register setting for vcn1 > > Felix Kuehling (1): > drm/amdgpu: set noretry=1 for GFX 10.3.4 > > Gabe Teeger (1): > drm/amd/display: Add support for zstate during extended vblank > > Guchun Chen (2): > drm/amdgpu: prevent memory wipe in suspend/shutdown stage > drm/amdgpu: conduct a proper cleanup of PDB bo > > Lang Yu (1): > drm/amdgpu: add workarounds for VCN TMZ issue on CHIP_RAVEN > > Leo (Hanghong) Ma (1): > drm/amd/display: Update VTEM Infopacket definition > > Nicholas Kazlauskas (1): > drm/amd/display: Fix p-state allow debug index on dcn31 > > Oliver Logush (1): > drm/amd/display: Add fSMC_MSG_SetDtbClk support > > Prike Liang (2): > drm/amdgpu: set noretry for gfx 10.3.7 > drm/amdgpu/gfx10: enable gfx1037 clock counter retrieval function > > QintaoShen (1): > drm/amdkfd: Check for potential null return of kmalloc_array() > > Rodrigo Siqueira (1): > drm/amd/display: Reduce stack size > > Stanley.Yang (1): > drm/amdgpu/pm: add asic smu support check > > Tianci Yin (1): > drm/amdgpu/vcn: improve vcn dpg stop procedure > > Tushar Patel (1): > drm/amdkfd: Fix Incorrect VMIDs passed to HWS > > Yifan Zhang (2): > drm/amdgpu/pm: fix the Stable pstate Test in amdgpu_test > drm/amdgpu: set noretry=1 for gc 10.3.6 > > drivers/gpu/drm/amd/amdgpu/ObjectID.h | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c| 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c| 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c| 6 ++ > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 1 + > drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +- > drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 71 > ++ > drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 7 ++- > drivers/gpu/drm/amd/amdkfd/kfd_device.c| 14 ++--- > drivers/gpu/drm/amd/amdkfd/kfd_events.c| 2 + > .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 19 -- > .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.h | 4 +- > drivers/gpu/drm/amd/display/dc/core/dc.c | 23 +++ > drivers/gpu/drm/amd/display/dc/core/dc_link.c | 3 +- > drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 +- > drivers/gpu/drm/amd/display/dc/dc.h| 6 +- > drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 + > .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 8 ++- > drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 > .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c| 2 + > drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 8 +++ > .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 1 + > .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c |
[pull] amdgpu, amdkfd drm-next-5.18
Hi Dave, Daniel, Fixes for 5.18. The following changes since commit c6e90a1c660874736bd09c1fec6312b4b4c2ff7b: Merge tag 'amd-drm-next-5.18-2022-03-18' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-03-21 13:48:20 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.18-2022-03-25 for you to fetch changes up to 15f9cd4334c83716fa32647652a609e3ba6c998d: drm/amdgpu/gfx10: enable gfx1037 clock counter retrieval function (2022-03-25 12:40:25 -0400) amd-drm-next-5.18-2022-03-25: amdgpu: - GFX 10.3.7 fixes - noretry updates - VCN fixes - TMDS fix - zstate fix for freesync video - DCN 3.1.5 fix - Display stack size fix - Audio fix - DCN 3.1 pstate fix - TMZ VCN fix - APU passthrough fix - Misc other fixes amdkfd: - Error handling fix - xgmi p2p fix - HWS VMIDs fix Alex Deucher (2): drm/amdgpu/gmc: use PCI BARs for APUs in passthrough drm/amdgpu: add more cases to noretry=1 Aurabindo Pillai (1): drm/amd: Add USBC connector ID Charlene Liu (2): drm/amd/display: fix audio format not updated after edid updated drm/amd/display: remove destructive verify link for TMDS Chiawen Huang (1): drm/amd/display: FEC check in timing validation Dan Carpenter (1): drm/amdgpu: fix off by one in amdgpu_gfx_kiq_acquire() Divya Shikre (1): drm/amdkfd: Check use_xgmi_p2p before reporting hive_id Emily Deng (1): drm/amdgpu/vcn: Fix the register setting for vcn1 Felix Kuehling (1): drm/amdgpu: set noretry=1 for GFX 10.3.4 Gabe Teeger (1): drm/amd/display: Add support for zstate during extended vblank Guchun Chen (2): drm/amdgpu: prevent memory wipe in suspend/shutdown stage drm/amdgpu: conduct a proper cleanup of PDB bo Lang Yu (1): drm/amdgpu: add workarounds for VCN TMZ issue on CHIP_RAVEN Leo (Hanghong) Ma (1): drm/amd/display: Update VTEM Infopacket definition Nicholas Kazlauskas (1): drm/amd/display: Fix p-state allow debug index on dcn31 Oliver Logush (1): drm/amd/display: Add fSMC_MSG_SetDtbClk support Prike Liang (2): drm/amdgpu: set noretry for gfx 10.3.7 drm/amdgpu/gfx10: enable gfx1037 clock counter retrieval function QintaoShen (1): drm/amdkfd: Check for potential null return of kmalloc_array() Rodrigo Siqueira (1): drm/amd/display: Reduce stack size Stanley.Yang (1): drm/amdgpu/pm: add asic smu support check Tianci Yin (1): drm/amdgpu/vcn: improve vcn dpg stop procedure Tushar Patel (1): drm/amdkfd: Fix Incorrect VMIDs passed to HWS Yifan Zhang (2): drm/amdgpu/pm: fix the Stable pstate Test in amdgpu_test drm/amdgpu: set noretry=1 for gc 10.3.6 drivers/gpu/drm/amd/amdgpu/ObjectID.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c| 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c| 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c| 6 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 71 ++ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 7 ++- drivers/gpu/drm/amd/amdkfd/kfd_device.c| 14 ++--- drivers/gpu/drm/amd/amdkfd/kfd_events.c| 2 + .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 19 -- .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.h | 4 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 23 +++ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 3 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/dc.h| 6 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 8 ++- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c| 2 + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 8 +++ .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 1 + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 18 +- .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 13 .../drm/amd/display/dc/dml/display_mode_structs.h | 2 + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 3 + .../amd/display/modules/info_packet/info_packet.c | 5 +- drivers/gpu/drm/amd/pm/amdgpu_dpm.c| 6 ++ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 2 +- 34 files changed, 229 insertions(+), 39
[pull] amdgpu, amdkfd drm-next-5.18
Hi Dave, Daniel, Fixes for 5.18. The following changes since commit f6d790e5a7fe42706756c7fa1686d08d230610fc: Merge tag 'drm-intel-next-fixes-2022-03-10' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2022-03-11 13:27:00 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.18-2022-03-18 for you to fetch changes up to 426c89aa203bcec9d9cf6eea36735eafa1b1f099: drm/amdgpu: Use drm_mode_copy() (2022-03-15 15:01:12 -0400) amd-drm-next-5.18-2022-03-18: amdgpu: - Aldebaran fixes - SMU 13.0.5 fixes - DCN 3.1.5 fixes - DCN 3.1.6 fixes - Pipe split fixes - More display FP cleanup - DP 2.0 UHBR fix - DC GPU reset fix - DC deep color ratio fix - SMU robustness fixes - Runtime PM fix for APUs - IGT reload fixes - SR-IOV fix - Misc fixes and cleanups amdkfd: - CRIU fixes - SVM fixes UAPI: - Properly handle SDMA transfers with CRIU Proposed user mode change: https://github.com/checkpoint-restore/criu/pull/1709 Alex Deucher (2): drm/amdgpu/display: enable scatter/gather display for DCN 3.1.6 drm/amdgpu: only check for _PR3 on dGPUs Anthony Koo (2): drm/amd/display: [FW Promotion] Release 0.0.107.0 drm/amd/display: [FW Promotion] Release 0.0.108.0 Aric Cyr (2): drm/amd/display: 3.2.176 drm/amd/display: 3.2.177 Becle Lee (1): drm/amd/display: Wait for hubp read line for Pollock Charlene Liu (5): drm/amd/display: add debug option to bypass ssinfo from bios for dcn315 drm/amd/display: fix the clock source contruct for dcn315 drm/amd/display: merge two duplicated clock_source_create drm/amd/display: enable dcn315/316 s0i2 support drm/amd/display: Add save/restore PANEL_PWRSEQ_REF_DIV2 Chris Park (1): drm/amd/display: Add NULL check Dale Zhao (1): drm/amd/display: Add new enum for EDID status Dan Carpenter (1): drm/amd/pm: fix indenting in __smu_cmn_reg_print_error() David Yat Sin (3): drm/amdkfd: CRIU remove sync and TLB flush on restore drm/amdkfd: CRIU Refactor restore BO function drm/amdkfd: CRIU export dmabuf handles for GTT BOs Dillon Varone (1): drm/amd/display: Add minimal pipe split transition state Eric Yang (1): drm/amd/display: Block zstate when more than one plane enabled George Shen (1): drm/amd/display: Clean up fixed VS PHY test w/a function Hansen Dsouza (1): drm/amd/display: fix deep color ratio Hawking Zhang (1): drm/amdgpu: drop xmgi23 error query/reset support Jasdeep Dhillon (1): drm/amd/display: move FPU associated DCN303 code to DML folder JinZe.Xu (1): drm/amd/display: Add I2C escape to support query device exist. Jing Zhou (2): drm/amd/display: Update engine ddc drm/amd/display: Add null pointer filter Jingwen Zhu (1): drm/amd/display: add gamut coefficient set A and B Jonathan Kim (1): drm/amdgpu: fix aldebaran xgmi topology for vf Julia Lawall (3): drm/amd/pm: fix typos in comments drm/amdgpu: fix typos in comments drm/amdgpu/dc: fix typos in comments Lang Yu (1): drm/amdgpu: only allow secure submission on rings which support that Leo (Hanghong) Ma (2): drm/amd/display: Add link dp trace support drm/amd/display: Add function to get the pipe from the stream context Leo Li (1): drm/amd/display: Fix compile error from TO_CLK_MGR_INTERNAL Leung, Martin (1): drm/amd/display: cleaning up smu_if to add future flexibility Lijo Lazar (2): drm/amdgpu: Disable baco dummy mode drm/amd/pm: Send message when resp status is 0xFC Melissa Wen (3): drm/amd/display: move FPU-related code from dcn20 to dml folder drm/amd/display: move FPU operations from dcn21 to dml/dcn20 folder drm/amd/display: move FPU code from dcn10 to dml/dcn10 folder Nicholas Kazlauskas (2): drm/amd/display: Fix double free during GPU reset on DC streams drm/amd/display: Add pstate verification and recovery for DCN31 Paul Menzel (1): drm/amdgpu: Use ternary operator in `vcn_v1_0_start()` Philip Yang (2): drm/amdgpu: Move reset domain init before calling RREG32 drm/amdkfd: evict svm bo worker handle error Stanley.Yang (3): drm/amd/pm: add send bad channel info function drm/amdgpu: message smu to update bad channel info drm/amd/pm: use pm mutex to protect ecc info table Sung Joon Kim (1): drm/amd/display: disable HPD SW timer for passive dongle type 1 only Tianci Yin (1): drm/amdgpu/vcn: fix vcn ring test failure in igt reload test Tianci.Yin (2): drm/amd/display: fix dp kvm can't light up drm/amd: fix gfx hang on renoir in IGT reload test Ville Syrjälä (3): drm/amdgpu: Remove pointless on stack mode copies drm/radeon: Use drm_mode_copy() drm/amdgpu:
[pull] amdgpu, amdkfd drm-next-5.18
Hi Dave, Daniel, Same PR from last week with fixed Fixes tag, clang warning fix, and a CS rework regression fix. The following changes since commit 38a15ad9488e21cad8f42d3befca20f91e5b2874: Merge tag 'amd-drm-next-5.18-2022-02-25' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-03-01 16:19:02 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.18-2022-03-09 for you to fetch changes up to 96a2f0f2c8006d338a9647e068a15c6eb299f864: drm/amdgpu: fix a wrong ib reference (2022-03-09 17:28:37 -0500) amd-drm-next-5.18-2022-03-09: amdgpu: - Misc code cleanups - Misc display fixes - PSR display fixes - More RAS cleanup - Hotplug fix - Bump minor version for hotplug tests - SR-IOV fixes - GC 10.3.7 updates - Remove some firmwares which are no longer used - Mode2 reset refactor - Aldebaran fixes - Add VCN fwlog feature for VCN debugging - CS code cleanup - Fix clang warning - Fix CS clean up rebase breakage amdkfd: - SVM fixes - SMI event fixes and cleanups - vmid_pasid mapping fix for gfx10.3 Alex Deucher (4): drm/amdgpu: Use IP versions in convert_tiling_flags_to_modifier() drm/amdgpu: remove unused gpu_info firmwares drm/amdgpu/gfx10: drop unused cyan skillfish firmware drm/amdgpu/sdma5: drop unused cyan skillfish firmware Andrey Grodzovsky (2): drm/amdgpu: Fix sigsev when accessing MMIO on hot unplug. drm/amdgpu: Bump minor version for hot plug tests enabling. Anthony Koo (1): drm/amd/display: [FW Promotion] Release 0.0.106.0 Aric Cyr (1): drm/amd/display: 3.2.175 Charlene Liu (1): drm/amd/display: add verify_link_cap back for hdmi Chris Park (1): drm/amd/display: Reset VIC if HDMI_VIC is present Christian König (5): drm/amdgpu: install ctx entities with cmpxchg drm/amdgpu: header cleanup drm/amdgpu: use job and ib structures directly in CS parsers drm/amdgpu: properly embed the IBs into the job drm/amdgpu: initialize the vmid_wait with the stub fence Danijel Slivka (1): drm/amd/pm: new v3 SmuMetrics data structure for Sienna Cichlid David Yu (1): drm/amdgpu: Add DFC CAP support for aldebaran Dillon Varone (2): drm/amd/display: Add frame alternate 3D & restrict HW packed on dongles drm/amd/display: Modify plane removal sequence to avoid hangs. George Shen (1): drm/amd/display: Refactor fixed VS w/a for PHY tests Hansen Dsouza (1): drm/amd/display: Remove invalid RDPCS Programming in DAL Harish Kasiviswanathan (1): drm/amdgpu: Set correct DMA mask for aldebaran Jingwen Chen (1): drm/amd/amdgpu: set disabled vcn to no_schduler Lang Yu (1): drm/amdgpu: fix a wrong ib reference Lijo Lazar (1): drm/amdgpu: Refactor mode2 reset logic for v13.0.2 Luben Tuikov (1): drm/amd/display: Don't fill up the logs Meng Tang (1): gpu/amd: vega10_hwmgr: fix inappropriate private variable name Michael Strauss (1): drm/amd/display: Pass HostVM enable flag into DCN3.1 DML Nicholas Kazlauskas (1): drm/amd/display: Make functional resource functions non-static Philip Yang (4): Revert "drm/amdkfd: process_info lock not needed for svm" drm/amdkfd: Correct SMI event read size drm/amdkfd: Add SMI add event helper drm/amdkfd: Add format attribute to kfd_smi_event_add Prike Liang (4): drm/amdgpu: enable gfx clock gating control for GC 10.3.7 drm/amdgpu/nv: enable clock gating for GC 10.3.7 subblock drm/amdgpu: enable gfx power gating for GC 10.3.7 drm/amdgpu: enable gfxoff routine for GC 10.3.7 Qiang Yu (1): drm/amdgpu: fix suspend/resume hang regression Robin Chen (1): drm/amd/display: Pass deep sleep disabled allow info to dmub fw Ruijing Dong (2): drm/amdgpu/vcn: Update fw shared data structure drm/amdgpu/vcn: Add vcn firmware log Shah Dharati (1): drm/amd/display: Adding a dc_debug option and dmub setting to use PHY FSM for PSR Tom Rix (1): drm/amdgpu: Fix realloc of ptr Weiguo Li (1): drm/amdgpu: remove redundant null check Wesley Chalmers (1): drm/amd/display: Program OPP before ODM Yifan Zha (1): drm/amdgpu: Move CAP firmware loading to the beginning of PSP firmware list Yifan Zhang (5): drm/amdgpu: move amdgpu_gmc_noretry_set after ip_versions populated drm/amdgpu: convert code name to ip version for noretry set drm/amdkfd: judge get_atc_vmid_pasid_mapping_info before call drm/amdkfd: implement get_atc_vmid_pasid_mapping_info for gfx10.3 drm/amdkfd: bail out early if no get_atc_vmid_pasid_mapping_info jinzh (1): drm/amd/display: refine the EDID override yipechai (12): drm/amdgpu: Modify .ras_fini function pointer parameter drm/amdgpu: Optimize xxx_ras_fini
Re: [pull] amdgpu, amdkfd drm-next-5.18
On Thu, 10 Mar 2022 at 08:16, Alex Deucher wrote: > > On Wed, Mar 9, 2022 at 5:12 PM Dave Airlie wrote: > > > > On Tue, 8 Mar 2022 at 06:08, Alex Deucher wrote: > > > > > > Hi Dave, Daniel, > > > > > > Same PR as last week, just fixed up a bad Fixes tag. > > > > > > The following changes since commit > > > 38a15ad9488e21cad8f42d3befca20f91e5b2874: > > > > > > Merge tag 'amd-drm-next-5.18-2022-02-25' of > > > https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-03-01 > > > 16:19:02 +1000) > > > > > > are available in the Git repository at: > > > > > > https://gitlab.freedesktop.org/agd5f/linux.git > > > tags/amd-drm-next-5.18-2022-03-07 > > > > > > for you to fetch changes up to 53b97af4a44abd21344cc9f13986ba53051287bb: > > > > > > drm/amdkfd: Add format attribute to kfd_smi_event_add (2022-03-07 > > > 14:59:59 -0500) > > > > clang says no. > > > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:508:6: > > error: variable 'vmid' is used uninitialized whenever 'if' condition > > is false [-Werror,-Wsometimes-uninitialized] > > if (dev->kfd2kgd->get_atc_vmid_pasid_mapping_info) { > > ^ > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:521:6: > > note: uninitialized use occurs here > > if (vmid > last_vmid_to_scan) { > > ^~~~ > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:508:2: > > note: remove the 'if' if its condition is always true > > if (dev->kfd2kgd->get_atc_vmid_pasid_mapping_info) { > > ^~~ > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:490:19: > > note: initialize the variable 'vmid' to silence this warning > > unsigned int vmid; > > ^ > > = 0 > > > > Already fixed in: > https://gitlab.freedesktop.org/agd5f/linux/-/commit/455331caeea5058d6df20f31a414b68ca502ec25 > was going to send that out with additional fixes this week, but I can > just spin a new PR if you'd prefer. A respin would be great, Thanks, Dave.
Re: [pull] amdgpu, amdkfd drm-next-5.18
On Wed, Mar 9, 2022 at 5:12 PM Dave Airlie wrote: > > On Tue, 8 Mar 2022 at 06:08, Alex Deucher wrote: > > > > Hi Dave, Daniel, > > > > Same PR as last week, just fixed up a bad Fixes tag. > > > > The following changes since commit 38a15ad9488e21cad8f42d3befca20f91e5b2874: > > > > Merge tag 'amd-drm-next-5.18-2022-02-25' of > > https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-03-01 > > 16:19:02 +1000) > > > > are available in the Git repository at: > > > > https://gitlab.freedesktop.org/agd5f/linux.git > > tags/amd-drm-next-5.18-2022-03-07 > > > > for you to fetch changes up to 53b97af4a44abd21344cc9f13986ba53051287bb: > > > > drm/amdkfd: Add format attribute to kfd_smi_event_add (2022-03-07 > > 14:59:59 -0500) > > clang says no. > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:508:6: > error: variable 'vmid' is used uninitialized whenever 'if' condition > is false [-Werror,-Wsometimes-uninitialized] > if (dev->kfd2kgd->get_atc_vmid_pasid_mapping_info) { > ^ > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:521:6: > note: uninitialized use occurs here > if (vmid > last_vmid_to_scan) { > ^~~~ > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:508:2: > note: remove the 'if' if its condition is always true > if (dev->kfd2kgd->get_atc_vmid_pasid_mapping_info) { > ^~~ > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:490:19: > note: initialize the variable 'vmid' to silence this warning > unsigned int vmid; > ^ > = 0 > Already fixed in: https://gitlab.freedesktop.org/agd5f/linux/-/commit/455331caeea5058d6df20f31a414b68ca502ec25 was going to send that out with additional fixes this week, but I can just spin a new PR if you'd prefer. Alex > Dave. > > > > > > amd-drm-next-5.18-2022-03-07: > > > > amdgpu: > > - Misc code cleanups > > - Misc display fixes > > - PSR display fixes > > - More RAS cleanup > > - Hotplug fix > > - Bump minor version for hotplug tests > > - SR-IOV fixes > > - GC 10.3.7 updates > > - Remove some firmwares which are no longer used > > - Mode2 reset refactor > > - Aldebaran fixes > > - Add VCN fwlog feature for VCN debugging > > - CS code cleanup > > > > amdkfd: > > - SVM fixes > > - SMI event fixes and cleanups > > - vmid_pasid mapping fix for gfx10.3 > > > > > > Alex Deucher (4): > > drm/amdgpu: Use IP versions in convert_tiling_flags_to_modifier() > > drm/amdgpu: remove unused gpu_info firmwares > > drm/amdgpu/gfx10: drop unused cyan skillfish firmware > > drm/amdgpu/sdma5: drop unused cyan skillfish firmware > > > > Andrey Grodzovsky (2): > > drm/amdgpu: Fix sigsev when accessing MMIO on hot unplug. > > drm/amdgpu: Bump minor version for hot plug tests enabling. > > > > Anthony Koo (1): > > drm/amd/display: [FW Promotion] Release 0.0.106.0 > > > > Aric Cyr (1): > > drm/amd/display: 3.2.175 > > > > Charlene Liu (1): > > drm/amd/display: add verify_link_cap back for hdmi > > > > Chris Park (1): > > drm/amd/display: Reset VIC if HDMI_VIC is present > > > > Christian König (5): > > drm/amdgpu: install ctx entities with cmpxchg > > drm/amdgpu: header cleanup > > drm/amdgpu: use job and ib structures directly in CS parsers > > drm/amdgpu: properly embed the IBs into the job > > drm/amdgpu: initialize the vmid_wait with the stub fence > > > > Danijel Slivka (1): > > drm/amd/pm: new v3 SmuMetrics data structure for Sienna Cichlid > > > > David Yu (1): > > drm/amdgpu: Add DFC CAP support for aldebaran > > > > Dillon Varone (2): > > drm/amd/display: Add frame alternate 3D & restrict HW packed on > > dongles > > drm/amd/display: Modify plane removal sequence to avoid hangs. > > > > George Shen (1): > > drm/amd/display: Refactor fixed VS w/a for PHY tests > > > > Hansen Dsouza (1): > > drm/amd/display: Remove invalid RDPCS Programming in DAL > > > > Harish Kasiviswanathan (1): > > drm/amdgpu: Set correct DMA mask for aldebaran > > > > Jingwen Chen (1): > > drm/amd/amdgpu: set disabled vcn to no_schduler > > > > Lijo Lazar (1): > > drm/amdgpu: Refactor mode2 reset logic for v13.0.2 > > > > Luben Tuikov (1): > > drm/amd/display: Don't fill up the logs > > > > Meng Tang (1): > > gpu/amd: vega10_hwmgr: fix inappropriate private variable name > > > > Michael Strauss (1): > > drm/amd/display: Pass HostVM enable flag into DCN3.1 DML > > > > Nicholas Kazlauskas (1): > >
Re: [pull] amdgpu, amdkfd drm-next-5.18
On Tue, 8 Mar 2022 at 06:08, Alex Deucher wrote: > > Hi Dave, Daniel, > > Same PR as last week, just fixed up a bad Fixes tag. > > The following changes since commit 38a15ad9488e21cad8f42d3befca20f91e5b2874: > > Merge tag 'amd-drm-next-5.18-2022-02-25' of > https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-03-01 16:19:02 > +1000) > > are available in the Git repository at: > > https://gitlab.freedesktop.org/agd5f/linux.git > tags/amd-drm-next-5.18-2022-03-07 > > for you to fetch changes up to 53b97af4a44abd21344cc9f13986ba53051287bb: > > drm/amdkfd: Add format attribute to kfd_smi_event_add (2022-03-07 14:59:59 > -0500) clang says no. /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:508:6: error: variable 'vmid' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] if (dev->kfd2kgd->get_atc_vmid_pasid_mapping_info) { ^ /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:521:6: note: uninitialized use occurs here if (vmid > last_vmid_to_scan) { ^~~~ /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:508:2: note: remove the 'if' if its condition is always true if (dev->kfd2kgd->get_atc_vmid_pasid_mapping_info) { ^~~ /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device_queue_manager.c:490:19: note: initialize the variable 'vmid' to silence this warning unsigned int vmid; ^ = 0 Dave. > > > amd-drm-next-5.18-2022-03-07: > > amdgpu: > - Misc code cleanups > - Misc display fixes > - PSR display fixes > - More RAS cleanup > - Hotplug fix > - Bump minor version for hotplug tests > - SR-IOV fixes > - GC 10.3.7 updates > - Remove some firmwares which are no longer used > - Mode2 reset refactor > - Aldebaran fixes > - Add VCN fwlog feature for VCN debugging > - CS code cleanup > > amdkfd: > - SVM fixes > - SMI event fixes and cleanups > - vmid_pasid mapping fix for gfx10.3 > > > Alex Deucher (4): > drm/amdgpu: Use IP versions in convert_tiling_flags_to_modifier() > drm/amdgpu: remove unused gpu_info firmwares > drm/amdgpu/gfx10: drop unused cyan skillfish firmware > drm/amdgpu/sdma5: drop unused cyan skillfish firmware > > Andrey Grodzovsky (2): > drm/amdgpu: Fix sigsev when accessing MMIO on hot unplug. > drm/amdgpu: Bump minor version for hot plug tests enabling. > > Anthony Koo (1): > drm/amd/display: [FW Promotion] Release 0.0.106.0 > > Aric Cyr (1): > drm/amd/display: 3.2.175 > > Charlene Liu (1): > drm/amd/display: add verify_link_cap back for hdmi > > Chris Park (1): > drm/amd/display: Reset VIC if HDMI_VIC is present > > Christian König (5): > drm/amdgpu: install ctx entities with cmpxchg > drm/amdgpu: header cleanup > drm/amdgpu: use job and ib structures directly in CS parsers > drm/amdgpu: properly embed the IBs into the job > drm/amdgpu: initialize the vmid_wait with the stub fence > > Danijel Slivka (1): > drm/amd/pm: new v3 SmuMetrics data structure for Sienna Cichlid > > David Yu (1): > drm/amdgpu: Add DFC CAP support for aldebaran > > Dillon Varone (2): > drm/amd/display: Add frame alternate 3D & restrict HW packed on dongles > drm/amd/display: Modify plane removal sequence to avoid hangs. > > George Shen (1): > drm/amd/display: Refactor fixed VS w/a for PHY tests > > Hansen Dsouza (1): > drm/amd/display: Remove invalid RDPCS Programming in DAL > > Harish Kasiviswanathan (1): > drm/amdgpu: Set correct DMA mask for aldebaran > > Jingwen Chen (1): > drm/amd/amdgpu: set disabled vcn to no_schduler > > Lijo Lazar (1): > drm/amdgpu: Refactor mode2 reset logic for v13.0.2 > > Luben Tuikov (1): > drm/amd/display: Don't fill up the logs > > Meng Tang (1): > gpu/amd: vega10_hwmgr: fix inappropriate private variable name > > Michael Strauss (1): > drm/amd/display: Pass HostVM enable flag into DCN3.1 DML > > Nicholas Kazlauskas (1): > drm/amd/display: Make functional resource functions non-static > > Philip Yang (4): > Revert "drm/amdkfd: process_info lock not needed for svm" > drm/amdkfd: Correct SMI event read size > drm/amdkfd: Add SMI add event helper > drm/amdkfd: Add format attribute to kfd_smi_event_add > > Prike Liang (4): > drm/amdgpu: enable gfx clock gating control for GC 10.3.7 > drm/amdgpu/nv: enable clock gating for GC 10.3.7 subblock > drm/amdgpu: enable gfx power gating for GC 10.3.7 > drm/amdgpu: enable gfxoff routine
[pull] amdgpu, amdkfd drm-next-5.18
Hi Dave, Daniel, Same PR as last week, just fixed up a bad Fixes tag. The following changes since commit 38a15ad9488e21cad8f42d3befca20f91e5b2874: Merge tag 'amd-drm-next-5.18-2022-02-25' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-03-01 16:19:02 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.18-2022-03-07 for you to fetch changes up to 53b97af4a44abd21344cc9f13986ba53051287bb: drm/amdkfd: Add format attribute to kfd_smi_event_add (2022-03-07 14:59:59 -0500) amd-drm-next-5.18-2022-03-07: amdgpu: - Misc code cleanups - Misc display fixes - PSR display fixes - More RAS cleanup - Hotplug fix - Bump minor version for hotplug tests - SR-IOV fixes - GC 10.3.7 updates - Remove some firmwares which are no longer used - Mode2 reset refactor - Aldebaran fixes - Add VCN fwlog feature for VCN debugging - CS code cleanup amdkfd: - SVM fixes - SMI event fixes and cleanups - vmid_pasid mapping fix for gfx10.3 Alex Deucher (4): drm/amdgpu: Use IP versions in convert_tiling_flags_to_modifier() drm/amdgpu: remove unused gpu_info firmwares drm/amdgpu/gfx10: drop unused cyan skillfish firmware drm/amdgpu/sdma5: drop unused cyan skillfish firmware Andrey Grodzovsky (2): drm/amdgpu: Fix sigsev when accessing MMIO on hot unplug. drm/amdgpu: Bump minor version for hot plug tests enabling. Anthony Koo (1): drm/amd/display: [FW Promotion] Release 0.0.106.0 Aric Cyr (1): drm/amd/display: 3.2.175 Charlene Liu (1): drm/amd/display: add verify_link_cap back for hdmi Chris Park (1): drm/amd/display: Reset VIC if HDMI_VIC is present Christian König (5): drm/amdgpu: install ctx entities with cmpxchg drm/amdgpu: header cleanup drm/amdgpu: use job and ib structures directly in CS parsers drm/amdgpu: properly embed the IBs into the job drm/amdgpu: initialize the vmid_wait with the stub fence Danijel Slivka (1): drm/amd/pm: new v3 SmuMetrics data structure for Sienna Cichlid David Yu (1): drm/amdgpu: Add DFC CAP support for aldebaran Dillon Varone (2): drm/amd/display: Add frame alternate 3D & restrict HW packed on dongles drm/amd/display: Modify plane removal sequence to avoid hangs. George Shen (1): drm/amd/display: Refactor fixed VS w/a for PHY tests Hansen Dsouza (1): drm/amd/display: Remove invalid RDPCS Programming in DAL Harish Kasiviswanathan (1): drm/amdgpu: Set correct DMA mask for aldebaran Jingwen Chen (1): drm/amd/amdgpu: set disabled vcn to no_schduler Lijo Lazar (1): drm/amdgpu: Refactor mode2 reset logic for v13.0.2 Luben Tuikov (1): drm/amd/display: Don't fill up the logs Meng Tang (1): gpu/amd: vega10_hwmgr: fix inappropriate private variable name Michael Strauss (1): drm/amd/display: Pass HostVM enable flag into DCN3.1 DML Nicholas Kazlauskas (1): drm/amd/display: Make functional resource functions non-static Philip Yang (4): Revert "drm/amdkfd: process_info lock not needed for svm" drm/amdkfd: Correct SMI event read size drm/amdkfd: Add SMI add event helper drm/amdkfd: Add format attribute to kfd_smi_event_add Prike Liang (4): drm/amdgpu: enable gfx clock gating control for GC 10.3.7 drm/amdgpu/nv: enable clock gating for GC 10.3.7 subblock drm/amdgpu: enable gfx power gating for GC 10.3.7 drm/amdgpu: enable gfxoff routine for GC 10.3.7 Qiang Yu (1): drm/amdgpu: fix suspend/resume hang regression Robin Chen (1): drm/amd/display: Pass deep sleep disabled allow info to dmub fw Ruijing Dong (2): drm/amdgpu/vcn: Update fw shared data structure drm/amdgpu/vcn: Add vcn firmware log Shah Dharati (1): drm/amd/display: Adding a dc_debug option and dmub setting to use PHY FSM for PSR Tom Rix (1): drm/amdgpu: Fix realloc of ptr Weiguo Li (1): drm/amdgpu: remove redundant null check Wesley Chalmers (1): drm/amd/display: Program OPP before ODM Yifan Zha (1): drm/amdgpu: Move CAP firmware loading to the beginning of PSP firmware list Yifan Zhang (4): drm/amdgpu: move amdgpu_gmc_noretry_set after ip_versions populated drm/amdgpu: convert code name to ip version for noretry set drm/amdkfd: judge get_atc_vmid_pasid_mapping_info before call drm/amdkfd: implement get_atc_vmid_pasid_mapping_info for gfx10.3 jinzh (1): drm/amd/display: refine the EDID override yipechai (12): drm/amdgpu: Modify .ras_fini function pointer parameter drm/amdgpu: Optimize xxx_ras_fini function of each ras block drm/amdgpu: centrally calls the .ras_fini function of all ras blocks drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in gfx ras block drm/amdgpu:
[pull] amdgpu, amdkfd drm-next-5.18
Hi Dave, Daniel, A few things for 5.18, mostly bug fixes. The following changes since commit 38a15ad9488e21cad8f42d3befca20f91e5b2874: Merge tag 'amd-drm-next-5.18-2022-02-25' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-03-01 16:19:02 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.18-2022-03-04 for you to fetch changes up to d9de22f1e392741fef1abb787bed29f164b253b2: drm/amdkfd: Add format attribute to kfd_smi_event_add (2022-03-04 13:03:30 -0500) amd-drm-next-5.18-2022-03-04: amdgpu: - Misc code cleanups - Misc display fixes - PSR display fixes - More RAS cleanup - Hotplug fix - Bump minor version for hotplug tests - SR-IOV fixes - GC 10.3.7 updates - Remove some firmwares which are no longer used - Mode2 reset refactor - Aldebaran fixes - Add VCN fwlog feature for VCN debugging - CS code cleanup amdkfd: - SVM fixes - SMI event fixes and cleanups - vmid_pasid mapping fix for gfx10.3 Alex Deucher (4): drm/amdgpu: Use IP versions in convert_tiling_flags_to_modifier() drm/amdgpu: remove unused gpu_info firmwares drm/amdgpu/gfx10: drop unused cyan skillfish firmware drm/amdgpu/sdma5: drop unused cyan skillfish firmware Andrey Grodzovsky (2): drm/amdgpu: Fix sigsev when accessing MMIO on hot unplug. drm/amdgpu: Bump minor version for hot plug tests enabling. Anthony Koo (1): drm/amd/display: [FW Promotion] Release 0.0.106.0 Aric Cyr (1): drm/amd/display: 3.2.175 Charlene Liu (1): drm/amd/display: add verify_link_cap back for hdmi Chris Park (1): drm/amd/display: Reset VIC if HDMI_VIC is present Christian König (5): drm/amdgpu: install ctx entities with cmpxchg drm/amdgpu: header cleanup drm/amdgpu: use job and ib structures directly in CS parsers drm/amdgpu: properly embed the IBs into the job drm/amdgpu: initialize the vmid_wait with the stub fence Danijel Slivka (1): drm/amd/pm: new v3 SmuMetrics data structure for Sienna Cichlid David Yu (1): drm/amdgpu: Add DFC CAP support for aldebaran Dillon Varone (2): drm/amd/display: Add frame alternate 3D & restrict HW packed on dongles drm/amd/display: Modify plane removal sequence to avoid hangs. George Shen (1): drm/amd/display: Refactor fixed VS w/a for PHY tests Hansen Dsouza (1): drm/amd/display: Remove invalid RDPCS Programming in DAL Harish Kasiviswanathan (1): drm/amdgpu: Set correct DMA mask for aldebaran Jingwen Chen (1): drm/amd/amdgpu: set disabled vcn to no_schduler Lijo Lazar (1): drm/amdgpu: Refactor mode2 reset logic for v13.0.2 Luben Tuikov (1): drm/amd/display: Don't fill up the logs Meng Tang (1): gpu/amd: vega10_hwmgr: fix inappropriate private variable name Michael Strauss (1): drm/amd/display: Pass HostVM enable flag into DCN3.1 DML Nicholas Kazlauskas (1): drm/amd/display: Make functional resource functions non-static Philip Yang (4): Revert "drm/amdkfd: process_info lock not needed for svm" drm/amdkfd: Correct SMI event read size drm/amdkfd: Add SMI add event helper drm/amdkfd: Add format attribute to kfd_smi_event_add Prike Liang (4): drm/amdgpu: enable gfx clock gating control for GC 10.3.7 drm/amdgpu/nv: enable clock gating for GC 10.3.7 subblock drm/amdgpu: enable gfx power gating for GC 10.3.7 drm/amdgpu: enable gfxoff routine for GC 10.3.7 Qiang Yu (1): drm/amdgpu: fix suspend/resume hang regression Robin Chen (1): drm/amd/display: Pass deep sleep disabled allow info to dmub fw Ruijing Dong (2): drm/amdgpu/vcn: Update fw shared data structure drm/amdgpu/vcn: Add vcn firmware log Shah Dharati (1): drm/amd/display: Adding a dc_debug option and dmub setting to use PHY FSM for PSR Tom Rix (1): drm/amdgpu: Fix realloc of ptr Weiguo Li (1): drm/amdgpu: remove redundant null check Wesley Chalmers (1): drm/amd/display: Program OPP before ODM Yifan Zha (1): drm/amdgpu: Move CAP firmware loading to the beginning of PSP firmware list Yifan Zhang (4): drm/amdgpu: move amdgpu_gmc_noretry_set after ip_versions populated drm/amdgpu: convert code name to ip version for noretry set drm/amdkfd: judge get_atc_vmid_pasid_mapping_info before call drm/amdkfd: implement get_atc_vmid_pasid_mapping_info for gfx10.3 jinzh (1): drm/amd/display: refine the EDID override yipechai (12): drm/amdgpu: Modify .ras_fini function pointer parameter drm/amdgpu: Optimize xxx_ras_fini function of each ras block drm/amdgpu: centrally calls the .ras_fini function of all ras blocks drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in gfx ras block drm/amdgpu: Remove
Re: [pull] amdgpu, amdkfd drm-next-5.18
On Tue, 1 Mar 2022 at 03:11, Alex Deucher wrote: > > On Mon, Feb 28, 2022 at 1:55 AM Dave Airlie wrote: > > > > On Sat, 26 Feb 2022 at 04:35, Alex Deucher > > wrote: > > > > > > Hi Dave, Daniel, > > > > > > New stuff for 5.18. > > > > > > The following changes since commit > > > b63c54d978236dd6014cf2ffba96d626e97c915c: > > > > > > drm/amdkfd: Use proper enum in pm_unmap_queues_v9() (2022-02-17 > > > 15:59:06 -0500) > > > > > > are available in the Git repository at: > > > > > > https://gitlab.freedesktop.org/agd5f/linux.git > > > tags/amd-drm-next-5.18-2022-02-25 > > > > > > for you to fetch changes up to 111aeed25ec6bf4d5b4a7b4cb5654f002ba9f795: > > > > > > drm/amdgpu: add gfxoff support for smu 13.0.5 (2022-02-25 11:51:18 > > > -0500) > > > > > > > > > amd-drm-next-5.18-2022-02-25: > > > > > > amdgpu: > > > - Raven2 suspend/resume fix > > > - SDMA 5.2.6 updates > > > - VCN 3.1.2 updates > > > - SMU 13.0.5 updates > > > - DCN 3.1.5 updates > > > - Virtual display fixes > > > - SMU code cleanup > > > - Harvest fixes > > > - Expose benchmark tests via debugfs > > > - Drop no longer relevant gart aperture tests > > > - More RAS restructuring > > > - W=1 fixes > > > - PSR rework > > > - DP/VGA adapter fixes > > > - DP MST fixes > > > - GPUVM eviction fix > > > - GPU reset debugfs register dumping support > > > > (this time keeping cc). > > > > ^ this seems to conflict with the removal of reset_sem or something in > > that area. > > > > Can you trial merge this to drm-next and send a fixup patch I should > > apply with it? > > reset_sem moved from adev->reset_sem to adev->reset_domain->sem. See > the attached diff. I also pushed a sample merge if that is helpful: > https://gitlab.freedesktop.org/agd5f/linux/-/commits/drm-next-amd-drm-next-merge-5.18 > > Thanks! > Excellent thanks Alex. Dave.
Re: [pull] amdgpu, amdkfd drm-next-5.18
On Mon, Feb 28, 2022 at 1:55 AM Dave Airlie wrote: > > On Sat, 26 Feb 2022 at 04:35, Alex Deucher wrote: > > > > Hi Dave, Daniel, > > > > New stuff for 5.18. > > > > The following changes since commit b63c54d978236dd6014cf2ffba96d626e97c915c: > > > > drm/amdkfd: Use proper enum in pm_unmap_queues_v9() (2022-02-17 15:59:06 > > -0500) > > > > are available in the Git repository at: > > > > https://gitlab.freedesktop.org/agd5f/linux.git > > tags/amd-drm-next-5.18-2022-02-25 > > > > for you to fetch changes up to 111aeed25ec6bf4d5b4a7b4cb5654f002ba9f795: > > > > drm/amdgpu: add gfxoff support for smu 13.0.5 (2022-02-25 11:51:18 -0500) > > > > > > amd-drm-next-5.18-2022-02-25: > > > > amdgpu: > > - Raven2 suspend/resume fix > > - SDMA 5.2.6 updates > > - VCN 3.1.2 updates > > - SMU 13.0.5 updates > > - DCN 3.1.5 updates > > - Virtual display fixes > > - SMU code cleanup > > - Harvest fixes > > - Expose benchmark tests via debugfs > > - Drop no longer relevant gart aperture tests > > - More RAS restructuring > > - W=1 fixes > > - PSR rework > > - DP/VGA adapter fixes > > - DP MST fixes > > - GPUVM eviction fix > > - GPU reset debugfs register dumping support > > (this time keeping cc). > > ^ this seems to conflict with the removal of reset_sem or something in > that area. > > Can you trial merge this to drm-next and send a fixup patch I should > apply with it? reset_sem moved from adev->reset_sem to adev->reset_domain->sem. See the attached diff. I also pushed a sample merge if that is helpful: https://gitlab.freedesktop.org/agd5f/linux/-/commits/drm-next-amd-drm-next-merge-5.18 Thanks! Alex > > Dave. diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c index dfeed6410f79..426b63e4f1f6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c @@ -1651,23 +1651,23 @@ static ssize_t amdgpu_reset_dump_register_list_read(struct file *f, return 0; memset(reg_offset, 0, 12); - ret = down_read_killable(>reset_sem); + ret = down_read_killable(>reset_domain->sem); if (ret) return ret; for (i = 0; i < adev->num_regs; i++) { sprintf(reg_offset, "0x%x\n", adev->reset_dump_reg_list[i]); - up_read(>reset_sem); + up_read(>reset_domain->sem); if (copy_to_user(buf + len, reg_offset, strlen(reg_offset))) return -EFAULT; len += strlen(reg_offset); - ret = down_read_killable(>reset_sem); + ret = down_read_killable(>reset_domain->sem); if (ret) return ret; } - up_read(>reset_sem); + up_read(>reset_domain->sem); *pos += len; return len; @@ -1699,13 +1699,13 @@ static ssize_t amdgpu_reset_dump_register_list_write(struct file *f, i++; } while (len < size); - ret = down_write_killable(>reset_sem); + ret = down_write_killable(>reset_domain->sem); if (ret) goto error_free; swap(adev->reset_dump_reg_list, tmp); adev->num_regs = i; - up_write(>reset_sem); + up_write(>reset_domain->sem); ret = size; error_free: diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 5396a9f1865f..ca854626a108 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -4721,7 +4721,7 @@ static int amdgpu_reset_reg_dumps(struct amdgpu_device *adev) uint32_t reg_value; int i; - lockdep_assert_held(>reset_sem); + lockdep_assert_held(>reset_domain->sem); dump_stack(); for (i = 0; i < adev->num_regs; i++) {
Re: [pull] amdgpu, amdkfd drm-next-5.18
On Sat, 26 Feb 2022 at 04:35, Alex Deucher wrote: > > Hi Dave, Daniel, > > New stuff for 5.18. > > The following changes since commit b63c54d978236dd6014cf2ffba96d626e97c915c: > > drm/amdkfd: Use proper enum in pm_unmap_queues_v9() (2022-02-17 15:59:06 > -0500) > > are available in the Git repository at: > > https://gitlab.freedesktop.org/agd5f/linux.git > tags/amd-drm-next-5.18-2022-02-25 > > for you to fetch changes up to 111aeed25ec6bf4d5b4a7b4cb5654f002ba9f795: > > drm/amdgpu: add gfxoff support for smu 13.0.5 (2022-02-25 11:51:18 -0500) > > > amd-drm-next-5.18-2022-02-25: > > amdgpu: > - Raven2 suspend/resume fix > - SDMA 5.2.6 updates > - VCN 3.1.2 updates > - SMU 13.0.5 updates > - DCN 3.1.5 updates > - Virtual display fixes > - SMU code cleanup > - Harvest fixes > - Expose benchmark tests via debugfs > - Drop no longer relevant gart aperture tests > - More RAS restructuring > - W=1 fixes > - PSR rework > - DP/VGA adapter fixes > - DP MST fixes > - GPUVM eviction fix > - GPU reset debugfs register dumping support (this time keeping cc). ^ this seems to conflict with the removal of reset_sem or something in that area. Can you trial merge this to drm-next and send a fixup patch I should apply with it? Dave.
[pull] amdgpu, amdkfd drm-next-5.18
Hi Dave, Daniel, New stuff for 5.18. The following changes since commit b63c54d978236dd6014cf2ffba96d626e97c915c: drm/amdkfd: Use proper enum in pm_unmap_queues_v9() (2022-02-17 15:59:06 -0500) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.18-2022-02-25 for you to fetch changes up to 111aeed25ec6bf4d5b4a7b4cb5654f002ba9f795: drm/amdgpu: add gfxoff support for smu 13.0.5 (2022-02-25 11:51:18 -0500) amd-drm-next-5.18-2022-02-25: amdgpu: - Raven2 suspend/resume fix - SDMA 5.2.6 updates - VCN 3.1.2 updates - SMU 13.0.5 updates - DCN 3.1.5 updates - Virtual display fixes - SMU code cleanup - Harvest fixes - Expose benchmark tests via debugfs - Drop no longer relevant gart aperture tests - More RAS restructuring - W=1 fixes - PSR rework - DP/VGA adapter fixes - DP MST fixes - GPUVM eviction fix - GPU reset debugfs register dumping support - Misc display fixes - SR-IOV fix - Aldebaran mGPU fix - Add module parameter to disable XGMI for testing amdkfd: - IH ring overflow logging fixes - CRIU fixes - Misc fixes Alex Deucher (13): drm/amdkfd: make CRAT table missing message informational only drm/amdgpu/benchmark: use dev_info rather than DRM macros for logging drm/amdgpu: plumb error handling though amdgpu_benchmark() drm/amdgpu: print the selected benchmark test in the log drm/amdgpu: add a benchmark mutex drm/amdgpu: expose benchmarks via debugfs drm/amdgpu: drop benchmark module parameter drm/amdgpu: drop testing module parameter drm/amdgpu/display: split dmcu and gpuvm handling logic drm/amdgpu: derive GTT display support from DM drm/amdgpu: use kernel BO API for benchmark buffer management drm/amdgpu: use ktime rather than jiffies for benchmark results drm/amdgpu: fix typo in amdgpu_discovery.c Alex Sierra (1): drm/amdgpu: Add use_xgmi_p2p module parameter Andrey Grodzovsky (1): drm/amdgpu: Exclude PCI reset method for now. Aric Cyr (1): drm/amd/display: 3.2.174 Boyuan Zhang (2): drm/amdgpu/vcn: add vcn support for vcn 3.1.2 drm/amdgpu: enable vcn pg and cg for vcn 3.1.2 Charlene Liu (1): drm/amd/display: add debug option to bypass ssinfo from bios. Chen Gong (1): drm/amdgpu: do not enable asic reset for raven2 Danijel Slivka (1): amdgpu/pm: Disable managing hwmon sysfs attributes for ONEVF mode David Yat Sin (1): drm/amdkfd: Fix for possible integer overflow Dmytro Laktyushkin (2): drm/amd/display: limit unbounded requesting to 5k drm/amd/display: revert populating dcn315 clk table based on dcfclk Duncan Ma (2): drm/amd/display: Set compbuf size to min at prep prevent overbook crb drm/amd/display: Set compbuf size to min at prep prevent overbook crb Fangzhi Zuo (1): drm/amd/display: Ignore Transitional Invalid Link Rate Error Message Felix Kuehling (2): drm/amdkfd: Fix criu_restore_bo error handling drm/amdkfd: Use real device for messages George Shen (1): drm/amd/display: Refactor fixed VS logic for non-transparent mode Guchun Chen (3): Revert "drm/amdgpu: add modifiers in amdgpu_vkms_plane_init()" drm/amdgpu: bypass tiling flag check in virtual display case (v2) drm/amdgpu: read harvest bit per IP data on legacy GPUs Harish Kasiviswanathan (1): drm/amdkfd: Print bdf in peer map failure message Ilya (1): drm/amd/display: Fix wrong resolution with DP/VGA adapter Kent Russell (1): drm/amdkfd: Drop IH ring overflow message to dbg Leo Li (1): drm/amd/display: Fix DC definition of PMFW Pstate table for DCN316 Lijo Lazar (1): drm/amd/pm: Fix missing prototype warning Magali Lemes (4): drm/amd/display: Adjust functions documentation drm/amd/display: Add conditional around function drm/amd/display: Use NULL instead of 0 drm/amd/display: Turn functions into static Maíra Canal (9): drm/amdgpu: Change amdgpu_ras_block_late_init_default function scope drm/amdgpu: Remove unused get_umc_v8_7_channel_index function drm/amd/display: Remove unused temp variable drm/amd/display: Remove unused dcn316_smu_set_voltage_via_phyclk function drm/amd/display: Remove vupdate_int_entry definition drm/amd/display: Remove unused dmub_outbox_irq_info_funcs variable drm/amd/display: Remove unused variable drm/amd/display: Add missing prototypes to dcn201_init drm/amd/display: Turn global functions into static functions Paul Hsieh (1): drm/amd/display: lock/un-lock cursor if odm pipe split used Paul Menzel (1): drm/amdgpu: Fix typo in *whether* in comment Po Ting Chen (1): drm/amd/display: Refactor PSR DPCD caps detection Prike Liang (4): drm/amdgpu: enable TMZ option for onwards asic