[pull] amdgpu, amdkfd drm-next-5.18
Alex Deucher
alexdeucher at gmail.com
Wed Mar 9 22:16:22 UTC 2022
On Wed, Mar 9, 2022 at 5:12 PM Dave Airlie <airlied at gmail.com> wrote:
>
> On Tue, 8 Mar 2022 at 06:08, Alex Deucher <alexander.deucher at amd.com> 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):
> > 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 redundant calls of amdgpu_ras_block_late_fini in mmhub ras block
> > drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in nbio ras block
> > drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in umc ras block
> > drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in xgmi ras block
> > drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in hdp ras block
> > drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in sdma ras block
> > drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in mca ras block
> > drm/amdgpu: Remove redundant .ras_fini initialization in some ras blocks
> >
> > drivers/gpu/drm/amd/amdgpu/aldebaran.c | 66 ++++++--
> > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 98 +----------
> > .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 16 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 8 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | 80 +++++++++
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 24 ++-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 19 ++-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 25 +--
> > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 11 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 -
> > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 -
> > drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 21 +--
> > drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 6 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 1 -
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 2 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 9 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 6 -
> > drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 3 -
> > drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 6 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 1 -
> > drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 7 -
> > drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 -
> > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 28 +++-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 8 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 +
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 58 ++++++-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 7 -
> > drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 1 -
> > drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | 1 +
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 7 -
> > drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 1 -
> > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 37 ++---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 117 ++++++-------
> > drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 7 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 134 ++++++++++++++-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 30 +++-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 8 -
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 18 +-
> > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 -
> > drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 -
> > drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 15 +-
> > drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 1 -
> > drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 18 --
> > drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 1 -
> > drivers/gpu/drm/amd/amdgpu/nv.c | 15 +-
> > drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 1 +
> > drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 -
> > drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +-
> > drivers/gpu/drm/amd/amdgpu/soc15.c | 3 -
> > drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 14 +-
> > drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 7 +
> > drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 22 ++-
> > drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 21 ++-
> > drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 51 +++---
> > .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 18 +-
> > drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 74 +++------
> > drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 9 +
> > .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 8 +-
> > drivers/gpu/drm/amd/display/dc/core/dc_link.c | 14 +-
> > drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 16 +-
> > drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +
> > drivers/gpu/drm/amd/display/dc/dc.h | 4 +-
> > drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 1 +
> > .../amd/display/dc/dce110/dce110_hw_sequencer.c | 49 +++---
> > .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 5 +-
> > drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 21 +--
> > .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 9 -
> > .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 5 +-
> > .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 5 +
> > .../drm/amd/display/dc/dcn315/dcn315_resource.c | 1 +
> > drivers/gpu/drm/amd/display/dc/dm_helpers.h | 3 +
> > drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 12 +-
> > .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 68 ++++----
> > .../inc/pmfw_if/smu11_driver_if_sienna_cichlid.h | 58 +++++++
> > .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 181 ++++++++++++++-------
> > drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 1 +
> > include/uapi/linux/kfd_ioctl.h | 1 +
> > 84 files changed, 991 insertions(+), 679 deletions(-)
> > create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h
More information about the dri-devel
mailing list