| Message ID | 20210401222931.3823-1-alexander.deucher@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [pull] amdgpu, radeon, ttm, sched drm-next-5.13 | expand |
Hey Alex, the TTM and scheduler changes should already be in the drm-misc-next branch (not 100% sure about the TTM patch, need to double check next week). Could that cause problems when both are merged into drm-next? Thanks, Christian. Am 02.04.21 um 00:29 schrieb Alex Deucher: > Hi Dave, Daniel, > > New stuff for 5.13. There are two small patches for ttm and scheduler > that were dependencies for amdgpu changes. > > The following changes since commit 2cbcb78c9ee5520c8d836c7ff57d1b60ebe8e9b7: > > Merge tag 'amd-drm-next-5.13-2021-03-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-03-26 15:53:21 +0100) > > are available in the Git repository at: > > https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.13-2021-04-01 > > for you to fetch changes up to ef95d2a98d642a537190d73c45ae3c308afee890: > > drm/amdgpu/display: fix warning on 32 bit in dmub (2021-04-01 17:32:32 -0400) > > ---------------------------------------------------------------- > amd-drm-next-5.13-2021-04-01: > > amdgpu: > - Re-enable GPU reset on VanGogh > - Enable DPM flags for SMART_SUSPEND and MAY_SKIP_RESUME > - Disentangle HG from vga_switcheroo > - S0ix fixes > - W=1 fixes > - Resource iterator fixes > - DMCUB updates > - UBSAN fixes > - More PM API cleanup > - Aldebaran updates > - Modifier fixes > - Enable VCN load balancing with asymmetric engines > - Rework BO structs > - Aldebaran reset support > - Initial LTTPR display work > - Display MALL fixes > - Fall back to YCbCr420 when YCbCr444 fails > - SR-IOV fixes > - Misc cleanups and fixes > > radeon: > - Typo fixes > > ttm: > - Handle cached requests (required for Aldebaran) > > scheduler: > - Fix runqueue selection when changing priorities (required to fix VCN > load balancing) > > ---------------------------------------------------------------- > Alex Deucher (20): > drm/amdgpu/display/dm: add missing parameter documentation > drm/amdgpu: Add additional Sienna Cichlid PCI ID > drm/amdgpu: add a dev_pm_ops prepare callback (v2) > drm/amdgpu: enable DPM_FLAG_MAY_SKIP_RESUME and DPM_FLAG_SMART_SUSPEND flags (v2) > drm/amdgpu: disentangle HG systems from vgaswitcheroo > drm/amdgpu: rework S3/S4/S0ix state handling > drm/amdgpu: don't evict vram on APUs for suspend to ram (v4) > drm/amdgpu: clean up non-DC suspend/resume handling > drm/amdgpu: move s0ix check into amdgpu_device_ip_suspend_phase2 (v3) > drm/amdgpu: re-enable suspend phase 2 for S0ix > drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend > drm/amdgpu: update comments about s0ix suspend/resume > drm/amdgpu: drop S0ix checks around CG/PG in suspend > drm/amdgpu: skip kfd suspend/resume for S0ix > drm/amdgpu/display: restore AUX_DPHY_TX_CONTROL for DCN2.x > drm/amdgpu/display: fix memory leak for dimgrey cavefish > drm/amdgpu/pm: mark pcie link/speed arrays as const > drm/amdgpu/pm: bail on sysfs/debugfs queries during platform suspend > drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in suspend > drm/amdgpu/display: fix warning on 32 bit in dmub > > Alex Sierra (2): > drm/amdgpu: replace per_device_list by array > drm/amdgpu: ih reroute for newer asics than vega20 > > Alvin Lee (1): > drm/amd/display: Change input parameter for set_drr > > Anson Jacob (2): > drm/amd/display: Fix UBSAN: shift-out-of-bounds warning > drm/amd/display: Removing unused code from dmub_cmd.h > > Anthony Koo (2): > drm/amd/display: [FW Promotion] Release 0.0.57 > drm/amd/display: [FW Promotion] Release 0.0.58 > > Aric Cyr (2): > drm/amd/display: 3.2.128 > drm/amd/display: 3.2.129 > > Arnd Bergmann (3): > amdgpu: avoid incorrect %hu format string > amdgpu: fix gcc -Wrestrict warning > amdgpu: securedisplay: simplify i2c hexdump output > > Bhaskar Chowdhury (6): > drm/amdgpu: Fix a typo > drm/amdgpu: Fix a typo > drm/atomic: Couple of typo fixes > drm/radeon/r600_cs: Few typo fixes > drm/amd/amdgpu/gfx_v7_0: Trivial typo fixes > drm/amd: Fix a typo in two different sentences > > Bindu Ramamurthy (1): > drm/amd/display: Allow idle optimization based on vblank. > > Chengming Gui (1): > drm/amd/amdgpu: set MP1 state to UNLOAD before reload its FW for vega20/ALDEBARAN > > Chris Park (1): > drm/amd/display: Disable MALL when SMU not present > > Christian König (5): > drm/amdgpu: remove irq_src->data handling > drm/amdgpu: add the sched_score to amdgpu_ring_init > drm/amdgpu: share scheduler score on VCN3 instances > drm/sched: select new rq even if there is only one v3 > drm/amdgpu: load balance VCN3 decode as well v8 > > Daniel Gomez (2): > drm/amdgpu/ttm: Fix memory leak userptr pages > drm/radeon/ttm: Fix memory leak userptr pages > > David Galiffi (1): > drm/amd/display: Fixed Clock Recovery Sequence > > Dennis Li (1): > drm/amdgpu: add codes to capture invalid hardware access when recovery > > Diego Viola (1): > drm/amd/display: fix typo: liason -> liaison > > Dmytro Laktyushkin (3): > drm/amd/display: hide VGH asic specific structs > drm/amd/display: revert max lb lines change > drm/amd/display: revert max lb use by default for n10 > > Eryk Brol (1): > drm/amd/display: Fix MST topology debugfs > > Evan Quan (9): > drm/amd/pm: fix Navi1x runtime resume failure V2 > drm/amd/pm: make DAL communicate with SMU through unified interfaces > drm/amd/pm: label these APIs used internally as static > drm/amd/pm: drop redundant and unneeded BACO APIs V2 > drm/amd/pm: no need to force MCLK to highest when no display connected > drm/amd/pm: unify the interface for loading SMU microcode > drm/amd/pm: fix missing static declarations > drm/amd/pm: unify the interface for power gating > drm/amd/pm: unify the interface for gfx state setting > > Fangzhi Zuo (1): > drm/amd/display: Fix debugfs link_settings entry > > Feifei Xu (1): > drm/amdgpu: skip PP_MP1_STATE_UNLOAD on aldebaran > > Guchun Chen (6): > drm/amd/pm: fix MP1 state setting failure in s3 test > drm/amd/pm: fix gpu reset failure by MP1 state setting > drm/amd/display: add DMCUB trace irq support for DCN302 > drm/amdgpu: fix NULL pointer dereference > drm/amdgpu: fix compiler warning(v2) > drm/radeon: avoid potential null pointer access > > Horace Chen (1): > drm/amdgpu: move vram recover into sriov full access > > Huacai Chen (1): > drm/amdgpu: Set a suitable dev_info.gart_page_size > > Jack Zhang (1): > drm/amd/amdgpu implement tdr advanced mode > > Jake Wang (1): > drm/amd/display: Use pwrseq instance to determine eDP instance > > Jimmy Kizito (2): > drm/amd/display: Add dynamic link encoder selection. > drm/amd/display: Update display endpoint control path. > > John Clements (2): > drm/amdgpu: update host to psp interface > drm/amdgpu: added support for dynamic GECC > > Krunoslav Kovac (1): > drm/amd/display: Rename fs_params to hdr_tm_params > > Lee Jones (3): > drm/amd/display/dc/dce80/dce80_resource: Make local functions static > drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap > drm/amd/display/dc/calcs/dce_calcs: Remove some large variables from the stack > > Leo (Hanghong) Ma (2): > drm/amd/display: Log DMCUB trace buffer events > drm/amd/display: Fix static checker warnings on tracebuff_fb > > Lijo Lazar (14): > drm/amdgpu: Enable VCN/JPEG CG on aldebaran > drm/amd/pm: Update aldebaran pmfw interface > drm/amd/pm: Modify mode2 msg sequence on aldebaran > drm/amd/pm: Add function to wait for smu events > drm/amd/pm: Add support for reset completion on aldebaran > drm/amdgpu: Add reset control to amdgpu_device > drm/amdgpu: Add reset control handling to reset workflow > drm/amdgpu: Add PSP public function to load a list of FWs > drm/amdgpu: Make set PG/CG state functions public > drm/amdgpu: Add mode2 reset support for aldebaran > drm/amdgpu: Enable recovery on aldebaran > drm/amdgpu: Fix build warnings > drm/amd/pm: Fix DPM level count on aldebaran > drm/amdgpu: Reset error code for 'no handler' case > > Luben Tuikov (2): > drm/amd/display: Use appropriate DRM_DEBUG_... level > drm/amdgpu: Fix check for RAS support > > Mark Yacoub (1): > drm/amdgpu: Ensure that the modifier requested is supported by plane. > > Nikola Cornij (1): > drm/amd/display: Fix black screen with scaled modes on some eDP panels > > Nirmoy Das (9): > drm/amdgpu: wrap kiq ring ops with kiq spinlock > drm/amd/display: use GFP_ATOMIC in dcn20_resource_construct > drm/amdgpu: fix amdgpu_res_first() > drm/amdgpu: allow variable BO struct creation > drm/amdgpu: introduce struct amdgpu_bo_user > drm/amdgpu: use amdgpu_bo_create_user() for when possible > drm/amdgpu: use amdgpu_bo_user bo for metadata and tiling flag > drm/amdgpu: make BO type check less restrictive > drm/amdgpu: fix offset calculation in amdgpu_vm_bo_clear_mappings() > > Oak Zeng (1): > drm/ttm: ioremap buffer according to TTM mem caching setting > > Philip Cox (1): > drm/amdgpu: Set amdgpu.noretry=1 for Arcturus > > Pratik Vishwakarma (1): > drm/amdgpu: skip CG/PG for gfx during S0ix > > Prike Liang (1): > drm/amdgpu: fix the hibernation suspend with s0ix > > Qingqing Zhuo (2): > drm/amd/display: enable DP DSC Compliance automation > drm/amd/display: add log for automated test > > Qu Huang (2): > drm/amdkfd: Fix cat debugfs hang_hws file causes system crash bug > drm/amdkfd: dqm fence memory corruption > > Rodrigo Siqueira (1): > drm/amd/display: Add refresh rate trace > > Rohit Khaire (1): > drm/amdgpu: Add new PF2VF flags for VF register access method > > Roman Li (1): > drm/amd/display: Populate socclk entries for dcn2.1 > > Sefa Eyeoglu (1): > drm/amd/display: check fb of primary plane > > Shirish S (1): > drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD > > Stylon Wang (1): > drm/amd/display: Guard ASSR with internal display flag > > Tian Tao (3): > drm/radeon/radeon_pm: Convert sysfs sprintf/snprintf family to sysfs_emit > drm/amdgpu: Convert sysfs sprintf/snprintf family to sysfs_emit > drm/amd/pm: Convert sysfs sprintf/snprintf family to sysfs_emit > > Tom St Denis (1): > drm/amd/amdgpu: Add CP_IB1_BASE_* to gc_10_3_0 headers > > Tong Zhang (1): > drm/radeon: don't evict if not initialized > > Victor Lu (2): > drm/amd/display: Deallocate IRQ handlers on amdgpu_dm_irq_fini > drm/amd/display: Use pr_debug in DM to prevent dmesg flooding > > Vladimir Stempen (1): > drm/amd/display: Fix typo for variable name > > Wan Jiabing (1): > drivers: gpu: Remove duplicate include of amdgpu_hdp.h > > Wayne Lin (1): > drm/amd/display: Add kernel doc to crc_rd_wrk field > > Wenjing Liu (2): > drm/amd/display: define mod_hdcp_display_disable_option struct > drm/amd/display: add mod hdcp interface for supporting encryption state query > > Werner Sembach (1): > drm/amd/display: Try YCbCr420 color when YCbCr444 fails > > Wesley Chalmers (6): > drm/amd/display: BIOS LTTPR Caps Interface > drm/amd/display: Interface for LTTPR interop > drm/amd/display: Enumerate LTTPR modes > drm/amd/display: LTTPR config logic > drm/amd/display: New path for enabling DPG > drm/amd/display: Set max TTU on DPG enable > > Xiaojian Du (1): > Revert "drm/amdgpu: disable gpu reset on Vangogh for now" > > Xℹ Ruoyao (1): > drm/amdgpu: check alignment on CPU page for bo map > > xinhui pan (1): > drm/amdgpu: Use correct size when access vram > > drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- > drivers/gpu/drm/amd/amdgpu/aldebaran.c | 407 +++++++ > drivers/gpu/drm/amd/amdgpu/aldebaran.h | 32 + > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 35 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 414 ++++--- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 102 ++ > drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 + > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 102 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 + > drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 40 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + > drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 - > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 - > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 94 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 19 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 51 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 + > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 23 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 98 ++ > drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 85 ++ > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 10 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 11 + > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 32 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 +- > drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 17 +- > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 +- > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- > drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 15 +- > drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 20 +- > drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 26 +- > drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 17 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 3 +- > drivers/gpu/drm/amd/amdgpu/nv.c | 30 +- > drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 25 + > drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +- > drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- > drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +- > drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 2 +- > drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- > drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 5 +- > drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- > drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 143 ++- > drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +- > drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 116 +- > drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- > drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 7 +- > .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +- > .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- > drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 8 +- > drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 +- > drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- > drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 2 +- > drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 28 +- > drivers/gpu/drm/amd/amdkfd/kfd_process.c | 108 +- > .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 203 +++- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 + > .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 19 +- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 6 +- > .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 12 +- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 72 ++ > .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 134 +-- > .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 40 + > drivers/gpu/drm/amd/display/dc/Makefile | 5 +- > drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 190 ++++ > drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1154 ++++++++++---------- > drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 120 +- > .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 + > .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 7 + > .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 101 +- > .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 28 +- > drivers/gpu/drm/amd/display/dc/core/dc.c | 46 +- > drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +- > drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 207 +++- > .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 303 +++++ > drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 24 +- > drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 + > drivers/gpu/drm/amd/display/dc/dc.h | 2 +- > drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 6 + > drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- > drivers/gpu/drm/amd/display/dc/dc_stream.h | 16 + > drivers/gpu/drm/amd/display/dc/dc_types.h | 15 + > drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- > drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- > .../amd/display/dc/dce110/dce110_hw_sequencer.c | 9 +- > .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 16 +- > .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 24 +- > .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 3 +- > .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- > drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 2 +- > .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 3 +- > .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 32 +- > .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- > .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- > .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- > .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +- > .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 28 +- > .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 28 +- > .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 28 +- > .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 28 +- > .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 28 +- > drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 + > drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 10 +- > drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + > .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 13 + > drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 +- > drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 86 ++ > .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 29 +- > .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 25 +- > .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 30 + > drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 41 +- > drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 144 ++- > drivers/gpu/drm/amd/display/include/logger_types.h | 3 + > .../drm/amd/display/modules/color/color_gamma.c | 6 +- > .../drm/amd/display/modules/color/color_gamma.h | 4 +- > .../drm/amd/display/modules/freesync/freesync.c | 37 +- > drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 10 +- > drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 4 +- > .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 37 +- > .../amd/display/modules/hdcp/hdcp1_transition.c | 6 +- > .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 10 +- > .../amd/display/modules/hdcp/hdcp2_transition.c | 10 +- > .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 10 + > .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 7 +- > drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 10 +- > .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 6 + > .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 9 + > drivers/gpu/drm/amd/include/atombios.h | 4 +- > drivers/gpu/drm/amd/include/atomfirmware.h | 38 +- > drivers/gpu/drm/amd/include/kgd_pp_interface.h | 14 + > drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 +- > drivers/gpu/drm/amd/pm/amdgpu_pm.c | 198 +++- > drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 3 +- > drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 128 +-- > .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 11 +- > drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + > drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- > drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 5 +- > .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 13 +- > .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 3 +- > .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 +- > .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 4 +- > drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 406 ++++--- > drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + > drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 25 + > .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 18 + > drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 5 + > drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 71 +- > drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 58 +- > drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 30 +- > drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 5 + > drivers/gpu/drm/drm_atomic.c | 4 +- > drivers/gpu/drm/radeon/r600_cs.c | 6 +- > drivers/gpu/drm/radeon/radeon_object.c | 2 + > drivers/gpu/drm/radeon/radeon_pm.c | 36 +- > drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- > drivers/gpu/drm/scheduler/sched_entity.c | 6 +- > drivers/gpu/drm/scheduler/sched_main.c | 103 +- > drivers/gpu/drm/ttm/ttm_bo_util.c | 14 + > include/drm/gpu_scheduler.h | 3 + > 197 files changed, 5039 insertions(+), 2273 deletions(-) > create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.c > create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.h > create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c > create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h > create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c > create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 2021-04-01 um 6:29 p.m. schrieb Alex Deucher: > Hi Dave, Daniel, > > New stuff for 5.13. There are two small patches for ttm and scheduler > that were dependencies for amdgpu changes. > > The following changes since commit 2cbcb78c9ee5520c8d836c7ff57d1b60ebe8e9b7: > > Merge tag 'amd-drm-next-5.13-2021-03-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-03-26 15:53:21 +0100) > > are available in the Git repository at: > > https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.13-2021-04-01 > > for you to fetch changes up to ef95d2a98d642a537190d73c45ae3c308afee890: > > drm/amdgpu/display: fix warning on 32 bit in dmub (2021-04-01 17:32:32 -0400) > > ---------------------------------------------------------------- > amd-drm-next-5.13-2021-04-01: > > amdgpu: > - Re-enable GPU reset on VanGogh > - Enable DPM flags for SMART_SUSPEND and MAY_SKIP_RESUME > - Disentangle HG from vga_switcheroo > - S0ix fixes > - W=1 fixes > - Resource iterator fixes > - DMCUB updates > - UBSAN fixes > - More PM API cleanup > - Aldebaran updates > - Modifier fixes > - Enable VCN load balancing with asymmetric engines > - Rework BO structs > - Aldebaran reset support > - Initial LTTPR display work > - Display MALL fixes > - Fall back to YCbCr420 when YCbCr444 fails > - SR-IOV fixes > - Misc cleanups and fixes > > radeon: > - Typo fixes > > ttm: > - Handle cached requests (required for Aldebaran) > > scheduler: > - Fix runqueue selection when changing priorities (required to fix VCN > load balancing) > > ---------------------------------------------------------------- > Alex Deucher (20): > drm/amdgpu/display/dm: add missing parameter documentation > drm/amdgpu: Add additional Sienna Cichlid PCI ID > drm/amdgpu: add a dev_pm_ops prepare callback (v2) > drm/amdgpu: enable DPM_FLAG_MAY_SKIP_RESUME and DPM_FLAG_SMART_SUSPEND flags (v2) > drm/amdgpu: disentangle HG systems from vgaswitcheroo > drm/amdgpu: rework S3/S4/S0ix state handling > drm/amdgpu: don't evict vram on APUs for suspend to ram (v4) > drm/amdgpu: clean up non-DC suspend/resume handling > drm/amdgpu: move s0ix check into amdgpu_device_ip_suspend_phase2 (v3) > drm/amdgpu: re-enable suspend phase 2 for S0ix > drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend > drm/amdgpu: update comments about s0ix suspend/resume > drm/amdgpu: drop S0ix checks around CG/PG in suspend > drm/amdgpu: skip kfd suspend/resume for S0ix > drm/amdgpu/display: restore AUX_DPHY_TX_CONTROL for DCN2.x > drm/amdgpu/display: fix memory leak for dimgrey cavefish > drm/amdgpu/pm: mark pcie link/speed arrays as const > drm/amdgpu/pm: bail on sysfs/debugfs queries during platform suspend > drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in suspend > drm/amdgpu/display: fix warning on 32 bit in dmub > > Alex Sierra (2): > drm/amdgpu: replace per_device_list by array > drm/amdgpu: ih reroute for newer asics than vega20 > > Alvin Lee (1): > drm/amd/display: Change input parameter for set_drr > > Anson Jacob (2): > drm/amd/display: Fix UBSAN: shift-out-of-bounds warning > drm/amd/display: Removing unused code from dmub_cmd.h > > Anthony Koo (2): > drm/amd/display: [FW Promotion] Release 0.0.57 > drm/amd/display: [FW Promotion] Release 0.0.58 > > Aric Cyr (2): > drm/amd/display: 3.2.128 > drm/amd/display: 3.2.129 > > Arnd Bergmann (3): > amdgpu: avoid incorrect %hu format string > amdgpu: fix gcc -Wrestrict warning > amdgpu: securedisplay: simplify i2c hexdump output > > Bhaskar Chowdhury (6): > drm/amdgpu: Fix a typo > drm/amdgpu: Fix a typo > drm/atomic: Couple of typo fixes > drm/radeon/r600_cs: Few typo fixes > drm/amd/amdgpu/gfx_v7_0: Trivial typo fixes > drm/amd: Fix a typo in two different sentences > > Bindu Ramamurthy (1): > drm/amd/display: Allow idle optimization based on vblank. > > Chengming Gui (1): > drm/amd/amdgpu: set MP1 state to UNLOAD before reload its FW for vega20/ALDEBARAN > > Chris Park (1): > drm/amd/display: Disable MALL when SMU not present > > Christian König (5): > drm/amdgpu: remove irq_src->data handling > drm/amdgpu: add the sched_score to amdgpu_ring_init > drm/amdgpu: share scheduler score on VCN3 instances > drm/sched: select new rq even if there is only one v3 > drm/amdgpu: load balance VCN3 decode as well v8 > > Daniel Gomez (2): > drm/amdgpu/ttm: Fix memory leak userptr pages This introduced a regression for KFD, which I pointed out at the time. Was there ever a fix for that. Regards, Felix > drm/radeon/ttm: Fix memory leak userptr pages > > David Galiffi (1): > drm/amd/display: Fixed Clock Recovery Sequence > > Dennis Li (1): > drm/amdgpu: add codes to capture invalid hardware access when recovery > > Diego Viola (1): > drm/amd/display: fix typo: liason -> liaison > > Dmytro Laktyushkin (3): > drm/amd/display: hide VGH asic specific structs > drm/amd/display: revert max lb lines change > drm/amd/display: revert max lb use by default for n10 > > Eryk Brol (1): > drm/amd/display: Fix MST topology debugfs > > Evan Quan (9): > drm/amd/pm: fix Navi1x runtime resume failure V2 > drm/amd/pm: make DAL communicate with SMU through unified interfaces > drm/amd/pm: label these APIs used internally as static > drm/amd/pm: drop redundant and unneeded BACO APIs V2 > drm/amd/pm: no need to force MCLK to highest when no display connected > drm/amd/pm: unify the interface for loading SMU microcode > drm/amd/pm: fix missing static declarations > drm/amd/pm: unify the interface for power gating > drm/amd/pm: unify the interface for gfx state setting > > Fangzhi Zuo (1): > drm/amd/display: Fix debugfs link_settings entry > > Feifei Xu (1): > drm/amdgpu: skip PP_MP1_STATE_UNLOAD on aldebaran > > Guchun Chen (6): > drm/amd/pm: fix MP1 state setting failure in s3 test > drm/amd/pm: fix gpu reset failure by MP1 state setting > drm/amd/display: add DMCUB trace irq support for DCN302 > drm/amdgpu: fix NULL pointer dereference > drm/amdgpu: fix compiler warning(v2) > drm/radeon: avoid potential null pointer access > > Horace Chen (1): > drm/amdgpu: move vram recover into sriov full access > > Huacai Chen (1): > drm/amdgpu: Set a suitable dev_info.gart_page_size > > Jack Zhang (1): > drm/amd/amdgpu implement tdr advanced mode > > Jake Wang (1): > drm/amd/display: Use pwrseq instance to determine eDP instance > > Jimmy Kizito (2): > drm/amd/display: Add dynamic link encoder selection. > drm/amd/display: Update display endpoint control path. > > John Clements (2): > drm/amdgpu: update host to psp interface > drm/amdgpu: added support for dynamic GECC > > Krunoslav Kovac (1): > drm/amd/display: Rename fs_params to hdr_tm_params > > Lee Jones (3): > drm/amd/display/dc/dce80/dce80_resource: Make local functions static > drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap > drm/amd/display/dc/calcs/dce_calcs: Remove some large variables from the stack > > Leo (Hanghong) Ma (2): > drm/amd/display: Log DMCUB trace buffer events > drm/amd/display: Fix static checker warnings on tracebuff_fb > > Lijo Lazar (14): > drm/amdgpu: Enable VCN/JPEG CG on aldebaran > drm/amd/pm: Update aldebaran pmfw interface > drm/amd/pm: Modify mode2 msg sequence on aldebaran > drm/amd/pm: Add function to wait for smu events > drm/amd/pm: Add support for reset completion on aldebaran > drm/amdgpu: Add reset control to amdgpu_device > drm/amdgpu: Add reset control handling to reset workflow > drm/amdgpu: Add PSP public function to load a list of FWs > drm/amdgpu: Make set PG/CG state functions public > drm/amdgpu: Add mode2 reset support for aldebaran > drm/amdgpu: Enable recovery on aldebaran > drm/amdgpu: Fix build warnings > drm/amd/pm: Fix DPM level count on aldebaran > drm/amdgpu: Reset error code for 'no handler' case > > Luben Tuikov (2): > drm/amd/display: Use appropriate DRM_DEBUG_... level > drm/amdgpu: Fix check for RAS support > > Mark Yacoub (1): > drm/amdgpu: Ensure that the modifier requested is supported by plane. > > Nikola Cornij (1): > drm/amd/display: Fix black screen with scaled modes on some eDP panels > > Nirmoy Das (9): > drm/amdgpu: wrap kiq ring ops with kiq spinlock > drm/amd/display: use GFP_ATOMIC in dcn20_resource_construct > drm/amdgpu: fix amdgpu_res_first() > drm/amdgpu: allow variable BO struct creation > drm/amdgpu: introduce struct amdgpu_bo_user > drm/amdgpu: use amdgpu_bo_create_user() for when possible > drm/amdgpu: use amdgpu_bo_user bo for metadata and tiling flag > drm/amdgpu: make BO type check less restrictive > drm/amdgpu: fix offset calculation in amdgpu_vm_bo_clear_mappings() > > Oak Zeng (1): > drm/ttm: ioremap buffer according to TTM mem caching setting > > Philip Cox (1): > drm/amdgpu: Set amdgpu.noretry=1 for Arcturus > > Pratik Vishwakarma (1): > drm/amdgpu: skip CG/PG for gfx during S0ix > > Prike Liang (1): > drm/amdgpu: fix the hibernation suspend with s0ix > > Qingqing Zhuo (2): > drm/amd/display: enable DP DSC Compliance automation > drm/amd/display: add log for automated test > > Qu Huang (2): > drm/amdkfd: Fix cat debugfs hang_hws file causes system crash bug > drm/amdkfd: dqm fence memory corruption > > Rodrigo Siqueira (1): > drm/amd/display: Add refresh rate trace > > Rohit Khaire (1): > drm/amdgpu: Add new PF2VF flags for VF register access method > > Roman Li (1): > drm/amd/display: Populate socclk entries for dcn2.1 > > Sefa Eyeoglu (1): > drm/amd/display: check fb of primary plane > > Shirish S (1): > drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD > > Stylon Wang (1): > drm/amd/display: Guard ASSR with internal display flag > > Tian Tao (3): > drm/radeon/radeon_pm: Convert sysfs sprintf/snprintf family to sysfs_emit > drm/amdgpu: Convert sysfs sprintf/snprintf family to sysfs_emit > drm/amd/pm: Convert sysfs sprintf/snprintf family to sysfs_emit > > Tom St Denis (1): > drm/amd/amdgpu: Add CP_IB1_BASE_* to gc_10_3_0 headers > > Tong Zhang (1): > drm/radeon: don't evict if not initialized > > Victor Lu (2): > drm/amd/display: Deallocate IRQ handlers on amdgpu_dm_irq_fini > drm/amd/display: Use pr_debug in DM to prevent dmesg flooding > > Vladimir Stempen (1): > drm/amd/display: Fix typo for variable name > > Wan Jiabing (1): > drivers: gpu: Remove duplicate include of amdgpu_hdp.h > > Wayne Lin (1): > drm/amd/display: Add kernel doc to crc_rd_wrk field > > Wenjing Liu (2): > drm/amd/display: define mod_hdcp_display_disable_option struct > drm/amd/display: add mod hdcp interface for supporting encryption state query > > Werner Sembach (1): > drm/amd/display: Try YCbCr420 color when YCbCr444 fails > > Wesley Chalmers (6): > drm/amd/display: BIOS LTTPR Caps Interface > drm/amd/display: Interface for LTTPR interop > drm/amd/display: Enumerate LTTPR modes > drm/amd/display: LTTPR config logic > drm/amd/display: New path for enabling DPG > drm/amd/display: Set max TTU on DPG enable > > Xiaojian Du (1): > Revert "drm/amdgpu: disable gpu reset on Vangogh for now" > > Xℹ Ruoyao (1): > drm/amdgpu: check alignment on CPU page for bo map > > xinhui pan (1): > drm/amdgpu: Use correct size when access vram > > drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- > drivers/gpu/drm/amd/amdgpu/aldebaran.c | 407 +++++++ > drivers/gpu/drm/amd/amdgpu/aldebaran.h | 32 + > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 35 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 414 ++++--- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 102 ++ > drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 + > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 102 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 + > drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 40 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + > drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 - > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 - > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 94 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 19 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 51 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 + > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 23 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 98 ++ > drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 85 ++ > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 10 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 11 + > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 32 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 +- > drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 17 +- > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 +- > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- > drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 15 +- > drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 20 +- > drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 26 +- > drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 17 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 3 +- > drivers/gpu/drm/amd/amdgpu/nv.c | 30 +- > drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 25 + > drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +- > drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- > drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +- > drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 2 +- > drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- > drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 5 +- > drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- > drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 143 ++- > drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +- > drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 116 +- > drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- > drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 7 +- > .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +- > .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- > drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 8 +- > drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 +- > drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- > drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 2 +- > drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 28 +- > drivers/gpu/drm/amd/amdkfd/kfd_process.c | 108 +- > .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 203 +++- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 + > .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 19 +- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 6 +- > .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 12 +- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 72 ++ > .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 134 +-- > .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 40 + > drivers/gpu/drm/amd/display/dc/Makefile | 5 +- > drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 190 ++++ > drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1154 ++++++++++---------- > drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 120 +- > .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 + > .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 7 + > .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 101 +- > .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 28 +- > drivers/gpu/drm/amd/display/dc/core/dc.c | 46 +- > drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +- > drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 207 +++- > .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 303 +++++ > drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 24 +- > drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 + > drivers/gpu/drm/amd/display/dc/dc.h | 2 +- > drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 6 + > drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- > drivers/gpu/drm/amd/display/dc/dc_stream.h | 16 + > drivers/gpu/drm/amd/display/dc/dc_types.h | 15 + > drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- > drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- > .../amd/display/dc/dce110/dce110_hw_sequencer.c | 9 +- > .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 16 +- > .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 24 +- > .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 3 +- > .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- > drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 2 +- > .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 3 +- > .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 32 +- > .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- > .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- > .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- > .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +- > .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 28 +- > .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 28 +- > .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 28 +- > .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 28 +- > .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 28 +- > drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 + > drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 10 +- > drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + > .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 13 + > drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 +- > drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 86 ++ > .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 29 +- > .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 25 +- > .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 30 + > drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 41 +- > drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 144 ++- > drivers/gpu/drm/amd/display/include/logger_types.h | 3 + > .../drm/amd/display/modules/color/color_gamma.c | 6 +- > .../drm/amd/display/modules/color/color_gamma.h | 4 +- > .../drm/amd/display/modules/freesync/freesync.c | 37 +- > drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 10 +- > drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 4 +- > .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 37 +- > .../amd/display/modules/hdcp/hdcp1_transition.c | 6 +- > .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 10 +- > .../amd/display/modules/hdcp/hdcp2_transition.c | 10 +- > .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 10 + > .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 7 +- > drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 10 +- > .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 6 + > .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 9 + > drivers/gpu/drm/amd/include/atombios.h | 4 +- > drivers/gpu/drm/amd/include/atomfirmware.h | 38 +- > drivers/gpu/drm/amd/include/kgd_pp_interface.h | 14 + > drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 +- > drivers/gpu/drm/amd/pm/amdgpu_pm.c | 198 +++- > drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 3 +- > drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 128 +-- > .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 11 +- > drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + > drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- > drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 5 +- > .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 13 +- > .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 3 +- > .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 +- > .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 4 +- > drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 406 ++++--- > drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + > drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 25 + > .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 18 + > drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 5 + > drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 71 +- > drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 58 +- > drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 30 +- > drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 5 + > drivers/gpu/drm/drm_atomic.c | 4 +- > drivers/gpu/drm/radeon/r600_cs.c | 6 +- > drivers/gpu/drm/radeon/radeon_object.c | 2 + > drivers/gpu/drm/radeon/radeon_pm.c | 36 +- > drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- > drivers/gpu/drm/scheduler/sched_entity.c | 6 +- > drivers/gpu/drm/scheduler/sched_main.c | 103 +- > drivers/gpu/drm/ttm/ttm_bo_util.c | 14 + > include/drm/gpu_scheduler.h | 3 + > 197 files changed, 5039 insertions(+), 2273 deletions(-) > create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.c > create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.h > create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c > create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h > create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c > create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
On Tue, Apr 6, 2021 at 11:42 AM Felix Kuehling <felix.kuehling@amd.com> wrote: > > Am 2021-04-01 um 6:29 p.m. schrieb Alex Deucher: > > Hi Dave, Daniel, > > > > New stuff for 5.13. There are two small patches for ttm and scheduler > > that were dependencies for amdgpu changes. > > > > The following changes since commit 2cbcb78c9ee5520c8d836c7ff57d1b60ebe8e9b7: > > > > Merge tag 'amd-drm-next-5.13-2021-03-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-03-26 15:53:21 +0100) > > > > are available in the Git repository at: > > > > https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.13-2021-04-01 > > > > for you to fetch changes up to ef95d2a98d642a537190d73c45ae3c308afee890: > > > > drm/amdgpu/display: fix warning on 32 bit in dmub (2021-04-01 17:32:32 -0400) > > > > ---------------------------------------------------------------- > > amd-drm-next-5.13-2021-04-01: > > > > amdgpu: > > - Re-enable GPU reset on VanGogh > > - Enable DPM flags for SMART_SUSPEND and MAY_SKIP_RESUME > > - Disentangle HG from vga_switcheroo > > - S0ix fixes > > - W=1 fixes > > - Resource iterator fixes > > - DMCUB updates > > - UBSAN fixes > > - More PM API cleanup > > - Aldebaran updates > > - Modifier fixes > > - Enable VCN load balancing with asymmetric engines > > - Rework BO structs > > - Aldebaran reset support > > - Initial LTTPR display work > > - Display MALL fixes > > - Fall back to YCbCr420 when YCbCr444 fails > > - SR-IOV fixes > > - Misc cleanups and fixes > > > > radeon: > > - Typo fixes > > > > ttm: > > - Handle cached requests (required for Aldebaran) > > > > scheduler: > > - Fix runqueue selection when changing priorities (required to fix VCN > > load balancing) > > > > ---------------------------------------------------------------- > > Alex Deucher (20): > > drm/amdgpu/display/dm: add missing parameter documentation > > drm/amdgpu: Add additional Sienna Cichlid PCI ID > > drm/amdgpu: add a dev_pm_ops prepare callback (v2) > > drm/amdgpu: enable DPM_FLAG_MAY_SKIP_RESUME and DPM_FLAG_SMART_SUSPEND flags (v2) > > drm/amdgpu: disentangle HG systems from vgaswitcheroo > > drm/amdgpu: rework S3/S4/S0ix state handling > > drm/amdgpu: don't evict vram on APUs for suspend to ram (v4) > > drm/amdgpu: clean up non-DC suspend/resume handling > > drm/amdgpu: move s0ix check into amdgpu_device_ip_suspend_phase2 (v3) > > drm/amdgpu: re-enable suspend phase 2 for S0ix > > drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend > > drm/amdgpu: update comments about s0ix suspend/resume > > drm/amdgpu: drop S0ix checks around CG/PG in suspend > > drm/amdgpu: skip kfd suspend/resume for S0ix > > drm/amdgpu/display: restore AUX_DPHY_TX_CONTROL for DCN2.x > > drm/amdgpu/display: fix memory leak for dimgrey cavefish > > drm/amdgpu/pm: mark pcie link/speed arrays as const > > drm/amdgpu/pm: bail on sysfs/debugfs queries during platform suspend > > drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in suspend > > drm/amdgpu/display: fix warning on 32 bit in dmub > > > > Alex Sierra (2): > > drm/amdgpu: replace per_device_list by array > > drm/amdgpu: ih reroute for newer asics than vega20 > > > > Alvin Lee (1): > > drm/amd/display: Change input parameter for set_drr > > > > Anson Jacob (2): > > drm/amd/display: Fix UBSAN: shift-out-of-bounds warning > > drm/amd/display: Removing unused code from dmub_cmd.h > > > > Anthony Koo (2): > > drm/amd/display: [FW Promotion] Release 0.0.57 > > drm/amd/display: [FW Promotion] Release 0.0.58 > > > > Aric Cyr (2): > > drm/amd/display: 3.2.128 > > drm/amd/display: 3.2.129 > > > > Arnd Bergmann (3): > > amdgpu: avoid incorrect %hu format string > > amdgpu: fix gcc -Wrestrict warning > > amdgpu: securedisplay: simplify i2c hexdump output > > > > Bhaskar Chowdhury (6): > > drm/amdgpu: Fix a typo > > drm/amdgpu: Fix a typo > > drm/atomic: Couple of typo fixes > > drm/radeon/r600_cs: Few typo fixes > > drm/amd/amdgpu/gfx_v7_0: Trivial typo fixes > > drm/amd: Fix a typo in two different sentences > > > > Bindu Ramamurthy (1): > > drm/amd/display: Allow idle optimization based on vblank. > > > > Chengming Gui (1): > > drm/amd/amdgpu: set MP1 state to UNLOAD before reload its FW for vega20/ALDEBARAN > > > > Chris Park (1): > > drm/amd/display: Disable MALL when SMU not present > > > > Christian König (5): > > drm/amdgpu: remove irq_src->data handling > > drm/amdgpu: add the sched_score to amdgpu_ring_init > > drm/amdgpu: share scheduler score on VCN3 instances > > drm/sched: select new rq even if there is only one v3 > > drm/amdgpu: load balance VCN3 decode as well v8 > > > > Daniel Gomez (2): > > drm/amdgpu/ttm: Fix memory leak userptr pages > > This introduced a regression for KFD, which I pointed out at the time. > Was there ever a fix for that. I thought Christian fixed that. Alex > > Regards, > Felix > > > > drm/radeon/ttm: Fix memory leak userptr pages > > > > David Galiffi (1): > > drm/amd/display: Fixed Clock Recovery Sequence > > > > Dennis Li (1): > > drm/amdgpu: add codes to capture invalid hardware access when recovery > > > > Diego Viola (1): > > drm/amd/display: fix typo: liason -> liaison > > > > Dmytro Laktyushkin (3): > > drm/amd/display: hide VGH asic specific structs > > drm/amd/display: revert max lb lines change > > drm/amd/display: revert max lb use by default for n10 > > > > Eryk Brol (1): > > drm/amd/display: Fix MST topology debugfs > > > > Evan Quan (9): > > drm/amd/pm: fix Navi1x runtime resume failure V2 > > drm/amd/pm: make DAL communicate with SMU through unified interfaces > > drm/amd/pm: label these APIs used internally as static > > drm/amd/pm: drop redundant and unneeded BACO APIs V2 > > drm/amd/pm: no need to force MCLK to highest when no display connected > > drm/amd/pm: unify the interface for loading SMU microcode > > drm/amd/pm: fix missing static declarations > > drm/amd/pm: unify the interface for power gating > > drm/amd/pm: unify the interface for gfx state setting > > > > Fangzhi Zuo (1): > > drm/amd/display: Fix debugfs link_settings entry > > > > Feifei Xu (1): > > drm/amdgpu: skip PP_MP1_STATE_UNLOAD on aldebaran > > > > Guchun Chen (6): > > drm/amd/pm: fix MP1 state setting failure in s3 test > > drm/amd/pm: fix gpu reset failure by MP1 state setting > > drm/amd/display: add DMCUB trace irq support for DCN302 > > drm/amdgpu: fix NULL pointer dereference > > drm/amdgpu: fix compiler warning(v2) > > drm/radeon: avoid potential null pointer access > > > > Horace Chen (1): > > drm/amdgpu: move vram recover into sriov full access > > > > Huacai Chen (1): > > drm/amdgpu: Set a suitable dev_info.gart_page_size > > > > Jack Zhang (1): > > drm/amd/amdgpu implement tdr advanced mode > > > > Jake Wang (1): > > drm/amd/display: Use pwrseq instance to determine eDP instance > > > > Jimmy Kizito (2): > > drm/amd/display: Add dynamic link encoder selection. > > drm/amd/display: Update display endpoint control path. > > > > John Clements (2): > > drm/amdgpu: update host to psp interface > > drm/amdgpu: added support for dynamic GECC > > > > Krunoslav Kovac (1): > > drm/amd/display: Rename fs_params to hdr_tm_params > > > > Lee Jones (3): > > drm/amd/display/dc/dce80/dce80_resource: Make local functions static > > drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap > > drm/amd/display/dc/calcs/dce_calcs: Remove some large variables from the stack > > > > Leo (Hanghong) Ma (2): > > drm/amd/display: Log DMCUB trace buffer events > > drm/amd/display: Fix static checker warnings on tracebuff_fb > > > > Lijo Lazar (14): > > drm/amdgpu: Enable VCN/JPEG CG on aldebaran > > drm/amd/pm: Update aldebaran pmfw interface > > drm/amd/pm: Modify mode2 msg sequence on aldebaran > > drm/amd/pm: Add function to wait for smu events > > drm/amd/pm: Add support for reset completion on aldebaran > > drm/amdgpu: Add reset control to amdgpu_device > > drm/amdgpu: Add reset control handling to reset workflow > > drm/amdgpu: Add PSP public function to load a list of FWs > > drm/amdgpu: Make set PG/CG state functions public > > drm/amdgpu: Add mode2 reset support for aldebaran > > drm/amdgpu: Enable recovery on aldebaran > > drm/amdgpu: Fix build warnings > > drm/amd/pm: Fix DPM level count on aldebaran > > drm/amdgpu: Reset error code for 'no handler' case > > > > Luben Tuikov (2): > > drm/amd/display: Use appropriate DRM_DEBUG_... level > > drm/amdgpu: Fix check for RAS support > > > > Mark Yacoub (1): > > drm/amdgpu: Ensure that the modifier requested is supported by plane. > > > > Nikola Cornij (1): > > drm/amd/display: Fix black screen with scaled modes on some eDP panels > > > > Nirmoy Das (9): > > drm/amdgpu: wrap kiq ring ops with kiq spinlock > > drm/amd/display: use GFP_ATOMIC in dcn20_resource_construct > > drm/amdgpu: fix amdgpu_res_first() > > drm/amdgpu: allow variable BO struct creation > > drm/amdgpu: introduce struct amdgpu_bo_user > > drm/amdgpu: use amdgpu_bo_create_user() for when possible > > drm/amdgpu: use amdgpu_bo_user bo for metadata and tiling flag > > drm/amdgpu: make BO type check less restrictive > > drm/amdgpu: fix offset calculation in amdgpu_vm_bo_clear_mappings() > > > > Oak Zeng (1): > > drm/ttm: ioremap buffer according to TTM mem caching setting > > > > Philip Cox (1): > > drm/amdgpu: Set amdgpu.noretry=1 for Arcturus > > > > Pratik Vishwakarma (1): > > drm/amdgpu: skip CG/PG for gfx during S0ix > > > > Prike Liang (1): > > drm/amdgpu: fix the hibernation suspend with s0ix > > > > Qingqing Zhuo (2): > > drm/amd/display: enable DP DSC Compliance automation > > drm/amd/display: add log for automated test > > > > Qu Huang (2): > > drm/amdkfd: Fix cat debugfs hang_hws file causes system crash bug > > drm/amdkfd: dqm fence memory corruption > > > > Rodrigo Siqueira (1): > > drm/amd/display: Add refresh rate trace > > > > Rohit Khaire (1): > > drm/amdgpu: Add new PF2VF flags for VF register access method > > > > Roman Li (1): > > drm/amd/display: Populate socclk entries for dcn2.1 > > > > Sefa Eyeoglu (1): > > drm/amd/display: check fb of primary plane > > > > Shirish S (1): > > drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD > > > > Stylon Wang (1): > > drm/amd/display: Guard ASSR with internal display flag > > > > Tian Tao (3): > > drm/radeon/radeon_pm: Convert sysfs sprintf/snprintf family to sysfs_emit > > drm/amdgpu: Convert sysfs sprintf/snprintf family to sysfs_emit > > drm/amd/pm: Convert sysfs sprintf/snprintf family to sysfs_emit > > > > Tom St Denis (1): > > drm/amd/amdgpu: Add CP_IB1_BASE_* to gc_10_3_0 headers > > > > Tong Zhang (1): > > drm/radeon: don't evict if not initialized > > > > Victor Lu (2): > > drm/amd/display: Deallocate IRQ handlers on amdgpu_dm_irq_fini > > drm/amd/display: Use pr_debug in DM to prevent dmesg flooding > > > > Vladimir Stempen (1): > > drm/amd/display: Fix typo for variable name > > > > Wan Jiabing (1): > > drivers: gpu: Remove duplicate include of amdgpu_hdp.h > > > > Wayne Lin (1): > > drm/amd/display: Add kernel doc to crc_rd_wrk field > > > > Wenjing Liu (2): > > drm/amd/display: define mod_hdcp_display_disable_option struct > > drm/amd/display: add mod hdcp interface for supporting encryption state query > > > > Werner Sembach (1): > > drm/amd/display: Try YCbCr420 color when YCbCr444 fails > > > > Wesley Chalmers (6): > > drm/amd/display: BIOS LTTPR Caps Interface > > drm/amd/display: Interface for LTTPR interop > > drm/amd/display: Enumerate LTTPR modes > > drm/amd/display: LTTPR config logic > > drm/amd/display: New path for enabling DPG > > drm/amd/display: Set max TTU on DPG enable > > > > Xiaojian Du (1): > > Revert "drm/amdgpu: disable gpu reset on Vangogh for now" > > > > Xℹ Ruoyao (1): > > drm/amdgpu: check alignment on CPU page for bo map > > > > xinhui pan (1): > > drm/amdgpu: Use correct size when access vram > > > > drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- > > drivers/gpu/drm/amd/amdgpu/aldebaran.c | 407 +++++++ > > drivers/gpu/drm/amd/amdgpu/aldebaran.h | 32 + > > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 35 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 414 ++++--- > > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 102 ++ > > drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 102 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 40 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 - > > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 - > > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 94 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 19 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 51 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 23 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 2 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 98 ++ > > drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 85 ++ > > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 6 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 10 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 1 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 11 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 32 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 +- > > drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 17 +- > > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 +- > > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- > > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- > > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 8 +- > > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- > > drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 15 +- > > drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 20 +- > > drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 26 +- > > drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- > > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 17 +- > > drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 3 +- > > drivers/gpu/drm/amd/amdgpu/nv.c | 30 +- > > drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 25 + > > drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 8 +- > > drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- > > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- > > drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- > > drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +- > > drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- > > drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +- > > drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 5 +- > > drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 143 ++- > > drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +- > > drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 116 +- > > drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- > > drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 7 +- > > .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +- > > .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- > > drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 8 +- > > drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 +- > > drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- > > drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 2 +- > > drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 28 +- > > drivers/gpu/drm/amd/amdkfd/kfd_process.c | 108 +- > > .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 203 +++- > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 + > > .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 19 +- > > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 6 +- > > .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 12 +- > > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 72 ++ > > .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 134 +-- > > .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 40 + > > drivers/gpu/drm/amd/display/dc/Makefile | 5 +- > > drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 190 ++++ > > drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1154 ++++++++++---------- > > drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 120 +- > > .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 + > > .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 7 + > > .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 101 +- > > .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 28 +- > > drivers/gpu/drm/amd/display/dc/core/dc.c | 46 +- > > drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +- > > drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 207 +++- > > .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 303 +++++ > > drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 24 +- > > drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 + > > drivers/gpu/drm/amd/display/dc/dc.h | 2 +- > > drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 6 + > > drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- > > drivers/gpu/drm/amd/display/dc/dc_stream.h | 16 + > > drivers/gpu/drm/amd/display/dc/dc_types.h | 15 + > > drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- > > drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- > > .../amd/display/dc/dce110/dce110_hw_sequencer.c | 9 +- > > .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 16 +- > > .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 24 +- > > .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 3 +- > > .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- > > drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 2 +- > > .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 3 +- > > .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 32 +- > > .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- > > .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- > > .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- > > .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +- > > .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 28 +- > > .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 28 +- > > .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 28 +- > > .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 28 +- > > .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 28 +- > > drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 + > > drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 10 +- > > drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + > > .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 13 + > > drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 +- > > drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 86 ++ > > .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 29 +- > > .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 25 +- > > .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 30 + > > drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 41 +- > > drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 144 ++- > > drivers/gpu/drm/amd/display/include/logger_types.h | 3 + > > .../drm/amd/display/modules/color/color_gamma.c | 6 +- > > .../drm/amd/display/modules/color/color_gamma.h | 4 +- > > .../drm/amd/display/modules/freesync/freesync.c | 37 +- > > drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 10 +- > > drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 4 +- > > .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 37 +- > > .../amd/display/modules/hdcp/hdcp1_transition.c | 6 +- > > .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 10 +- > > .../amd/display/modules/hdcp/hdcp2_transition.c | 10 +- > > .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 10 + > > .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 7 +- > > drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 10 +- > > .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 6 + > > .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 9 + > > drivers/gpu/drm/amd/include/atombios.h | 4 +- > > drivers/gpu/drm/amd/include/atomfirmware.h | 38 +- > > drivers/gpu/drm/amd/include/kgd_pp_interface.h | 14 + > > drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 +- > > drivers/gpu/drm/amd/pm/amdgpu_pm.c | 198 +++- > > drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 3 +- > > drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 128 +-- > > .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 11 +- > > drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + > > drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- > > drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 5 +- > > .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 13 +- > > .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 3 +- > > .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 +- > > .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 4 +- > > drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 406 ++++--- > > drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + > > drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 25 + > > .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 18 + > > drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 5 + > > drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 71 +- > > drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 58 +- > > drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 30 +- > > drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 5 + > > drivers/gpu/drm/drm_atomic.c | 4 +- > > drivers/gpu/drm/radeon/r600_cs.c | 6 +- > > drivers/gpu/drm/radeon/radeon_object.c | 2 + > > drivers/gpu/drm/radeon/radeon_pm.c | 36 +- > > drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- > > drivers/gpu/drm/scheduler/sched_entity.c | 6 +- > > drivers/gpu/drm/scheduler/sched_main.c | 103 +- > > drivers/gpu/drm/ttm/ttm_bo_util.c | 14 + > > include/drm/gpu_scheduler.h | 3 + > > 197 files changed, 5039 insertions(+), 2273 deletions(-) > > create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.c > > create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.h > > create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c > > create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h > > create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c > > create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h > > _______________________________________________ > > amd-gfx mailing list > > amd-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/amd-gfx > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
On Fri, Apr 2, 2021 at 12:22 PM Christian König <ckoenig.leichtzumerken@gmail.com> wrote: > > Hey Alex, > > the TTM and scheduler changes should already be in the drm-misc-next > branch (not 100% sure about the TTM patch, need to double check next week). > The TTM change is not in drm-misc yet. > Could that cause problems when both are merged into drm-next? Dave, Daniel, how do you want to handle this? The duplicated patch is this one: https://cgit.freedesktop.org/drm/drm-misc/commit/?id=ac4eb83ab255de9c31184df51fd1534ba36fd212 amdgpu has changes which depend on it. The same patch is included in this PR. Thanks, Alex > > Thanks, > Christian. > > Am 02.04.21 um 00:29 schrieb Alex Deucher: > > Hi Dave, Daniel, > > > > New stuff for 5.13. There are two small patches for ttm and scheduler > > that were dependencies for amdgpu changes. > > > > The following changes since commit 2cbcb78c9ee5520c8d836c7ff57d1b60ebe8e9b7: > > > > Merge tag 'amd-drm-next-5.13-2021-03-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-03-26 15:53:21 +0100) > > > > are available in the Git repository at: > > > > https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.13-2021-04-01 > > > > for you to fetch changes up to ef95d2a98d642a537190d73c45ae3c308afee890: > > > > drm/amdgpu/display: fix warning on 32 bit in dmub (2021-04-01 17:32:32 -0400) > > > > ---------------------------------------------------------------- > > amd-drm-next-5.13-2021-04-01: > > > > amdgpu: > > - Re-enable GPU reset on VanGogh > > - Enable DPM flags for SMART_SUSPEND and MAY_SKIP_RESUME > > - Disentangle HG from vga_switcheroo > > - S0ix fixes > > - W=1 fixes > > - Resource iterator fixes > > - DMCUB updates > > - UBSAN fixes > > - More PM API cleanup > > - Aldebaran updates > > - Modifier fixes > > - Enable VCN load balancing with asymmetric engines > > - Rework BO structs > > - Aldebaran reset support > > - Initial LTTPR display work > > - Display MALL fixes > > - Fall back to YCbCr420 when YCbCr444 fails > > - SR-IOV fixes > > - Misc cleanups and fixes > > > > radeon: > > - Typo fixes > > > > ttm: > > - Handle cached requests (required for Aldebaran) > > > > scheduler: > > - Fix runqueue selection when changing priorities (required to fix VCN > > load balancing) > > > > ---------------------------------------------------------------- > > Alex Deucher (20): > > drm/amdgpu/display/dm: add missing parameter documentation > > drm/amdgpu: Add additional Sienna Cichlid PCI ID > > drm/amdgpu: add a dev_pm_ops prepare callback (v2) > > drm/amdgpu: enable DPM_FLAG_MAY_SKIP_RESUME and DPM_FLAG_SMART_SUSPEND flags (v2) > > drm/amdgpu: disentangle HG systems from vgaswitcheroo > > drm/amdgpu: rework S3/S4/S0ix state handling > > drm/amdgpu: don't evict vram on APUs for suspend to ram (v4) > > drm/amdgpu: clean up non-DC suspend/resume handling > > drm/amdgpu: move s0ix check into amdgpu_device_ip_suspend_phase2 (v3) > > drm/amdgpu: re-enable suspend phase 2 for S0ix > > drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend > > drm/amdgpu: update comments about s0ix suspend/resume > > drm/amdgpu: drop S0ix checks around CG/PG in suspend > > drm/amdgpu: skip kfd suspend/resume for S0ix > > drm/amdgpu/display: restore AUX_DPHY_TX_CONTROL for DCN2.x > > drm/amdgpu/display: fix memory leak for dimgrey cavefish > > drm/amdgpu/pm: mark pcie link/speed arrays as const > > drm/amdgpu/pm: bail on sysfs/debugfs queries during platform suspend > > drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in suspend > > drm/amdgpu/display: fix warning on 32 bit in dmub > > > > Alex Sierra (2): > > drm/amdgpu: replace per_device_list by array > > drm/amdgpu: ih reroute for newer asics than vega20 > > > > Alvin Lee (1): > > drm/amd/display: Change input parameter for set_drr > > > > Anson Jacob (2): > > drm/amd/display: Fix UBSAN: shift-out-of-bounds warning > > drm/amd/display: Removing unused code from dmub_cmd.h > > > > Anthony Koo (2): > > drm/amd/display: [FW Promotion] Release 0.0.57 > > drm/amd/display: [FW Promotion] Release 0.0.58 > > > > Aric Cyr (2): > > drm/amd/display: 3.2.128 > > drm/amd/display: 3.2.129 > > > > Arnd Bergmann (3): > > amdgpu: avoid incorrect %hu format string > > amdgpu: fix gcc -Wrestrict warning > > amdgpu: securedisplay: simplify i2c hexdump output > > > > Bhaskar Chowdhury (6): > > drm/amdgpu: Fix a typo > > drm/amdgpu: Fix a typo > > drm/atomic: Couple of typo fixes > > drm/radeon/r600_cs: Few typo fixes > > drm/amd/amdgpu/gfx_v7_0: Trivial typo fixes > > drm/amd: Fix a typo in two different sentences > > > > Bindu Ramamurthy (1): > > drm/amd/display: Allow idle optimization based on vblank. > > > > Chengming Gui (1): > > drm/amd/amdgpu: set MP1 state to UNLOAD before reload its FW for vega20/ALDEBARAN > > > > Chris Park (1): > > drm/amd/display: Disable MALL when SMU not present > > > > Christian König (5): > > drm/amdgpu: remove irq_src->data handling > > drm/amdgpu: add the sched_score to amdgpu_ring_init > > drm/amdgpu: share scheduler score on VCN3 instances > > drm/sched: select new rq even if there is only one v3 > > drm/amdgpu: load balance VCN3 decode as well v8 > > > > Daniel Gomez (2): > > drm/amdgpu/ttm: Fix memory leak userptr pages > > drm/radeon/ttm: Fix memory leak userptr pages > > > > David Galiffi (1): > > drm/amd/display: Fixed Clock Recovery Sequence > > > > Dennis Li (1): > > drm/amdgpu: add codes to capture invalid hardware access when recovery > > > > Diego Viola (1): > > drm/amd/display: fix typo: liason -> liaison > > > > Dmytro Laktyushkin (3): > > drm/amd/display: hide VGH asic specific structs > > drm/amd/display: revert max lb lines change > > drm/amd/display: revert max lb use by default for n10 > > > > Eryk Brol (1): > > drm/amd/display: Fix MST topology debugfs > > > > Evan Quan (9): > > drm/amd/pm: fix Navi1x runtime resume failure V2 > > drm/amd/pm: make DAL communicate with SMU through unified interfaces > > drm/amd/pm: label these APIs used internally as static > > drm/amd/pm: drop redundant and unneeded BACO APIs V2 > > drm/amd/pm: no need to force MCLK to highest when no display connected > > drm/amd/pm: unify the interface for loading SMU microcode > > drm/amd/pm: fix missing static declarations > > drm/amd/pm: unify the interface for power gating > > drm/amd/pm: unify the interface for gfx state setting > > > > Fangzhi Zuo (1): > > drm/amd/display: Fix debugfs link_settings entry > > > > Feifei Xu (1): > > drm/amdgpu: skip PP_MP1_STATE_UNLOAD on aldebaran > > > > Guchun Chen (6): > > drm/amd/pm: fix MP1 state setting failure in s3 test > > drm/amd/pm: fix gpu reset failure by MP1 state setting > > drm/amd/display: add DMCUB trace irq support for DCN302 > > drm/amdgpu: fix NULL pointer dereference > > drm/amdgpu: fix compiler warning(v2) > > drm/radeon: avoid potential null pointer access > > > > Horace Chen (1): > > drm/amdgpu: move vram recover into sriov full access > > > > Huacai Chen (1): > > drm/amdgpu: Set a suitable dev_info.gart_page_size > > > > Jack Zhang (1): > > drm/amd/amdgpu implement tdr advanced mode > > > > Jake Wang (1): > > drm/amd/display: Use pwrseq instance to determine eDP instance > > > > Jimmy Kizito (2): > > drm/amd/display: Add dynamic link encoder selection. > > drm/amd/display: Update display endpoint control path. > > > > John Clements (2): > > drm/amdgpu: update host to psp interface > > drm/amdgpu: added support for dynamic GECC > > > > Krunoslav Kovac (1): > > drm/amd/display: Rename fs_params to hdr_tm_params > > > > Lee Jones (3): > > drm/amd/display/dc/dce80/dce80_resource: Make local functions static > > drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap > > drm/amd/display/dc/calcs/dce_calcs: Remove some large variables from the stack > > > > Leo (Hanghong) Ma (2): > > drm/amd/display: Log DMCUB trace buffer events > > drm/amd/display: Fix static checker warnings on tracebuff_fb > > > > Lijo Lazar (14): > > drm/amdgpu: Enable VCN/JPEG CG on aldebaran > > drm/amd/pm: Update aldebaran pmfw interface > > drm/amd/pm: Modify mode2 msg sequence on aldebaran > > drm/amd/pm: Add function to wait for smu events > > drm/amd/pm: Add support for reset completion on aldebaran > > drm/amdgpu: Add reset control to amdgpu_device > > drm/amdgpu: Add reset control handling to reset workflow > > drm/amdgpu: Add PSP public function to load a list of FWs > > drm/amdgpu: Make set PG/CG state functions public > > drm/amdgpu: Add mode2 reset support for aldebaran > > drm/amdgpu: Enable recovery on aldebaran > > drm/amdgpu: Fix build warnings > > drm/amd/pm: Fix DPM level count on aldebaran > > drm/amdgpu: Reset error code for 'no handler' case > > > > Luben Tuikov (2): > > drm/amd/display: Use appropriate DRM_DEBUG_... level > > drm/amdgpu: Fix check for RAS support > > > > Mark Yacoub (1): > > drm/amdgpu: Ensure that the modifier requested is supported by plane. > > > > Nikola Cornij (1): > > drm/amd/display: Fix black screen with scaled modes on some eDP panels > > > > Nirmoy Das (9): > > drm/amdgpu: wrap kiq ring ops with kiq spinlock > > drm/amd/display: use GFP_ATOMIC in dcn20_resource_construct > > drm/amdgpu: fix amdgpu_res_first() > > drm/amdgpu: allow variable BO struct creation > > drm/amdgpu: introduce struct amdgpu_bo_user > > drm/amdgpu: use amdgpu_bo_create_user() for when possible > > drm/amdgpu: use amdgpu_bo_user bo for metadata and tiling flag > > drm/amdgpu: make BO type check less restrictive > > drm/amdgpu: fix offset calculation in amdgpu_vm_bo_clear_mappings() > > > > Oak Zeng (1): > > drm/ttm: ioremap buffer according to TTM mem caching setting > > > > Philip Cox (1): > > drm/amdgpu: Set amdgpu.noretry=1 for Arcturus > > > > Pratik Vishwakarma (1): > > drm/amdgpu: skip CG/PG for gfx during S0ix > > > > Prike Liang (1): > > drm/amdgpu: fix the hibernation suspend with s0ix > > > > Qingqing Zhuo (2): > > drm/amd/display: enable DP DSC Compliance automation > > drm/amd/display: add log for automated test > > > > Qu Huang (2): > > drm/amdkfd: Fix cat debugfs hang_hws file causes system crash bug > > drm/amdkfd: dqm fence memory corruption > > > > Rodrigo Siqueira (1): > > drm/amd/display: Add refresh rate trace > > > > Rohit Khaire (1): > > drm/amdgpu: Add new PF2VF flags for VF register access method > > > > Roman Li (1): > > drm/amd/display: Populate socclk entries for dcn2.1 > > > > Sefa Eyeoglu (1): > > drm/amd/display: check fb of primary plane > > > > Shirish S (1): > > drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD > > > > Stylon Wang (1): > > drm/amd/display: Guard ASSR with internal display flag > > > > Tian Tao (3): > > drm/radeon/radeon_pm: Convert sysfs sprintf/snprintf family to sysfs_emit > > drm/amdgpu: Convert sysfs sprintf/snprintf family to sysfs_emit > > drm/amd/pm: Convert sysfs sprintf/snprintf family to sysfs_emit > > > > Tom St Denis (1): > > drm/amd/amdgpu: Add CP_IB1_BASE_* to gc_10_3_0 headers > > > > Tong Zhang (1): > > drm/radeon: don't evict if not initialized > > > > Victor Lu (2): > > drm/amd/display: Deallocate IRQ handlers on amdgpu_dm_irq_fini > > drm/amd/display: Use pr_debug in DM to prevent dmesg flooding > > > > Vladimir Stempen (1): > > drm/amd/display: Fix typo for variable name > > > > Wan Jiabing (1): > > drivers: gpu: Remove duplicate include of amdgpu_hdp.h > > > > Wayne Lin (1): > > drm/amd/display: Add kernel doc to crc_rd_wrk field > > > > Wenjing Liu (2): > > drm/amd/display: define mod_hdcp_display_disable_option struct > > drm/amd/display: add mod hdcp interface for supporting encryption state query > > > > Werner Sembach (1): > > drm/amd/display: Try YCbCr420 color when YCbCr444 fails > > > > Wesley Chalmers (6): > > drm/amd/display: BIOS LTTPR Caps Interface > > drm/amd/display: Interface for LTTPR interop > > drm/amd/display: Enumerate LTTPR modes > > drm/amd/display: LTTPR config logic > > drm/amd/display: New path for enabling DPG > > drm/amd/display: Set max TTU on DPG enable > > > > Xiaojian Du (1): > > Revert "drm/amdgpu: disable gpu reset on Vangogh for now" > > > > Xℹ Ruoyao (1): > > drm/amdgpu: check alignment on CPU page for bo map > > > > xinhui pan (1): > > drm/amdgpu: Use correct size when access vram > > > > drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- > > drivers/gpu/drm/amd/amdgpu/aldebaran.c | 407 +++++++ > > drivers/gpu/drm/amd/amdgpu/aldebaran.h | 32 + > > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 35 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 414 ++++--- > > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 102 ++ > > drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 102 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 40 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 - > > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 - > > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 94 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 19 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 51 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 23 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 2 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 98 ++ > > drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 85 ++ > > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 6 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 10 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 1 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 11 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 32 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 +- > > drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 17 +- > > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 +- > > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- > > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- > > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 8 +- > > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- > > drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 15 +- > > drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 20 +- > > drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 26 +- > > drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- > > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 17 +- > > drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 3 +- > > drivers/gpu/drm/amd/amdgpu/nv.c | 30 +- > > drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 25 + > > drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 8 +- > > drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- > > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- > > drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- > > drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +- > > drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- > > drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +- > > drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 5 +- > > drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 143 ++- > > drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +- > > drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 116 +- > > drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- > > drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 7 +- > > .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +- > > .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- > > drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 8 +- > > drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 +- > > drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- > > drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 2 +- > > drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 28 +- > > drivers/gpu/drm/amd/amdkfd/kfd_process.c | 108 +- > > .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 203 +++- > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 + > > .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 19 +- > > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 6 +- > > .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 12 +- > > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 72 ++ > > .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 134 +-- > > .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 40 + > > drivers/gpu/drm/amd/display/dc/Makefile | 5 +- > > drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 190 ++++ > > drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1154 ++++++++++---------- > > drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 120 +- > > .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 + > > .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 7 + > > .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 101 +- > > .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 28 +- > > drivers/gpu/drm/amd/display/dc/core/dc.c | 46 +- > > drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +- > > drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 207 +++- > > .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 303 +++++ > > drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 24 +- > > drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 + > > drivers/gpu/drm/amd/display/dc/dc.h | 2 +- > > drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 6 + > > drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- > > drivers/gpu/drm/amd/display/dc/dc_stream.h | 16 + > > drivers/gpu/drm/amd/display/dc/dc_types.h | 15 + > > drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- > > drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- > > .../amd/display/dc/dce110/dce110_hw_sequencer.c | 9 +- > > .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 16 +- > > .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 24 +- > > .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 3 +- > > .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- > > drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 2 +- > > .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 3 +- > > .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 32 +- > > .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- > > .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- > > .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- > > .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +- > > .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 28 +- > > .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 28 +- > > .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 28 +- > > .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 28 +- > > .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 28 +- > > drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 + > > drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 10 +- > > drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + > > .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 13 + > > drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 +- > > drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 86 ++ > > .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 29 +- > > .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 25 +- > > .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 30 + > > drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 41 +- > > drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 144 ++- > > drivers/gpu/drm/amd/display/include/logger_types.h | 3 + > > .../drm/amd/display/modules/color/color_gamma.c | 6 +- > > .../drm/amd/display/modules/color/color_gamma.h | 4 +- > > .../drm/amd/display/modules/freesync/freesync.c | 37 +- > > drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 10 +- > > drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 4 +- > > .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 37 +- > > .../amd/display/modules/hdcp/hdcp1_transition.c | 6 +- > > .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 10 +- > > .../amd/display/modules/hdcp/hdcp2_transition.c | 10 +- > > .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 10 + > > .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 7 +- > > drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 10 +- > > .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 6 + > > .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 9 + > > drivers/gpu/drm/amd/include/atombios.h | 4 +- > > drivers/gpu/drm/amd/include/atomfirmware.h | 38 +- > > drivers/gpu/drm/amd/include/kgd_pp_interface.h | 14 + > > drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 +- > > drivers/gpu/drm/amd/pm/amdgpu_pm.c | 198 +++- > > drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 3 +- > > drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 128 +-- > > .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 11 +- > > drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + > > drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- > > drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 5 +- > > .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 13 +- > > .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 3 +- > > .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 +- > > .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 4 +- > > drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 406 ++++--- > > drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + > > drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 25 + > > .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 18 + > > drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 5 + > > drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 71 +- > > drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 58 +- > > drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 30 +- > > drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 5 + > > drivers/gpu/drm/drm_atomic.c | 4 +- > > drivers/gpu/drm/radeon/r600_cs.c | 6 +- > > drivers/gpu/drm/radeon/radeon_object.c | 2 + > > drivers/gpu/drm/radeon/radeon_pm.c | 36 +- > > drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- > > drivers/gpu/drm/scheduler/sched_entity.c | 6 +- > > drivers/gpu/drm/scheduler/sched_main.c | 103 +- > > drivers/gpu/drm/ttm/ttm_bo_util.c | 14 + > > include/drm/gpu_scheduler.h | 3 + > > 197 files changed, 5039 insertions(+), 2273 deletions(-) > > create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.c > > create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.h > > create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c > > create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h > > create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c > > create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h > > _______________________________________________ > > amd-gfx mailing list > > amd-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/amd-gfx > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 06.04.21 um 17:42 schrieb Felix Kuehling: > Am 2021-04-01 um 6:29 p.m. schrieb Alex Deucher: >> Hi Dave, Daniel, >> >> New stuff for 5.13. There are two small patches for ttm and scheduler >> that were dependencies for amdgpu changes. >> >> The following changes since commit 2cbcb78c9ee5520c8d836c7ff57d1b60ebe8e9b7: >> >> Merge tag 'amd-drm-next-5.13-2021-03-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-03-26 15:53:21 +0100) >> >> are available in the Git repository at: >> >> https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.13-2021-04-01 >> >> for you to fetch changes up to ef95d2a98d642a537190d73c45ae3c308afee890: >> >> drm/amdgpu/display: fix warning on 32 bit in dmub (2021-04-01 17:32:32 -0400) >> >> ---------------------------------------------------------------- >> amd-drm-next-5.13-2021-04-01: >> >> amdgpu: >> - Re-enable GPU reset on VanGogh >> - Enable DPM flags for SMART_SUSPEND and MAY_SKIP_RESUME >> - Disentangle HG from vga_switcheroo >> - S0ix fixes >> - W=1 fixes >> - Resource iterator fixes >> - DMCUB updates >> - UBSAN fixes >> - More PM API cleanup >> - Aldebaran updates >> - Modifier fixes >> - Enable VCN load balancing with asymmetric engines >> - Rework BO structs >> - Aldebaran reset support >> - Initial LTTPR display work >> - Display MALL fixes >> - Fall back to YCbCr420 when YCbCr444 fails >> - SR-IOV fixes >> - Misc cleanups and fixes >> >> radeon: >> - Typo fixes >> >> ttm: >> - Handle cached requests (required for Aldebaran) >> >> scheduler: >> - Fix runqueue selection when changing priorities (required to fix VCN >> load balancing) >> >> ---------------------------------------------------------------- >> Alex Deucher (20): >> drm/amdgpu/display/dm: add missing parameter documentation >> drm/amdgpu: Add additional Sienna Cichlid PCI ID >> drm/amdgpu: add a dev_pm_ops prepare callback (v2) >> drm/amdgpu: enable DPM_FLAG_MAY_SKIP_RESUME and DPM_FLAG_SMART_SUSPEND flags (v2) >> drm/amdgpu: disentangle HG systems from vgaswitcheroo >> drm/amdgpu: rework S3/S4/S0ix state handling >> drm/amdgpu: don't evict vram on APUs for suspend to ram (v4) >> drm/amdgpu: clean up non-DC suspend/resume handling >> drm/amdgpu: move s0ix check into amdgpu_device_ip_suspend_phase2 (v3) >> drm/amdgpu: re-enable suspend phase 2 for S0ix >> drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend >> drm/amdgpu: update comments about s0ix suspend/resume >> drm/amdgpu: drop S0ix checks around CG/PG in suspend >> drm/amdgpu: skip kfd suspend/resume for S0ix >> drm/amdgpu/display: restore AUX_DPHY_TX_CONTROL for DCN2.x >> drm/amdgpu/display: fix memory leak for dimgrey cavefish >> drm/amdgpu/pm: mark pcie link/speed arrays as const >> drm/amdgpu/pm: bail on sysfs/debugfs queries during platform suspend >> drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in suspend >> drm/amdgpu/display: fix warning on 32 bit in dmub >> >> Alex Sierra (2): >> drm/amdgpu: replace per_device_list by array >> drm/amdgpu: ih reroute for newer asics than vega20 >> >> Alvin Lee (1): >> drm/amd/display: Change input parameter for set_drr >> >> Anson Jacob (2): >> drm/amd/display: Fix UBSAN: shift-out-of-bounds warning >> drm/amd/display: Removing unused code from dmub_cmd.h >> >> Anthony Koo (2): >> drm/amd/display: [FW Promotion] Release 0.0.57 >> drm/amd/display: [FW Promotion] Release 0.0.58 >> >> Aric Cyr (2): >> drm/amd/display: 3.2.128 >> drm/amd/display: 3.2.129 >> >> Arnd Bergmann (3): >> amdgpu: avoid incorrect %hu format string >> amdgpu: fix gcc -Wrestrict warning >> amdgpu: securedisplay: simplify i2c hexdump output >> >> Bhaskar Chowdhury (6): >> drm/amdgpu: Fix a typo >> drm/amdgpu: Fix a typo >> drm/atomic: Couple of typo fixes >> drm/radeon/r600_cs: Few typo fixes >> drm/amd/amdgpu/gfx_v7_0: Trivial typo fixes >> drm/amd: Fix a typo in two different sentences >> >> Bindu Ramamurthy (1): >> drm/amd/display: Allow idle optimization based on vblank. >> >> Chengming Gui (1): >> drm/amd/amdgpu: set MP1 state to UNLOAD before reload its FW for vega20/ALDEBARAN >> >> Chris Park (1): >> drm/amd/display: Disable MALL when SMU not present >> >> Christian König (5): >> drm/amdgpu: remove irq_src->data handling >> drm/amdgpu: add the sched_score to amdgpu_ring_init >> drm/amdgpu: share scheduler score on VCN3 instances >> drm/sched: select new rq even if there is only one v3 >> drm/amdgpu: load balance VCN3 decode as well v8 >> >> Daniel Gomez (2): >> drm/amdgpu/ttm: Fix memory leak userptr pages > This introduced a regression for KFD, which I pointed out at the time. > Was there ever a fix for that. This was fixed recently by somebody else. I've reviewed the patch, but I'm not sure if it landed inside the branch. Regards, Christian. > > Regards, > Felix > > >> drm/radeon/ttm: Fix memory leak userptr pages >> >> David Galiffi (1): >> drm/amd/display: Fixed Clock Recovery Sequence >> >> Dennis Li (1): >> drm/amdgpu: add codes to capture invalid hardware access when recovery >> >> Diego Viola (1): >> drm/amd/display: fix typo: liason -> liaison >> >> Dmytro Laktyushkin (3): >> drm/amd/display: hide VGH asic specific structs >> drm/amd/display: revert max lb lines change >> drm/amd/display: revert max lb use by default for n10 >> >> Eryk Brol (1): >> drm/amd/display: Fix MST topology debugfs >> >> Evan Quan (9): >> drm/amd/pm: fix Navi1x runtime resume failure V2 >> drm/amd/pm: make DAL communicate with SMU through unified interfaces >> drm/amd/pm: label these APIs used internally as static >> drm/amd/pm: drop redundant and unneeded BACO APIs V2 >> drm/amd/pm: no need to force MCLK to highest when no display connected >> drm/amd/pm: unify the interface for loading SMU microcode >> drm/amd/pm: fix missing static declarations >> drm/amd/pm: unify the interface for power gating >> drm/amd/pm: unify the interface for gfx state setting >> >> Fangzhi Zuo (1): >> drm/amd/display: Fix debugfs link_settings entry >> >> Feifei Xu (1): >> drm/amdgpu: skip PP_MP1_STATE_UNLOAD on aldebaran >> >> Guchun Chen (6): >> drm/amd/pm: fix MP1 state setting failure in s3 test >> drm/amd/pm: fix gpu reset failure by MP1 state setting >> drm/amd/display: add DMCUB trace irq support for DCN302 >> drm/amdgpu: fix NULL pointer dereference >> drm/amdgpu: fix compiler warning(v2) >> drm/radeon: avoid potential null pointer access >> >> Horace Chen (1): >> drm/amdgpu: move vram recover into sriov full access >> >> Huacai Chen (1): >> drm/amdgpu: Set a suitable dev_info.gart_page_size >> >> Jack Zhang (1): >> drm/amd/amdgpu implement tdr advanced mode >> >> Jake Wang (1): >> drm/amd/display: Use pwrseq instance to determine eDP instance >> >> Jimmy Kizito (2): >> drm/amd/display: Add dynamic link encoder selection. >> drm/amd/display: Update display endpoint control path. >> >> John Clements (2): >> drm/amdgpu: update host to psp interface >> drm/amdgpu: added support for dynamic GECC >> >> Krunoslav Kovac (1): >> drm/amd/display: Rename fs_params to hdr_tm_params >> >> Lee Jones (3): >> drm/amd/display/dc/dce80/dce80_resource: Make local functions static >> drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap >> drm/amd/display/dc/calcs/dce_calcs: Remove some large variables from the stack >> >> Leo (Hanghong) Ma (2): >> drm/amd/display: Log DMCUB trace buffer events >> drm/amd/display: Fix static checker warnings on tracebuff_fb >> >> Lijo Lazar (14): >> drm/amdgpu: Enable VCN/JPEG CG on aldebaran >> drm/amd/pm: Update aldebaran pmfw interface >> drm/amd/pm: Modify mode2 msg sequence on aldebaran >> drm/amd/pm: Add function to wait for smu events >> drm/amd/pm: Add support for reset completion on aldebaran >> drm/amdgpu: Add reset control to amdgpu_device >> drm/amdgpu: Add reset control handling to reset workflow >> drm/amdgpu: Add PSP public function to load a list of FWs >> drm/amdgpu: Make set PG/CG state functions public >> drm/amdgpu: Add mode2 reset support for aldebaran >> drm/amdgpu: Enable recovery on aldebaran >> drm/amdgpu: Fix build warnings >> drm/amd/pm: Fix DPM level count on aldebaran >> drm/amdgpu: Reset error code for 'no handler' case >> >> Luben Tuikov (2): >> drm/amd/display: Use appropriate DRM_DEBUG_... level >> drm/amdgpu: Fix check for RAS support >> >> Mark Yacoub (1): >> drm/amdgpu: Ensure that the modifier requested is supported by plane. >> >> Nikola Cornij (1): >> drm/amd/display: Fix black screen with scaled modes on some eDP panels >> >> Nirmoy Das (9): >> drm/amdgpu: wrap kiq ring ops with kiq spinlock >> drm/amd/display: use GFP_ATOMIC in dcn20_resource_construct >> drm/amdgpu: fix amdgpu_res_first() >> drm/amdgpu: allow variable BO struct creation >> drm/amdgpu: introduce struct amdgpu_bo_user >> drm/amdgpu: use amdgpu_bo_create_user() for when possible >> drm/amdgpu: use amdgpu_bo_user bo for metadata and tiling flag >> drm/amdgpu: make BO type check less restrictive >> drm/amdgpu: fix offset calculation in amdgpu_vm_bo_clear_mappings() >> >> Oak Zeng (1): >> drm/ttm: ioremap buffer according to TTM mem caching setting >> >> Philip Cox (1): >> drm/amdgpu: Set amdgpu.noretry=1 for Arcturus >> >> Pratik Vishwakarma (1): >> drm/amdgpu: skip CG/PG for gfx during S0ix >> >> Prike Liang (1): >> drm/amdgpu: fix the hibernation suspend with s0ix >> >> Qingqing Zhuo (2): >> drm/amd/display: enable DP DSC Compliance automation >> drm/amd/display: add log for automated test >> >> Qu Huang (2): >> drm/amdkfd: Fix cat debugfs hang_hws file causes system crash bug >> drm/amdkfd: dqm fence memory corruption >> >> Rodrigo Siqueira (1): >> drm/amd/display: Add refresh rate trace >> >> Rohit Khaire (1): >> drm/amdgpu: Add new PF2VF flags for VF register access method >> >> Roman Li (1): >> drm/amd/display: Populate socclk entries for dcn2.1 >> >> Sefa Eyeoglu (1): >> drm/amd/display: check fb of primary plane >> >> Shirish S (1): >> drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD >> >> Stylon Wang (1): >> drm/amd/display: Guard ASSR with internal display flag >> >> Tian Tao (3): >> drm/radeon/radeon_pm: Convert sysfs sprintf/snprintf family to sysfs_emit >> drm/amdgpu: Convert sysfs sprintf/snprintf family to sysfs_emit >> drm/amd/pm: Convert sysfs sprintf/snprintf family to sysfs_emit >> >> Tom St Denis (1): >> drm/amd/amdgpu: Add CP_IB1_BASE_* to gc_10_3_0 headers >> >> Tong Zhang (1): >> drm/radeon: don't evict if not initialized >> >> Victor Lu (2): >> drm/amd/display: Deallocate IRQ handlers on amdgpu_dm_irq_fini >> drm/amd/display: Use pr_debug in DM to prevent dmesg flooding >> >> Vladimir Stempen (1): >> drm/amd/display: Fix typo for variable name >> >> Wan Jiabing (1): >> drivers: gpu: Remove duplicate include of amdgpu_hdp.h >> >> Wayne Lin (1): >> drm/amd/display: Add kernel doc to crc_rd_wrk field >> >> Wenjing Liu (2): >> drm/amd/display: define mod_hdcp_display_disable_option struct >> drm/amd/display: add mod hdcp interface for supporting encryption state query >> >> Werner Sembach (1): >> drm/amd/display: Try YCbCr420 color when YCbCr444 fails >> >> Wesley Chalmers (6): >> drm/amd/display: BIOS LTTPR Caps Interface >> drm/amd/display: Interface for LTTPR interop >> drm/amd/display: Enumerate LTTPR modes >> drm/amd/display: LTTPR config logic >> drm/amd/display: New path for enabling DPG >> drm/amd/display: Set max TTU on DPG enable >> >> Xiaojian Du (1): >> Revert "drm/amdgpu: disable gpu reset on Vangogh for now" >> >> Xℹ Ruoyao (1): >> drm/amdgpu: check alignment on CPU page for bo map >> >> xinhui pan (1): >> drm/amdgpu: Use correct size when access vram >> >> drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- >> drivers/gpu/drm/amd/amdgpu/aldebaran.c | 407 +++++++ >> drivers/gpu/drm/amd/amdgpu/aldebaran.h | 32 + >> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 35 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 414 ++++--- >> drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 102 ++ >> drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 102 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 40 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 - >> drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 - >> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 94 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 19 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 51 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 23 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 2 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 98 ++ >> drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 85 ++ >> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 6 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 10 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 1 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 11 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 32 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 +- >> drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 17 +- >> drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 +- >> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- >> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- >> drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- >> drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 15 +- >> drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 20 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 26 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 17 +- >> drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 3 +- >> drivers/gpu/drm/amd/amdgpu/nv.c | 30 +- >> drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 25 + >> drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +- >> drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- >> drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 5 +- >> drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 143 ++- >> drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +- >> drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 116 +- >> drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- >> drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 7 +- >> .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +- >> .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- >> drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 8 +- >> drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 +- >> drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- >> drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 2 +- >> drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 28 +- >> drivers/gpu/drm/amd/amdkfd/kfd_process.c | 108 +- >> .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- >> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 203 +++- >> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 + >> .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 19 +- >> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 6 +- >> .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 12 +- >> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 72 ++ >> .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 134 +-- >> .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 40 + >> drivers/gpu/drm/amd/display/dc/Makefile | 5 +- >> drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 190 ++++ >> drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1154 ++++++++++---------- >> drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 120 +- >> .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 + >> .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 7 + >> .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 101 +- >> .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 28 +- >> drivers/gpu/drm/amd/display/dc/core/dc.c | 46 +- >> drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +- >> drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 207 +++- >> .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 303 +++++ >> drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 24 +- >> drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 + >> drivers/gpu/drm/amd/display/dc/dc.h | 2 +- >> drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 6 + >> drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- >> drivers/gpu/drm/amd/display/dc/dc_stream.h | 16 + >> drivers/gpu/drm/amd/display/dc/dc_types.h | 15 + >> drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- >> drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- >> .../amd/display/dc/dce110/dce110_hw_sequencer.c | 9 +- >> .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 16 +- >> .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 24 +- >> .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 3 +- >> .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- >> drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 2 +- >> .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 3 +- >> .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 32 +- >> .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- >> .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- >> .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- >> .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +- >> .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 28 +- >> .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 28 +- >> .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 28 +- >> .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 28 +- >> .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 28 +- >> drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 + >> drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 10 +- >> drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + >> .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 13 + >> drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 +- >> drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 86 ++ >> .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 29 +- >> .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 25 +- >> .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 30 + >> drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 41 +- >> drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 144 ++- >> drivers/gpu/drm/amd/display/include/logger_types.h | 3 + >> .../drm/amd/display/modules/color/color_gamma.c | 6 +- >> .../drm/amd/display/modules/color/color_gamma.h | 4 +- >> .../drm/amd/display/modules/freesync/freesync.c | 37 +- >> drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 10 +- >> drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 4 +- >> .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 37 +- >> .../amd/display/modules/hdcp/hdcp1_transition.c | 6 +- >> .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 10 +- >> .../amd/display/modules/hdcp/hdcp2_transition.c | 10 +- >> .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 10 + >> .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 7 +- >> drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 10 +- >> .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 6 + >> .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 9 + >> drivers/gpu/drm/amd/include/atombios.h | 4 +- >> drivers/gpu/drm/amd/include/atomfirmware.h | 38 +- >> drivers/gpu/drm/amd/include/kgd_pp_interface.h | 14 + >> drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 +- >> drivers/gpu/drm/amd/pm/amdgpu_pm.c | 198 +++- >> drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 3 +- >> drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 128 +-- >> .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 11 +- >> drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + >> drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- >> drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 5 +- >> .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 13 +- >> .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 3 +- >> .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 +- >> .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 4 +- >> drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 406 ++++--- >> drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + >> drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 25 + >> .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 18 + >> drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 5 + >> drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 71 +- >> drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 58 +- >> drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 30 +- >> drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 5 + >> drivers/gpu/drm/drm_atomic.c | 4 +- >> drivers/gpu/drm/radeon/r600_cs.c | 6 +- >> drivers/gpu/drm/radeon/radeon_object.c | 2 + >> drivers/gpu/drm/radeon/radeon_pm.c | 36 +- >> drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- >> drivers/gpu/drm/scheduler/sched_entity.c | 6 +- >> drivers/gpu/drm/scheduler/sched_main.c | 103 +- >> drivers/gpu/drm/ttm/ttm_bo_util.c | 14 + >> include/drm/gpu_scheduler.h | 3 + >> 197 files changed, 5039 insertions(+), 2273 deletions(-) >> create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.c >> create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.h >> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c >> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h >> create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c >> create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h >> _______________________________________________ >> amd-gfx mailing list >> amd-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/amd-gfx > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
On Wed, 7 Apr 2021 at 06:54, Alex Deucher <alexdeucher@gmail.com> wrote: > > On Fri, Apr 2, 2021 at 12:22 PM Christian König > <ckoenig.leichtzumerken@gmail.com> wrote: > > > > Hey Alex, > > > > the TTM and scheduler changes should already be in the drm-misc-next > > branch (not 100% sure about the TTM patch, need to double check next week). > > > > The TTM change is not in drm-misc yet. > > > Could that cause problems when both are merged into drm-next? > > Dave, Daniel, how do you want to handle this? The duplicated patch is this one: > https://cgit.freedesktop.org/drm/drm-misc/commit/?id=ac4eb83ab255de9c31184df51fd1534ba36fd212 > amdgpu has changes which depend on it. The same patch is included in this PR. Ouch not sure how best to sync up here, maybe get misc-next into my tree then rebase your tree on top of it? Dave.
[AMD Public Use] Hi Felix and Christian, If the regression you are talking about is the NULL pointer problem when running KFD tests, it should fixed by below patch in this series. drm/amdgpu: fix NULL pointer dereference Regards, Guchun -----Original Message----- From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Christian König Sent: Wednesday, April 7, 2021 2:57 PM To: Kuehling, Felix <Felix.Kuehling@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; airlied@gmail.com; daniel.vetter@ffwll.ch Subject: Re: [pull] amdgpu, radeon, ttm, sched drm-next-5.13 Am 06.04.21 um 17:42 schrieb Felix Kuehling: > Am 2021-04-01 um 6:29 p.m. schrieb Alex Deucher: >> Hi Dave, Daniel, >> >> New stuff for 5.13. There are two small patches for ttm and >> scheduler that were dependencies for amdgpu changes. >> >> The following changes since commit 2cbcb78c9ee5520c8d836c7ff57d1b60ebe8e9b7: >> >> Merge tag 'amd-drm-next-5.13-2021-03-23' of >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit >> lab.freedesktop.org%2Fagd5f%2Flinux&data=04%7C01%7Cguchun.chen%40 >> amd.com%7C51d1cbcf7ccc43854abb08d8f99250d8%7C3dd8961fe4884e608e11a82d >> 994e183d%7C0%7C0%7C637533754128113017%7CUnknown%7CTWFpbGZsb3d8eyJWIjo >> iMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am >> p;sdata=FcdoL9w5LhBZ849ctXPudr%2BBQnnm7Oiq3pz5X7LGGk4%3D&reserved >> =0 into drm-next (2021-03-26 15:53:21 +0100) >> >> are available in the Git repository at: >> >> >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit >> lab.freedesktop.org%2Fagd5f%2Flinux.git&data=04%7C01%7Cguchun.che >> n%40amd.com%7C51d1cbcf7ccc43854abb08d8f99250d8%7C3dd8961fe4884e608e11 >> a82d994e183d%7C0%7C0%7C637533754128113017%7CUnknown%7CTWFpbGZsb3d8eyJ >> WIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C100 >> 0&sdata=N4JIk%2BEgzleaKYaxvdtT7TR1ZsS6FGsIGpDDUqiQiLw%3D&rese >> rved=0 tags/amd-drm-next-5.13-2021-04-01 >> >> for you to fetch changes up to ef95d2a98d642a537190d73c45ae3c308afee890: >> >> drm/amdgpu/display: fix warning on 32 bit in dmub (2021-04-01 >> 17:32:32 -0400) >> >> ---------------------------------------------------------------- >> amd-drm-next-5.13-2021-04-01: >> >> amdgpu: >> - Re-enable GPU reset on VanGogh >> - Enable DPM flags for SMART_SUSPEND and MAY_SKIP_RESUME >> - Disentangle HG from vga_switcheroo >> - S0ix fixes >> - W=1 fixes >> - Resource iterator fixes >> - DMCUB updates >> - UBSAN fixes >> - More PM API cleanup >> - Aldebaran updates >> - Modifier fixes >> - Enable VCN load balancing with asymmetric engines >> - Rework BO structs >> - Aldebaran reset support >> - Initial LTTPR display work >> - Display MALL fixes >> - Fall back to YCbCr420 when YCbCr444 fails >> - SR-IOV fixes >> - Misc cleanups and fixes >> >> radeon: >> - Typo fixes >> >> ttm: >> - Handle cached requests (required for Aldebaran) >> >> scheduler: >> - Fix runqueue selection when changing priorities (required to fix VCN >> load balancing) >> >> ---------------------------------------------------------------- >> Alex Deucher (20): >> drm/amdgpu/display/dm: add missing parameter documentation >> drm/amdgpu: Add additional Sienna Cichlid PCI ID >> drm/amdgpu: add a dev_pm_ops prepare callback (v2) >> drm/amdgpu: enable DPM_FLAG_MAY_SKIP_RESUME and DPM_FLAG_SMART_SUSPEND flags (v2) >> drm/amdgpu: disentangle HG systems from vgaswitcheroo >> drm/amdgpu: rework S3/S4/S0ix state handling >> drm/amdgpu: don't evict vram on APUs for suspend to ram (v4) >> drm/amdgpu: clean up non-DC suspend/resume handling >> drm/amdgpu: move s0ix check into amdgpu_device_ip_suspend_phase2 (v3) >> drm/amdgpu: re-enable suspend phase 2 for S0ix >> drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend >> drm/amdgpu: update comments about s0ix suspend/resume >> drm/amdgpu: drop S0ix checks around CG/PG in suspend >> drm/amdgpu: skip kfd suspend/resume for S0ix >> drm/amdgpu/display: restore AUX_DPHY_TX_CONTROL for DCN2.x >> drm/amdgpu/display: fix memory leak for dimgrey cavefish >> drm/amdgpu/pm: mark pcie link/speed arrays as const >> drm/amdgpu/pm: bail on sysfs/debugfs queries during platform suspend >> drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in suspend >> drm/amdgpu/display: fix warning on 32 bit in dmub >> >> Alex Sierra (2): >> drm/amdgpu: replace per_device_list by array >> drm/amdgpu: ih reroute for newer asics than vega20 >> >> Alvin Lee (1): >> drm/amd/display: Change input parameter for set_drr >> >> Anson Jacob (2): >> drm/amd/display: Fix UBSAN: shift-out-of-bounds warning >> drm/amd/display: Removing unused code from dmub_cmd.h >> >> Anthony Koo (2): >> drm/amd/display: [FW Promotion] Release 0.0.57 >> drm/amd/display: [FW Promotion] Release 0.0.58 >> >> Aric Cyr (2): >> drm/amd/display: 3.2.128 >> drm/amd/display: 3.2.129 >> >> Arnd Bergmann (3): >> amdgpu: avoid incorrect %hu format string >> amdgpu: fix gcc -Wrestrict warning >> amdgpu: securedisplay: simplify i2c hexdump output >> >> Bhaskar Chowdhury (6): >> drm/amdgpu: Fix a typo >> drm/amdgpu: Fix a typo >> drm/atomic: Couple of typo fixes >> drm/radeon/r600_cs: Few typo fixes >> drm/amd/amdgpu/gfx_v7_0: Trivial typo fixes >> drm/amd: Fix a typo in two different sentences >> >> Bindu Ramamurthy (1): >> drm/amd/display: Allow idle optimization based on vblank. >> >> Chengming Gui (1): >> drm/amd/amdgpu: set MP1 state to UNLOAD before reload its FW >> for vega20/ALDEBARAN >> >> Chris Park (1): >> drm/amd/display: Disable MALL when SMU not present >> >> Christian König (5): >> drm/amdgpu: remove irq_src->data handling >> drm/amdgpu: add the sched_score to amdgpu_ring_init >> drm/amdgpu: share scheduler score on VCN3 instances >> drm/sched: select new rq even if there is only one v3 >> drm/amdgpu: load balance VCN3 decode as well v8 >> >> Daniel Gomez (2): >> drm/amdgpu/ttm: Fix memory leak userptr pages > This introduced a regression for KFD, which I pointed out at the time. > Was there ever a fix for that. This was fixed recently by somebody else. I've reviewed the patch, but I'm not sure if it landed inside the branch. Regards, Christian. > > Regards, > Felix > > >> drm/radeon/ttm: Fix memory leak userptr pages >> >> David Galiffi (1): >> drm/amd/display: Fixed Clock Recovery Sequence >> >> Dennis Li (1): >> drm/amdgpu: add codes to capture invalid hardware access when >> recovery >> >> Diego Viola (1): >> drm/amd/display: fix typo: liason -> liaison >> >> Dmytro Laktyushkin (3): >> drm/amd/display: hide VGH asic specific structs >> drm/amd/display: revert max lb lines change >> drm/amd/display: revert max lb use by default for n10 >> >> Eryk Brol (1): >> drm/amd/display: Fix MST topology debugfs >> >> Evan Quan (9): >> drm/amd/pm: fix Navi1x runtime resume failure V2 >> drm/amd/pm: make DAL communicate with SMU through unified interfaces >> drm/amd/pm: label these APIs used internally as static >> drm/amd/pm: drop redundant and unneeded BACO APIs V2 >> drm/amd/pm: no need to force MCLK to highest when no display connected >> drm/amd/pm: unify the interface for loading SMU microcode >> drm/amd/pm: fix missing static declarations >> drm/amd/pm: unify the interface for power gating >> drm/amd/pm: unify the interface for gfx state setting >> >> Fangzhi Zuo (1): >> drm/amd/display: Fix debugfs link_settings entry >> >> Feifei Xu (1): >> drm/amdgpu: skip PP_MP1_STATE_UNLOAD on aldebaran >> >> Guchun Chen (6): >> drm/amd/pm: fix MP1 state setting failure in s3 test >> drm/amd/pm: fix gpu reset failure by MP1 state setting >> drm/amd/display: add DMCUB trace irq support for DCN302 >> drm/amdgpu: fix NULL pointer dereference >> drm/amdgpu: fix compiler warning(v2) >> drm/radeon: avoid potential null pointer access >> >> Horace Chen (1): >> drm/amdgpu: move vram recover into sriov full access >> >> Huacai Chen (1): >> drm/amdgpu: Set a suitable dev_info.gart_page_size >> >> Jack Zhang (1): >> drm/amd/amdgpu implement tdr advanced mode >> >> Jake Wang (1): >> drm/amd/display: Use pwrseq instance to determine eDP instance >> >> Jimmy Kizito (2): >> drm/amd/display: Add dynamic link encoder selection. >> drm/amd/display: Update display endpoint control path. >> >> John Clements (2): >> drm/amdgpu: update host to psp interface >> drm/amdgpu: added support for dynamic GECC >> >> Krunoslav Kovac (1): >> drm/amd/display: Rename fs_params to hdr_tm_params >> >> Lee Jones (3): >> drm/amd/display/dc/dce80/dce80_resource: Make local functions static >> drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap >> drm/amd/display/dc/calcs/dce_calcs: Remove some large >> variables from the stack >> >> Leo (Hanghong) Ma (2): >> drm/amd/display: Log DMCUB trace buffer events >> drm/amd/display: Fix static checker warnings on tracebuff_fb >> >> Lijo Lazar (14): >> drm/amdgpu: Enable VCN/JPEG CG on aldebaran >> drm/amd/pm: Update aldebaran pmfw interface >> drm/amd/pm: Modify mode2 msg sequence on aldebaran >> drm/amd/pm: Add function to wait for smu events >> drm/amd/pm: Add support for reset completion on aldebaran >> drm/amdgpu: Add reset control to amdgpu_device >> drm/amdgpu: Add reset control handling to reset workflow >> drm/amdgpu: Add PSP public function to load a list of FWs >> drm/amdgpu: Make set PG/CG state functions public >> drm/amdgpu: Add mode2 reset support for aldebaran >> drm/amdgpu: Enable recovery on aldebaran >> drm/amdgpu: Fix build warnings >> drm/amd/pm: Fix DPM level count on aldebaran >> drm/amdgpu: Reset error code for 'no handler' case >> >> Luben Tuikov (2): >> drm/amd/display: Use appropriate DRM_DEBUG_... level >> drm/amdgpu: Fix check for RAS support >> >> Mark Yacoub (1): >> drm/amdgpu: Ensure that the modifier requested is supported by plane. >> >> Nikola Cornij (1): >> drm/amd/display: Fix black screen with scaled modes on some >> eDP panels >> >> Nirmoy Das (9): >> drm/amdgpu: wrap kiq ring ops with kiq spinlock >> drm/amd/display: use GFP_ATOMIC in dcn20_resource_construct >> drm/amdgpu: fix amdgpu_res_first() >> drm/amdgpu: allow variable BO struct creation >> drm/amdgpu: introduce struct amdgpu_bo_user >> drm/amdgpu: use amdgpu_bo_create_user() for when possible >> drm/amdgpu: use amdgpu_bo_user bo for metadata and tiling flag >> drm/amdgpu: make BO type check less restrictive >> drm/amdgpu: fix offset calculation in >> amdgpu_vm_bo_clear_mappings() >> >> Oak Zeng (1): >> drm/ttm: ioremap buffer according to TTM mem caching setting >> >> Philip Cox (1): >> drm/amdgpu: Set amdgpu.noretry=1 for Arcturus >> >> Pratik Vishwakarma (1): >> drm/amdgpu: skip CG/PG for gfx during S0ix >> >> Prike Liang (1): >> drm/amdgpu: fix the hibernation suspend with s0ix >> >> Qingqing Zhuo (2): >> drm/amd/display: enable DP DSC Compliance automation >> drm/amd/display: add log for automated test >> >> Qu Huang (2): >> drm/amdkfd: Fix cat debugfs hang_hws file causes system crash bug >> drm/amdkfd: dqm fence memory corruption >> >> Rodrigo Siqueira (1): >> drm/amd/display: Add refresh rate trace >> >> Rohit Khaire (1): >> drm/amdgpu: Add new PF2VF flags for VF register access method >> >> Roman Li (1): >> drm/amd/display: Populate socclk entries for dcn2.1 >> >> Sefa Eyeoglu (1): >> drm/amd/display: check fb of primary plane >> >> Shirish S (1): >> drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD >> >> Stylon Wang (1): >> drm/amd/display: Guard ASSR with internal display flag >> >> Tian Tao (3): >> drm/radeon/radeon_pm: Convert sysfs sprintf/snprintf family to sysfs_emit >> drm/amdgpu: Convert sysfs sprintf/snprintf family to sysfs_emit >> drm/amd/pm: Convert sysfs sprintf/snprintf family to >> sysfs_emit >> >> Tom St Denis (1): >> drm/amd/amdgpu: Add CP_IB1_BASE_* to gc_10_3_0 headers >> >> Tong Zhang (1): >> drm/radeon: don't evict if not initialized >> >> Victor Lu (2): >> drm/amd/display: Deallocate IRQ handlers on amdgpu_dm_irq_fini >> drm/amd/display: Use pr_debug in DM to prevent dmesg flooding >> >> Vladimir Stempen (1): >> drm/amd/display: Fix typo for variable name >> >> Wan Jiabing (1): >> drivers: gpu: Remove duplicate include of amdgpu_hdp.h >> >> Wayne Lin (1): >> drm/amd/display: Add kernel doc to crc_rd_wrk field >> >> Wenjing Liu (2): >> drm/amd/display: define mod_hdcp_display_disable_option struct >> drm/amd/display: add mod hdcp interface for supporting >> encryption state query >> >> Werner Sembach (1): >> drm/amd/display: Try YCbCr420 color when YCbCr444 fails >> >> Wesley Chalmers (6): >> drm/amd/display: BIOS LTTPR Caps Interface >> drm/amd/display: Interface for LTTPR interop >> drm/amd/display: Enumerate LTTPR modes >> drm/amd/display: LTTPR config logic >> drm/amd/display: New path for enabling DPG >> drm/amd/display: Set max TTU on DPG enable >> >> Xiaojian Du (1): >> Revert "drm/amdgpu: disable gpu reset on Vangogh for now" >> >> Xℹ Ruoyao (1): >> drm/amdgpu: check alignment on CPU page for bo map >> >> xinhui pan (1): >> drm/amdgpu: Use correct size when access vram >> >> drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- >> drivers/gpu/drm/amd/amdgpu/aldebaran.c | 407 +++++++ >> drivers/gpu/drm/amd/amdgpu/aldebaran.h | 32 + >> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 35 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 414 ++++--- >> drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 102 ++ >> drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 102 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 40 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 - >> drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 - >> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 94 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 19 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 51 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 23 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 2 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 98 ++ >> drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 85 ++ >> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 6 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 10 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 1 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 11 + >> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 32 +- >> drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 +- >> drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 17 +- >> drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 +- >> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- >> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- >> drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- >> drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 15 +- >> drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 20 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 26 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- >> drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 17 +- >> drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 3 +- >> drivers/gpu/drm/amd/amdgpu/nv.c | 30 +- >> drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 25 + >> drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- >> drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +- >> drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- >> drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 5 +- >> drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- >> drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- >> drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 143 ++- >> drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +- >> drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 116 +- >> drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- >> drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 7 +- >> .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +- >> .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- >> drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 8 +- >> drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 +- >> drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- >> drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 2 +- >> drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 28 +- >> drivers/gpu/drm/amd/amdkfd/kfd_process.c | 108 +- >> .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- >> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 203 +++- >> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 + >> .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 19 +- >> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 6 +- >> .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 12 +- >> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 72 ++ >> .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 134 +-- >> .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 40 + >> drivers/gpu/drm/amd/display/dc/Makefile | 5 +- >> drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 190 ++++ >> drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1154 ++++++++++---------- >> drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 120 +- >> .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 + >> .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 7 + >> .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 101 +- >> .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 28 +- >> drivers/gpu/drm/amd/display/dc/core/dc.c | 46 +- >> drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +- >> drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 207 +++- >> .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 303 +++++ >> drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 24 +- >> drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 + >> drivers/gpu/drm/amd/display/dc/dc.h | 2 +- >> drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 6 + >> drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- >> drivers/gpu/drm/amd/display/dc/dc_stream.h | 16 + >> drivers/gpu/drm/amd/display/dc/dc_types.h | 15 + >> drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- >> drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- >> .../amd/display/dc/dce110/dce110_hw_sequencer.c | 9 +- >> .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 16 +- >> .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 24 +- >> .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 3 +- >> .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- >> drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 2 +- >> .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 3 +- >> .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 32 +- >> .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- >> .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- >> .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- >> .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +- >> .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 28 +- >> .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 28 +- >> .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 28 +- >> .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 28 +- >> .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 28 +- >> drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 + >> drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 10 +- >> drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + >> .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 13 + >> drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 +- >> drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 86 ++ >> .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 29 +- >> .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 25 +- >> .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 30 + >> drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 41 +- >> drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 144 ++- >> drivers/gpu/drm/amd/display/include/logger_types.h | 3 + >> .../drm/amd/display/modules/color/color_gamma.c | 6 +- >> .../drm/amd/display/modules/color/color_gamma.h | 4 +- >> .../drm/amd/display/modules/freesync/freesync.c | 37 +- >> drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 10 +- >> drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 4 +- >> .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 37 +- >> .../amd/display/modules/hdcp/hdcp1_transition.c | 6 +- >> .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 10 +- >> .../amd/display/modules/hdcp/hdcp2_transition.c | 10 +- >> .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 10 + >> .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 7 +- >> drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 10 +- >> .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 6 + >> .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 9 + >> drivers/gpu/drm/amd/include/atombios.h | 4 +- >> drivers/gpu/drm/amd/include/atomfirmware.h | 38 +- >> drivers/gpu/drm/amd/include/kgd_pp_interface.h | 14 + >> drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 +- >> drivers/gpu/drm/amd/pm/amdgpu_pm.c | 198 +++- >> drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 3 +- >> drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 128 +-- >> .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 11 +- >> drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + >> drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- >> drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 5 +- >> .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 13 +- >> .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 3 +- >> .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 +- >> .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 4 +- >> drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 406 ++++--- >> drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + >> drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 25 + >> .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 18 + >> drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 5 + >> drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 71 +- >> drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 58 +- >> drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 30 +- >> drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 5 + >> drivers/gpu/drm/drm_atomic.c | 4 +- >> drivers/gpu/drm/radeon/r600_cs.c | 6 +- >> drivers/gpu/drm/radeon/radeon_object.c | 2 + >> drivers/gpu/drm/radeon/radeon_pm.c | 36 +- >> drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- >> drivers/gpu/drm/scheduler/sched_entity.c | 6 +- >> drivers/gpu/drm/scheduler/sched_main.c | 103 +- >> drivers/gpu/drm/ttm/ttm_bo_util.c | 14 + >> include/drm/gpu_scheduler.h | 3 + >> 197 files changed, 5039 insertions(+), 2273 deletions(-) >> create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.c >> create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.h >> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c >> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h >> create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c >> create mode 100644 >> drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h >> _______________________________________________ >> amd-gfx mailing list >> amd-gfx@lists.freedesktop.org >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flis >> ts.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7C >> guchun.chen%40amd.com%7C51d1cbcf7ccc43854abb08d8f99250d8%7C3dd8961fe4 >> 884e608e11a82d994e183d%7C0%7C0%7C637533754128113017%7CUnknown%7CTWFpb >> GZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn >> 0%3D%7C1000&sdata=S4VHuDGbSWBTzxk8OQKbqr%2FDcJZMrZiMQIS66kYWBWc%3 >> D&reserved=0 > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist > s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cgu > chun.chen%40amd.com%7C51d1cbcf7ccc43854abb08d8f99250d8%7C3dd8961fe4884 > e608e11a82d994e183d%7C0%7C0%7C637533754128123015%7CUnknown%7CTWFpbGZsb > 3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D% > 7C1000&sdata=tTqnsh0nOUgqa9FlzpU4S4ZJsWFLPSGzCZWusvztbVQ%3D&re > served=0
Yes, that was the one I was talking about. Ok, good to know that this is fixed. Regards, Christian. Am 07.04.21 um 10:50 schrieb Chen, Guchun: > [AMD Public Use] > > Hi Felix and Christian, > > If the regression you are talking about is the NULL pointer problem when running KFD tests, it should fixed by below patch in this series. > > drm/amdgpu: fix NULL pointer dereference > > Regards, > Guchun > > -----Original Message----- > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Christian König > Sent: Wednesday, April 7, 2021 2:57 PM > To: Kuehling, Felix <Felix.Kuehling@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; airlied@gmail.com; daniel.vetter@ffwll.ch > Subject: Re: [pull] amdgpu, radeon, ttm, sched drm-next-5.13 > > Am 06.04.21 um 17:42 schrieb Felix Kuehling: >> Am 2021-04-01 um 6:29 p.m. schrieb Alex Deucher: >>> Hi Dave, Daniel, >>> >>> New stuff for 5.13. There are two small patches for ttm and >>> scheduler that were dependencies for amdgpu changes. >>> >>> The following changes since commit 2cbcb78c9ee5520c8d836c7ff57d1b60ebe8e9b7: >>> >>> Merge tag 'amd-drm-next-5.13-2021-03-23' of >>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit >>> lab.freedesktop.org%2Fagd5f%2Flinux&data=04%7C01%7Cguchun.chen%40 >>> amd.com%7C51d1cbcf7ccc43854abb08d8f99250d8%7C3dd8961fe4884e608e11a82d >>> 994e183d%7C0%7C0%7C637533754128113017%7CUnknown%7CTWFpbGZsb3d8eyJWIjo >>> iMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am >>> p;sdata=FcdoL9w5LhBZ849ctXPudr%2BBQnnm7Oiq3pz5X7LGGk4%3D&reserved >>> =0 into drm-next (2021-03-26 15:53:21 +0100) >>> >>> are available in the Git repository at: >>> >>> >>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit >>> lab.freedesktop.org%2Fagd5f%2Flinux.git&data=04%7C01%7Cguchun.che >>> n%40amd.com%7C51d1cbcf7ccc43854abb08d8f99250d8%7C3dd8961fe4884e608e11 >>> a82d994e183d%7C0%7C0%7C637533754128113017%7CUnknown%7CTWFpbGZsb3d8eyJ >>> WIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C100 >>> 0&sdata=N4JIk%2BEgzleaKYaxvdtT7TR1ZsS6FGsIGpDDUqiQiLw%3D&rese >>> rved=0 tags/amd-drm-next-5.13-2021-04-01 >>> >>> for you to fetch changes up to ef95d2a98d642a537190d73c45ae3c308afee890: >>> >>> drm/amdgpu/display: fix warning on 32 bit in dmub (2021-04-01 >>> 17:32:32 -0400) >>> >>> ---------------------------------------------------------------- >>> amd-drm-next-5.13-2021-04-01: >>> >>> amdgpu: >>> - Re-enable GPU reset on VanGogh >>> - Enable DPM flags for SMART_SUSPEND and MAY_SKIP_RESUME >>> - Disentangle HG from vga_switcheroo >>> - S0ix fixes >>> - W=1 fixes >>> - Resource iterator fixes >>> - DMCUB updates >>> - UBSAN fixes >>> - More PM API cleanup >>> - Aldebaran updates >>> - Modifier fixes >>> - Enable VCN load balancing with asymmetric engines >>> - Rework BO structs >>> - Aldebaran reset support >>> - Initial LTTPR display work >>> - Display MALL fixes >>> - Fall back to YCbCr420 when YCbCr444 fails >>> - SR-IOV fixes >>> - Misc cleanups and fixes >>> >>> radeon: >>> - Typo fixes >>> >>> ttm: >>> - Handle cached requests (required for Aldebaran) >>> >>> scheduler: >>> - Fix runqueue selection when changing priorities (required to fix VCN >>> load balancing) >>> >>> ---------------------------------------------------------------- >>> Alex Deucher (20): >>> drm/amdgpu/display/dm: add missing parameter documentation >>> drm/amdgpu: Add additional Sienna Cichlid PCI ID >>> drm/amdgpu: add a dev_pm_ops prepare callback (v2) >>> drm/amdgpu: enable DPM_FLAG_MAY_SKIP_RESUME and DPM_FLAG_SMART_SUSPEND flags (v2) >>> drm/amdgpu: disentangle HG systems from vgaswitcheroo >>> drm/amdgpu: rework S3/S4/S0ix state handling >>> drm/amdgpu: don't evict vram on APUs for suspend to ram (v4) >>> drm/amdgpu: clean up non-DC suspend/resume handling >>> drm/amdgpu: move s0ix check into amdgpu_device_ip_suspend_phase2 (v3) >>> drm/amdgpu: re-enable suspend phase 2 for S0ix >>> drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend >>> drm/amdgpu: update comments about s0ix suspend/resume >>> drm/amdgpu: drop S0ix checks around CG/PG in suspend >>> drm/amdgpu: skip kfd suspend/resume for S0ix >>> drm/amdgpu/display: restore AUX_DPHY_TX_CONTROL for DCN2.x >>> drm/amdgpu/display: fix memory leak for dimgrey cavefish >>> drm/amdgpu/pm: mark pcie link/speed arrays as const >>> drm/amdgpu/pm: bail on sysfs/debugfs queries during platform suspend >>> drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in suspend >>> drm/amdgpu/display: fix warning on 32 bit in dmub >>> >>> Alex Sierra (2): >>> drm/amdgpu: replace per_device_list by array >>> drm/amdgpu: ih reroute for newer asics than vega20 >>> >>> Alvin Lee (1): >>> drm/amd/display: Change input parameter for set_drr >>> >>> Anson Jacob (2): >>> drm/amd/display: Fix UBSAN: shift-out-of-bounds warning >>> drm/amd/display: Removing unused code from dmub_cmd.h >>> >>> Anthony Koo (2): >>> drm/amd/display: [FW Promotion] Release 0.0.57 >>> drm/amd/display: [FW Promotion] Release 0.0.58 >>> >>> Aric Cyr (2): >>> drm/amd/display: 3.2.128 >>> drm/amd/display: 3.2.129 >>> >>> Arnd Bergmann (3): >>> amdgpu: avoid incorrect %hu format string >>> amdgpu: fix gcc -Wrestrict warning >>> amdgpu: securedisplay: simplify i2c hexdump output >>> >>> Bhaskar Chowdhury (6): >>> drm/amdgpu: Fix a typo >>> drm/amdgpu: Fix a typo >>> drm/atomic: Couple of typo fixes >>> drm/radeon/r600_cs: Few typo fixes >>> drm/amd/amdgpu/gfx_v7_0: Trivial typo fixes >>> drm/amd: Fix a typo in two different sentences >>> >>> Bindu Ramamurthy (1): >>> drm/amd/display: Allow idle optimization based on vblank. >>> >>> Chengming Gui (1): >>> drm/amd/amdgpu: set MP1 state to UNLOAD before reload its FW >>> for vega20/ALDEBARAN >>> >>> Chris Park (1): >>> drm/amd/display: Disable MALL when SMU not present >>> >>> Christian König (5): >>> drm/amdgpu: remove irq_src->data handling >>> drm/amdgpu: add the sched_score to amdgpu_ring_init >>> drm/amdgpu: share scheduler score on VCN3 instances >>> drm/sched: select new rq even if there is only one v3 >>> drm/amdgpu: load balance VCN3 decode as well v8 >>> >>> Daniel Gomez (2): >>> drm/amdgpu/ttm: Fix memory leak userptr pages >> This introduced a regression for KFD, which I pointed out at the time. >> Was there ever a fix for that. > This was fixed recently by somebody else. I've reviewed the patch, but I'm not sure if it landed inside the branch. > > Regards, > Christian. > >> Regards, >> Felix >> >> >>> drm/radeon/ttm: Fix memory leak userptr pages >>> >>> David Galiffi (1): >>> drm/amd/display: Fixed Clock Recovery Sequence >>> >>> Dennis Li (1): >>> drm/amdgpu: add codes to capture invalid hardware access when >>> recovery >>> >>> Diego Viola (1): >>> drm/amd/display: fix typo: liason -> liaison >>> >>> Dmytro Laktyushkin (3): >>> drm/amd/display: hide VGH asic specific structs >>> drm/amd/display: revert max lb lines change >>> drm/amd/display: revert max lb use by default for n10 >>> >>> Eryk Brol (1): >>> drm/amd/display: Fix MST topology debugfs >>> >>> Evan Quan (9): >>> drm/amd/pm: fix Navi1x runtime resume failure V2 >>> drm/amd/pm: make DAL communicate with SMU through unified interfaces >>> drm/amd/pm: label these APIs used internally as static >>> drm/amd/pm: drop redundant and unneeded BACO APIs V2 >>> drm/amd/pm: no need to force MCLK to highest when no display connected >>> drm/amd/pm: unify the interface for loading SMU microcode >>> drm/amd/pm: fix missing static declarations >>> drm/amd/pm: unify the interface for power gating >>> drm/amd/pm: unify the interface for gfx state setting >>> >>> Fangzhi Zuo (1): >>> drm/amd/display: Fix debugfs link_settings entry >>> >>> Feifei Xu (1): >>> drm/amdgpu: skip PP_MP1_STATE_UNLOAD on aldebaran >>> >>> Guchun Chen (6): >>> drm/amd/pm: fix MP1 state setting failure in s3 test >>> drm/amd/pm: fix gpu reset failure by MP1 state setting >>> drm/amd/display: add DMCUB trace irq support for DCN302 >>> drm/amdgpu: fix NULL pointer dereference >>> drm/amdgpu: fix compiler warning(v2) >>> drm/radeon: avoid potential null pointer access >>> >>> Horace Chen (1): >>> drm/amdgpu: move vram recover into sriov full access >>> >>> Huacai Chen (1): >>> drm/amdgpu: Set a suitable dev_info.gart_page_size >>> >>> Jack Zhang (1): >>> drm/amd/amdgpu implement tdr advanced mode >>> >>> Jake Wang (1): >>> drm/amd/display: Use pwrseq instance to determine eDP instance >>> >>> Jimmy Kizito (2): >>> drm/amd/display: Add dynamic link encoder selection. >>> drm/amd/display: Update display endpoint control path. >>> >>> John Clements (2): >>> drm/amdgpu: update host to psp interface >>> drm/amdgpu: added support for dynamic GECC >>> >>> Krunoslav Kovac (1): >>> drm/amd/display: Rename fs_params to hdr_tm_params >>> >>> Lee Jones (3): >>> drm/amd/display/dc/dce80/dce80_resource: Make local functions static >>> drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap >>> drm/amd/display/dc/calcs/dce_calcs: Remove some large >>> variables from the stack >>> >>> Leo (Hanghong) Ma (2): >>> drm/amd/display: Log DMCUB trace buffer events >>> drm/amd/display: Fix static checker warnings on tracebuff_fb >>> >>> Lijo Lazar (14): >>> drm/amdgpu: Enable VCN/JPEG CG on aldebaran >>> drm/amd/pm: Update aldebaran pmfw interface >>> drm/amd/pm: Modify mode2 msg sequence on aldebaran >>> drm/amd/pm: Add function to wait for smu events >>> drm/amd/pm: Add support for reset completion on aldebaran >>> drm/amdgpu: Add reset control to amdgpu_device >>> drm/amdgpu: Add reset control handling to reset workflow >>> drm/amdgpu: Add PSP public function to load a list of FWs >>> drm/amdgpu: Make set PG/CG state functions public >>> drm/amdgpu: Add mode2 reset support for aldebaran >>> drm/amdgpu: Enable recovery on aldebaran >>> drm/amdgpu: Fix build warnings >>> drm/amd/pm: Fix DPM level count on aldebaran >>> drm/amdgpu: Reset error code for 'no handler' case >>> >>> Luben Tuikov (2): >>> drm/amd/display: Use appropriate DRM_DEBUG_... level >>> drm/amdgpu: Fix check for RAS support >>> >>> Mark Yacoub (1): >>> drm/amdgpu: Ensure that the modifier requested is supported by plane. >>> >>> Nikola Cornij (1): >>> drm/amd/display: Fix black screen with scaled modes on some >>> eDP panels >>> >>> Nirmoy Das (9): >>> drm/amdgpu: wrap kiq ring ops with kiq spinlock >>> drm/amd/display: use GFP_ATOMIC in dcn20_resource_construct >>> drm/amdgpu: fix amdgpu_res_first() >>> drm/amdgpu: allow variable BO struct creation >>> drm/amdgpu: introduce struct amdgpu_bo_user >>> drm/amdgpu: use amdgpu_bo_create_user() for when possible >>> drm/amdgpu: use amdgpu_bo_user bo for metadata and tiling flag >>> drm/amdgpu: make BO type check less restrictive >>> drm/amdgpu: fix offset calculation in >>> amdgpu_vm_bo_clear_mappings() >>> >>> Oak Zeng (1): >>> drm/ttm: ioremap buffer according to TTM mem caching setting >>> >>> Philip Cox (1): >>> drm/amdgpu: Set amdgpu.noretry=1 for Arcturus >>> >>> Pratik Vishwakarma (1): >>> drm/amdgpu: skip CG/PG for gfx during S0ix >>> >>> Prike Liang (1): >>> drm/amdgpu: fix the hibernation suspend with s0ix >>> >>> Qingqing Zhuo (2): >>> drm/amd/display: enable DP DSC Compliance automation >>> drm/amd/display: add log for automated test >>> >>> Qu Huang (2): >>> drm/amdkfd: Fix cat debugfs hang_hws file causes system crash bug >>> drm/amdkfd: dqm fence memory corruption >>> >>> Rodrigo Siqueira (1): >>> drm/amd/display: Add refresh rate trace >>> >>> Rohit Khaire (1): >>> drm/amdgpu: Add new PF2VF flags for VF register access method >>> >>> Roman Li (1): >>> drm/amd/display: Populate socclk entries for dcn2.1 >>> >>> Sefa Eyeoglu (1): >>> drm/amd/display: check fb of primary plane >>> >>> Shirish S (1): >>> drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD >>> >>> Stylon Wang (1): >>> drm/amd/display: Guard ASSR with internal display flag >>> >>> Tian Tao (3): >>> drm/radeon/radeon_pm: Convert sysfs sprintf/snprintf family to sysfs_emit >>> drm/amdgpu: Convert sysfs sprintf/snprintf family to sysfs_emit >>> drm/amd/pm: Convert sysfs sprintf/snprintf family to >>> sysfs_emit >>> >>> Tom St Denis (1): >>> drm/amd/amdgpu: Add CP_IB1_BASE_* to gc_10_3_0 headers >>> >>> Tong Zhang (1): >>> drm/radeon: don't evict if not initialized >>> >>> Victor Lu (2): >>> drm/amd/display: Deallocate IRQ handlers on amdgpu_dm_irq_fini >>> drm/amd/display: Use pr_debug in DM to prevent dmesg flooding >>> >>> Vladimir Stempen (1): >>> drm/amd/display: Fix typo for variable name >>> >>> Wan Jiabing (1): >>> drivers: gpu: Remove duplicate include of amdgpu_hdp.h >>> >>> Wayne Lin (1): >>> drm/amd/display: Add kernel doc to crc_rd_wrk field >>> >>> Wenjing Liu (2): >>> drm/amd/display: define mod_hdcp_display_disable_option struct >>> drm/amd/display: add mod hdcp interface for supporting >>> encryption state query >>> >>> Werner Sembach (1): >>> drm/amd/display: Try YCbCr420 color when YCbCr444 fails >>> >>> Wesley Chalmers (6): >>> drm/amd/display: BIOS LTTPR Caps Interface >>> drm/amd/display: Interface for LTTPR interop >>> drm/amd/display: Enumerate LTTPR modes >>> drm/amd/display: LTTPR config logic >>> drm/amd/display: New path for enabling DPG >>> drm/amd/display: Set max TTU on DPG enable >>> >>> Xiaojian Du (1): >>> Revert "drm/amdgpu: disable gpu reset on Vangogh for now" >>> >>> Xℹ Ruoyao (1): >>> drm/amdgpu: check alignment on CPU page for bo map >>> >>> xinhui pan (1): >>> drm/amdgpu: Use correct size when access vram >>> >>> drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- >>> drivers/gpu/drm/amd/amdgpu/aldebaran.c | 407 +++++++ >>> drivers/gpu/drm/amd/amdgpu/aldebaran.h | 32 + >>> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 35 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + >>> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 414 ++++--- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 102 ++ >>> drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 + >>> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 102 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 + >>> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 40 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + >>> drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 - >>> drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 - >>> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 94 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 19 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 51 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 + >>> drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 23 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 2 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 98 ++ >>> drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 85 ++ >>> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 6 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 10 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 1 + >>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + >>> drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 11 + >>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 32 +- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 +- >>> drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 17 +- >>> drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 +- >>> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- >>> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- >>> drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 8 +- >>> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- >>> drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 15 +- >>> drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- >>> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 20 +- >>> drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- >>> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 26 +- >>> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- >>> drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 17 +- >>> drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +- >>> drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- >>> drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- >>> drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- >>> drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 3 +- >>> drivers/gpu/drm/amd/amdgpu/nv.c | 30 +- >>> drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 25 + >>> drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 8 +- >>> drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- >>> drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- >>> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- >>> drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- >>> drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +- >>> drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- >>> drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +- >>> drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 2 +- >>> drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- >>> drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- >>> drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +- >>> drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- >>> drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 5 +- >>> drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- >>> drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- >>> drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- >>> drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- >>> drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- >>> drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 143 ++- >>> drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +- >>> drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 116 +- >>> drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- >>> drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 7 +- >>> .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +- >>> .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- >>> drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 8 +- >>> drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 +- >>> drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- >>> drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 2 +- >>> drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 28 +- >>> drivers/gpu/drm/amd/amdkfd/kfd_process.c | 108 +- >>> .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- >>> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 203 +++- >>> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 + >>> .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 19 +- >>> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 6 +- >>> .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 12 +- >>> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 72 ++ >>> .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 134 +-- >>> .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 40 + >>> drivers/gpu/drm/amd/display/dc/Makefile | 5 +- >>> drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 190 ++++ >>> drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1154 ++++++++++---------- >>> drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 120 +- >>> .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 + >>> .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 7 + >>> .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 101 +- >>> .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 28 +- >>> drivers/gpu/drm/amd/display/dc/core/dc.c | 46 +- >>> drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +- >>> drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 207 +++- >>> .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 303 +++++ >>> drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 24 +- >>> drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 + >>> drivers/gpu/drm/amd/display/dc/dc.h | 2 +- >>> drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 6 + >>> drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- >>> drivers/gpu/drm/amd/display/dc/dc_stream.h | 16 + >>> drivers/gpu/drm/amd/display/dc/dc_types.h | 15 + >>> drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- >>> drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- >>> .../amd/display/dc/dce110/dce110_hw_sequencer.c | 9 +- >>> .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 16 +- >>> .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 24 +- >>> .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 3 +- >>> .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- >>> drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 2 +- >>> .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 3 +- >>> .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 32 +- >>> .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- >>> .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- >>> .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- >>> .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +- >>> .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 28 +- >>> .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 28 +- >>> .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 28 +- >>> .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 28 +- >>> .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 28 +- >>> drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 + >>> drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 10 +- >>> drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + >>> .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 13 + >>> drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 +- >>> drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 86 ++ >>> .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 29 +- >>> .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 25 +- >>> .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 30 + >>> drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 41 +- >>> drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 144 ++- >>> drivers/gpu/drm/amd/display/include/logger_types.h | 3 + >>> .../drm/amd/display/modules/color/color_gamma.c | 6 +- >>> .../drm/amd/display/modules/color/color_gamma.h | 4 +- >>> .../drm/amd/display/modules/freesync/freesync.c | 37 +- >>> drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 10 +- >>> drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 4 +- >>> .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 37 +- >>> .../amd/display/modules/hdcp/hdcp1_transition.c | 6 +- >>> .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 10 +- >>> .../amd/display/modules/hdcp/hdcp2_transition.c | 10 +- >>> .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 10 + >>> .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 7 +- >>> drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 10 +- >>> .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 6 + >>> .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 9 + >>> drivers/gpu/drm/amd/include/atombios.h | 4 +- >>> drivers/gpu/drm/amd/include/atomfirmware.h | 38 +- >>> drivers/gpu/drm/amd/include/kgd_pp_interface.h | 14 + >>> drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 +- >>> drivers/gpu/drm/amd/pm/amdgpu_pm.c | 198 +++- >>> drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 3 +- >>> drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 128 +-- >>> .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 11 +- >>> drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + >>> drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- >>> drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 5 +- >>> .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 13 +- >>> .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 3 +- >>> .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 +- >>> .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 4 +- >>> drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 406 ++++--- >>> drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + >>> drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 25 + >>> .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 18 + >>> drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 5 + >>> drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 71 +- >>> drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 58 +- >>> drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 30 +- >>> drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 5 + >>> drivers/gpu/drm/drm_atomic.c | 4 +- >>> drivers/gpu/drm/radeon/r600_cs.c | 6 +- >>> drivers/gpu/drm/radeon/radeon_object.c | 2 + >>> drivers/gpu/drm/radeon/radeon_pm.c | 36 +- >>> drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- >>> drivers/gpu/drm/scheduler/sched_entity.c | 6 +- >>> drivers/gpu/drm/scheduler/sched_main.c | 103 +- >>> drivers/gpu/drm/ttm/ttm_bo_util.c | 14 + >>> include/drm/gpu_scheduler.h | 3 + >>> 197 files changed, 5039 insertions(+), 2273 deletions(-) >>> create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.c >>> create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.h >>> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c >>> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h >>> create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c >>> create mode 100644 >>> drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h >>> _______________________________________________ >>> amd-gfx mailing list >>> amd-gfx@lists.freedesktop.org >>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flis >>> ts.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7C >>> guchun.chen%40amd.com%7C51d1cbcf7ccc43854abb08d8f99250d8%7C3dd8961fe4 >>> 884e608e11a82d994e183d%7C0%7C0%7C637533754128113017%7CUnknown%7CTWFpb >>> GZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn >>> 0%3D%7C1000&sdata=S4VHuDGbSWBTzxk8OQKbqr%2FDcJZMrZiMQIS66kYWBWc%3 >>> D&reserved=0 >> _______________________________________________ >> amd-gfx mailing list >> amd-gfx@lists.freedesktop.org >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist >> s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cgu >> chun.chen%40amd.com%7C51d1cbcf7ccc43854abb08d8f99250d8%7C3dd8961fe4884 >> e608e11a82d994e183d%7C0%7C0%7C637533754128123015%7CUnknown%7CTWFpbGZsb >> 3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D% >> 7C1000&sdata=tTqnsh0nOUgqa9FlzpU4S4ZJsWFLPSGzCZWusvztbVQ%3D&re >> served=0 > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cguchun.chen%40amd.com%7C51d1cbcf7ccc43854abb08d8f99250d8%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637533754128123015%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=tTqnsh0nOUgqa9FlzpU4S4ZJsWFLPSGzCZWusvztbVQ%3D&reserved=0
On Wed, Apr 7, 2021 at 3:23 AM Dave Airlie <airlied@gmail.com> wrote: > > On Wed, 7 Apr 2021 at 06:54, Alex Deucher <alexdeucher@gmail.com> wrote: > > > > On Fri, Apr 2, 2021 at 12:22 PM Christian König > > <ckoenig.leichtzumerken@gmail.com> wrote: > > > > > > Hey Alex, > > > > > > the TTM and scheduler changes should already be in the drm-misc-next > > > branch (not 100% sure about the TTM patch, need to double check next week). > > > > > > > The TTM change is not in drm-misc yet. > > > > > Could that cause problems when both are merged into drm-next? > > > > Dave, Daniel, how do you want to handle this? The duplicated patch is this one: > > https://cgit.freedesktop.org/drm/drm-misc/commit/?id=ac4eb83ab255de9c31184df51fd1534ba36fd212 > > amdgpu has changes which depend on it. The same patch is included in this PR. > > Ouch not sure how best to sync up here, maybe get misc-next into my > tree then rebase your tree on top of it? I can do that. Alex > > Dave.
Am 07.04.21 um 21:04 schrieb Alex Deucher: > On Wed, Apr 7, 2021 at 3:23 AM Dave Airlie <airlied@gmail.com> wrote: >> On Wed, 7 Apr 2021 at 06:54, Alex Deucher <alexdeucher@gmail.com> wrote: >>> On Fri, Apr 2, 2021 at 12:22 PM Christian König >>> <ckoenig.leichtzumerken@gmail.com> wrote: >>>> Hey Alex, >>>> >>>> the TTM and scheduler changes should already be in the drm-misc-next >>>> branch (not 100% sure about the TTM patch, need to double check next week). >>>> >>> The TTM change is not in drm-misc yet. >>> >>>> Could that cause problems when both are merged into drm-next? >>> Dave, Daniel, how do you want to handle this? The duplicated patch is this one: >>> https://cgit.freedesktop.org/drm/drm-misc/commit/?id=ac4eb83ab255de9c31184df51fd1534ba36fd212 >>> amdgpu has changes which depend on it. The same patch is included in this PR. >> Ouch not sure how best to sync up here, maybe get misc-next into my >> tree then rebase your tree on top of it? > I can do that. Please let me double check later today that we have everything we need in drm-misc-next. Regards, Christian. > > Alex > > >> Dave.
Am 08.04.21 um 09:13 schrieb Christian König: > Am 07.04.21 um 21:04 schrieb Alex Deucher: >> On Wed, Apr 7, 2021 at 3:23 AM Dave Airlie <airlied@gmail.com> wrote: >>> On Wed, 7 Apr 2021 at 06:54, Alex Deucher <alexdeucher@gmail.com> >>> wrote: >>>> On Fri, Apr 2, 2021 at 12:22 PM Christian König >>>> <ckoenig.leichtzumerken@gmail.com> wrote: >>>>> Hey Alex, >>>>> >>>>> the TTM and scheduler changes should already be in the drm-misc-next >>>>> branch (not 100% sure about the TTM patch, need to double check >>>>> next week). >>>>> >>>> The TTM change is not in drm-misc yet. >>>> >>>>> Could that cause problems when both are merged into drm-next? >>>> Dave, Daniel, how do you want to handle this? The duplicated patch >>>> is this one: >>>> https://cgit.freedesktop.org/drm/drm-misc/commit/?id=ac4eb83ab255de9c31184df51fd1534ba36fd212 >>>> >>>> amdgpu has changes which depend on it. The same patch is included >>>> in this PR. >>> Ouch not sure how best to sync up here, maybe get misc-next into my >>> tree then rebase your tree on top of it? >> I can do that. > > Please let me double check later today that we have everything we need > in drm-misc-next. There where two patch for TTM (one from Felix and one from Oak) which still needed to be pushed to drm-misc-next. I've done that just a minute ago. Then we have this patch which fixes a bug in code removed on drm-misc-next. I think it should be dropped when amd-staging-drm-next is based on drm-next/drm-misc-next. Author: xinhui pan <xinhui.pan@amd.com> Date: Wed Feb 24 11:28:08 2021 +0800 drm/ttm: Do not add non-system domain BO into swap list I've also found the following patch which is problematic as well: commit c8a921d49443025e10794342d4433b3f29616409 Author: Jack Zhang <Jack.Zhang1@amd.com> Date: Mon Mar 8 12:41:27 2021 +0800 drm/amd/amdgpu implement tdr advanced mode [Why] Previous tdr design treats the first job in job_timeout as the bad job. But sometimes a later bad compute job can block a good gfx job and cause an unexpected gfx job timeout because gfx and compute ring share internal GC HW mutually. [How] This patch implements an advanced tdr mode.It involves an additinal synchronous pre-resubmit step(Step0 Resubmit) before normal resubmit step in order to find the real bad job. 1. At Step0 Resubmit stage, it synchronously submits and pends for the first job being signaled. If it gets timeout, we identify it as guilty and do hw reset. After that, we would do the normal resubmit step to resubmit left jobs. 2. For whole gpu reset(vram lost), do resubmit as the old way. Signed-off-by: Jack Zhang <Jack.Zhang1@amd.com> Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> That one is modifying both amdgpu as well as the scheduler code. IIRC I actually requested that the patch is split into two, but that was somehow not done. How should we proceed here? Should I separate the patch, push the changes to drm-misc-next and then we merge with drm-next and rebase amd-staging-drm-next on top of that? That's most likely the cleanest option approach as far as I can see. Thanks, Christian. > > Regards, > Christian. > >> >> Alex >> >> >>> Dave. >
On Thu, Apr 8, 2021 at 6:28 AM Christian König <ckoenig.leichtzumerken@gmail.com> wrote: > > Am 08.04.21 um 09:13 schrieb Christian König: > > Am 07.04.21 um 21:04 schrieb Alex Deucher: > >> On Wed, Apr 7, 2021 at 3:23 AM Dave Airlie <airlied@gmail.com> wrote: > >>> On Wed, 7 Apr 2021 at 06:54, Alex Deucher <alexdeucher@gmail.com> > >>> wrote: > >>>> On Fri, Apr 2, 2021 at 12:22 PM Christian König > >>>> <ckoenig.leichtzumerken@gmail.com> wrote: > >>>>> Hey Alex, > >>>>> > >>>>> the TTM and scheduler changes should already be in the drm-misc-next > >>>>> branch (not 100% sure about the TTM patch, need to double check > >>>>> next week). > >>>>> > >>>> The TTM change is not in drm-misc yet. > >>>> > >>>>> Could that cause problems when both are merged into drm-next? > >>>> Dave, Daniel, how do you want to handle this? The duplicated patch > >>>> is this one: > >>>> https://cgit.freedesktop.org/drm/drm-misc/commit/?id=ac4eb83ab255de9c31184df51fd1534ba36fd212 > >>>> > >>>> amdgpu has changes which depend on it. The same patch is included > >>>> in this PR. > >>> Ouch not sure how best to sync up here, maybe get misc-next into my > >>> tree then rebase your tree on top of it? > >> I can do that. > > > > Please let me double check later today that we have everything we need > > in drm-misc-next. > > There where two patch for TTM (one from Felix and one from Oak) which > still needed to be pushed to drm-misc-next. I've done that just a minute > ago. > They were included in this PR. > > Then we have this patch which fixes a bug in code removed on > drm-misc-next. I think it should be dropped when amd-staging-drm-next is > based on drm-next/drm-misc-next. > > Author: xinhui pan <xinhui.pan@amd.com> > Date: Wed Feb 24 11:28:08 2021 +0800 > > drm/ttm: Do not add non-system domain BO into swap list > Ok. > > I've also found the following patch which is problematic as well: > > commit c8a921d49443025e10794342d4433b3f29616409 > Author: Jack Zhang <Jack.Zhang1@amd.com> > Date: Mon Mar 8 12:41:27 2021 +0800 > > drm/amd/amdgpu implement tdr advanced mode > > [Why] > Previous tdr design treats the first job in job_timeout as the bad job. > But sometimes a later bad compute job can block a good gfx job and > cause an unexpected gfx job timeout because gfx and compute ring share > internal GC HW mutually. > > [How] > This patch implements an advanced tdr mode.It involves an additinal > synchronous pre-resubmit step(Step0 Resubmit) before normal resubmit > step in order to find the real bad job. > > 1. At Step0 Resubmit stage, it synchronously submits and pends for the > first job being signaled. If it gets timeout, we identify it as guilty > and do hw reset. After that, we would do the normal resubmit step to > resubmit left jobs. > > 2. For whole gpu reset(vram lost), do resubmit as the old way. > > Signed-off-by: Jack Zhang <Jack.Zhang1@amd.com> > Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> > > That one is modifying both amdgpu as well as the scheduler code. IIRC I > actually requested that the patch is split into two, but that was > somehow not done. > > How should we proceed here? Should I separate the patch, push the > changes to drm-misc-next and then we merge with drm-next and rebase > amd-staging-drm-next on top of that? > > That's most likely the cleanest option approach as far as I can see. That's fine with me. We could have included them in my PR. Now we have wait for drm-misc-next to be merged again before we can merge the amdgpu code. Is anyone planning to do another drm-misc merge at this point? Alex > > Thanks, > Christian. > > > > > Regards, > > Christian. > > > >> > >> Alex > >> > >> > >>> Dave. > > >
Am 08.04.21 um 15:03 schrieb Alex Deucher: > On Thu, Apr 8, 2021 at 6:28 AM Christian König > <ckoenig.leichtzumerken@gmail.com> wrote: >> Am 08.04.21 um 09:13 schrieb Christian König: >>> Am 07.04.21 um 21:04 schrieb Alex Deucher: >>>> On Wed, Apr 7, 2021 at 3:23 AM Dave Airlie <airlied@gmail.com> wrote: >>>>> On Wed, 7 Apr 2021 at 06:54, Alex Deucher <alexdeucher@gmail.com> >>>>> wrote: >>>>>> On Fri, Apr 2, 2021 at 12:22 PM Christian König >>>>>> <ckoenig.leichtzumerken@gmail.com> wrote: >>>>>>> Hey Alex, >>>>>>> >>>>>>> the TTM and scheduler changes should already be in the drm-misc-next >>>>>>> branch (not 100% sure about the TTM patch, need to double check >>>>>>> next week). >>>>>>> >>>>>> The TTM change is not in drm-misc yet. >>>>>> >>>>>>> Could that cause problems when both are merged into drm-next? >>>>>> Dave, Daniel, how do you want to handle this? The duplicated patch >>>>>> is this one: >>>>>> https://cgit.freedesktop.org/drm/drm-misc/commit/?id=ac4eb83ab255de9c31184df51fd1534ba36fd212 >>>>>> >>>>>> amdgpu has changes which depend on it. The same patch is included >>>>>> in this PR. >>>>> Ouch not sure how best to sync up here, maybe get misc-next into my >>>>> tree then rebase your tree on top of it? >>>> I can do that. >>> Please let me double check later today that we have everything we need >>> in drm-misc-next. >> There where two patch for TTM (one from Felix and one from Oak) which >> still needed to be pushed to drm-misc-next. I've done that just a minute >> ago. >> > They were included in this PR. > >> Then we have this patch which fixes a bug in code removed on >> drm-misc-next. I think it should be dropped when amd-staging-drm-next is >> based on drm-next/drm-misc-next. >> >> Author: xinhui pan <xinhui.pan@amd.com> >> Date: Wed Feb 24 11:28:08 2021 +0800 >> >> drm/ttm: Do not add non-system domain BO into swap list >> > Ok. > >> I've also found the following patch which is problematic as well: >> >> commit c8a921d49443025e10794342d4433b3f29616409 >> Author: Jack Zhang <Jack.Zhang1@amd.com> >> Date: Mon Mar 8 12:41:27 2021 +0800 >> >> drm/amd/amdgpu implement tdr advanced mode >> >> [Why] >> Previous tdr design treats the first job in job_timeout as the bad job. >> But sometimes a later bad compute job can block a good gfx job and >> cause an unexpected gfx job timeout because gfx and compute ring share >> internal GC HW mutually. >> >> [How] >> This patch implements an advanced tdr mode.It involves an additinal >> synchronous pre-resubmit step(Step0 Resubmit) before normal resubmit >> step in order to find the real bad job. >> >> 1. At Step0 Resubmit stage, it synchronously submits and pends for the >> first job being signaled. If it gets timeout, we identify it as guilty >> and do hw reset. After that, we would do the normal resubmit step to >> resubmit left jobs. >> >> 2. For whole gpu reset(vram lost), do resubmit as the old way. >> >> Signed-off-by: Jack Zhang <Jack.Zhang1@amd.com> >> Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> >> >> That one is modifying both amdgpu as well as the scheduler code. IIRC I >> actually requested that the patch is split into two, but that was >> somehow not done. >> >> How should we proceed here? Should I separate the patch, push the >> changes to drm-misc-next and then we merge with drm-next and rebase >> amd-staging-drm-next on top of that? >> >> That's most likely the cleanest option approach as far as I can see. > That's fine with me. We could have included them in my PR. Now we > have wait for drm-misc-next to be merged again before we can merge the > amdgpu code. Well I'm not sure, but the patches are identical on both branches. As far as I can see git then just ignores that it gets the patches from both sides of the merge. But I'm not an expert if that doesn't has some bad consequences somewhere else. On the other hand I've decided to keep the TDR patch as it is for now. Regards, Christian. > Is anyone planning to do another drm-misc merge at this > point? > > Alex > >> Thanks, >> Christian. >> >>> Regards, >>> Christian. >>> >>>> Alex >>>> >>>> >>>>> Dave.
On Fri, 9 Apr 2021 at 19:07, Christian König <ckoenig.leichtzumerken@gmail.com> wrote: > > Am 08.04.21 um 15:03 schrieb Alex Deucher: > > On Thu, Apr 8, 2021 at 6:28 AM Christian König > > <ckoenig.leichtzumerken@gmail.com> wrote: > >> Am 08.04.21 um 09:13 schrieb Christian König: > >>> Am 07.04.21 um 21:04 schrieb Alex Deucher: > >>>> On Wed, Apr 7, 2021 at 3:23 AM Dave Airlie <airlied@gmail.com> wrote: > >>>>> On Wed, 7 Apr 2021 at 06:54, Alex Deucher <alexdeucher@gmail.com> > >>>>> wrote: > >>>>>> On Fri, Apr 2, 2021 at 12:22 PM Christian König > >>>>>> <ckoenig.leichtzumerken@gmail.com> wrote: > >>>>>>> Hey Alex, > >>>>>>> > >>>>>>> the TTM and scheduler changes should already be in the drm-misc-next > >>>>>>> branch (not 100% sure about the TTM patch, need to double check > >>>>>>> next week). > >>>>>>> > >>>>>> The TTM change is not in drm-misc yet. > >>>>>> > >>>>>>> Could that cause problems when both are merged into drm-next? > >>>>>> Dave, Daniel, how do you want to handle this? The duplicated patch > >>>>>> is this one: > >>>>>> https://cgit.freedesktop.org/drm/drm-misc/commit/?id=ac4eb83ab255de9c31184df51fd1534ba36fd212 > >>>>>> > >>>>>> amdgpu has changes which depend on it. The same patch is included > >>>>>> in this PR. > >>>>> Ouch not sure how best to sync up here, maybe get misc-next into my > >>>>> tree then rebase your tree on top of it? > >>>> I can do that. > >>> Please let me double check later today that we have everything we need > >>> in drm-misc-next. > >> There where two patch for TTM (one from Felix and one from Oak) which > >> still needed to be pushed to drm-misc-next. I've done that just a minute > >> ago. > >> > > They were included in this PR. > > > >> Then we have this patch which fixes a bug in code removed on > >> drm-misc-next. I think it should be dropped when amd-staging-drm-next is > >> based on drm-next/drm-misc-next. > >> > >> Author: xinhui pan <xinhui.pan@amd.com> > >> Date: Wed Feb 24 11:28:08 2021 +0800 > >> > >> drm/ttm: Do not add non-system domain BO into swap list > >> > > Ok. > > > >> I've also found the following patch which is problematic as well: > >> > >> commit c8a921d49443025e10794342d4433b3f29616409 > >> Author: Jack Zhang <Jack.Zhang1@amd.com> > >> Date: Mon Mar 8 12:41:27 2021 +0800 > >> > >> drm/amd/amdgpu implement tdr advanced mode > >> > >> [Why] > >> Previous tdr design treats the first job in job_timeout as the bad job. > >> But sometimes a later bad compute job can block a good gfx job and > >> cause an unexpected gfx job timeout because gfx and compute ring share > >> internal GC HW mutually. > >> > >> [How] > >> This patch implements an advanced tdr mode.It involves an additinal > >> synchronous pre-resubmit step(Step0 Resubmit) before normal resubmit > >> step in order to find the real bad job. > >> > >> 1. At Step0 Resubmit stage, it synchronously submits and pends for the > >> first job being signaled. If it gets timeout, we identify it as guilty > >> and do hw reset. After that, we would do the normal resubmit step to > >> resubmit left jobs. > >> > >> 2. For whole gpu reset(vram lost), do resubmit as the old way. > >> > >> Signed-off-by: Jack Zhang <Jack.Zhang1@amd.com> > >> Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> > >> > >> That one is modifying both amdgpu as well as the scheduler code. IIRC I > >> actually requested that the patch is split into two, but that was > >> somehow not done. > >> > >> How should we proceed here? Should I separate the patch, push the > >> changes to drm-misc-next and then we merge with drm-next and rebase > >> amd-staging-drm-next on top of that? > >> > >> That's most likely the cleanest option approach as far as I can see. > > That's fine with me. We could have included them in my PR. Now we > > have wait for drm-misc-next to be merged again before we can merge the > > amdgpu code. > > Well I'm not sure, but the patches are identical on both branches. > > As far as I can see git then just ignores that it gets the patches from > both sides of the merge. No this is one of the biggest no-nos. Don't ever merge a patch via multiple trees, it ends badly. (you might get away with it once or twice depending, but longer term bad things result, esp around merge conflicts with other trees). If we have patches we need in multiple trees, we have to create a stable topic branch and pull that into both trees. drm-misc-next is backmerged into drm-next now. Dave.
Hi Dave, Daniel, New stuff for 5.13. There are two small patches for ttm and scheduler that were dependencies for amdgpu changes. The following changes since commit 2cbcb78c9ee5520c8d836c7ff57d1b60ebe8e9b7: Merge tag 'amd-drm-next-5.13-2021-03-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-03-26 15:53:21 +0100) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.13-2021-04-01 for you to fetch changes up to ef95d2a98d642a537190d73c45ae3c308afee890: drm/amdgpu/display: fix warning on 32 bit in dmub (2021-04-01 17:32:32 -0400) ---------------------------------------------------------------- amd-drm-next-5.13-2021-04-01: amdgpu: - Re-enable GPU reset on VanGogh - Enable DPM flags for SMART_SUSPEND and MAY_SKIP_RESUME - Disentangle HG from vga_switcheroo - S0ix fixes - W=1 fixes - Resource iterator fixes - DMCUB updates - UBSAN fixes - More PM API cleanup - Aldebaran updates - Modifier fixes - Enable VCN load balancing with asymmetric engines - Rework BO structs - Aldebaran reset support - Initial LTTPR display work - Display MALL fixes - Fall back to YCbCr420 when YCbCr444 fails - SR-IOV fixes - Misc cleanups and fixes radeon: - Typo fixes ttm: - Handle cached requests (required for Aldebaran) scheduler: - Fix runqueue selection when changing priorities (required to fix VCN load balancing) ---------------------------------------------------------------- Alex Deucher (20): drm/amdgpu/display/dm: add missing parameter documentation drm/amdgpu: Add additional Sienna Cichlid PCI ID drm/amdgpu: add a dev_pm_ops prepare callback (v2) drm/amdgpu: enable DPM_FLAG_MAY_SKIP_RESUME and DPM_FLAG_SMART_SUSPEND flags (v2) drm/amdgpu: disentangle HG systems from vgaswitcheroo drm/amdgpu: rework S3/S4/S0ix state handling drm/amdgpu: don't evict vram on APUs for suspend to ram (v4) drm/amdgpu: clean up non-DC suspend/resume handling drm/amdgpu: move s0ix check into amdgpu_device_ip_suspend_phase2 (v3) drm/amdgpu: re-enable suspend phase 2 for S0ix drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend drm/amdgpu: update comments about s0ix suspend/resume drm/amdgpu: drop S0ix checks around CG/PG in suspend drm/amdgpu: skip kfd suspend/resume for S0ix drm/amdgpu/display: restore AUX_DPHY_TX_CONTROL for DCN2.x drm/amdgpu/display: fix memory leak for dimgrey cavefish drm/amdgpu/pm: mark pcie link/speed arrays as const drm/amdgpu/pm: bail on sysfs/debugfs queries during platform suspend drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in suspend drm/amdgpu/display: fix warning on 32 bit in dmub Alex Sierra (2): drm/amdgpu: replace per_device_list by array drm/amdgpu: ih reroute for newer asics than vega20 Alvin Lee (1): drm/amd/display: Change input parameter for set_drr Anson Jacob (2): drm/amd/display: Fix UBSAN: shift-out-of-bounds warning drm/amd/display: Removing unused code from dmub_cmd.h Anthony Koo (2): drm/amd/display: [FW Promotion] Release 0.0.57 drm/amd/display: [FW Promotion] Release 0.0.58 Aric Cyr (2): drm/amd/display: 3.2.128 drm/amd/display: 3.2.129 Arnd Bergmann (3): amdgpu: avoid incorrect %hu format string amdgpu: fix gcc -Wrestrict warning amdgpu: securedisplay: simplify i2c hexdump output Bhaskar Chowdhury (6): drm/amdgpu: Fix a typo drm/amdgpu: Fix a typo drm/atomic: Couple of typo fixes drm/radeon/r600_cs: Few typo fixes drm/amd/amdgpu/gfx_v7_0: Trivial typo fixes drm/amd: Fix a typo in two different sentences Bindu Ramamurthy (1): drm/amd/display: Allow idle optimization based on vblank. Chengming Gui (1): drm/amd/amdgpu: set MP1 state to UNLOAD before reload its FW for vega20/ALDEBARAN Chris Park (1): drm/amd/display: Disable MALL when SMU not present Christian König (5): drm/amdgpu: remove irq_src->data handling drm/amdgpu: add the sched_score to amdgpu_ring_init drm/amdgpu: share scheduler score on VCN3 instances drm/sched: select new rq even if there is only one v3 drm/amdgpu: load balance VCN3 decode as well v8 Daniel Gomez (2): drm/amdgpu/ttm: Fix memory leak userptr pages drm/radeon/ttm: Fix memory leak userptr pages David Galiffi (1): drm/amd/display: Fixed Clock Recovery Sequence Dennis Li (1): drm/amdgpu: add codes to capture invalid hardware access when recovery Diego Viola (1): drm/amd/display: fix typo: liason -> liaison Dmytro Laktyushkin (3): drm/amd/display: hide VGH asic specific structs drm/amd/display: revert max lb lines change drm/amd/display: revert max lb use by default for n10 Eryk Brol (1): drm/amd/display: Fix MST topology debugfs Evan Quan (9): drm/amd/pm: fix Navi1x runtime resume failure V2 drm/amd/pm: make DAL communicate with SMU through unified interfaces drm/amd/pm: label these APIs used internally as static drm/amd/pm: drop redundant and unneeded BACO APIs V2 drm/amd/pm: no need to force MCLK to highest when no display connected drm/amd/pm: unify the interface for loading SMU microcode drm/amd/pm: fix missing static declarations drm/amd/pm: unify the interface for power gating drm/amd/pm: unify the interface for gfx state setting Fangzhi Zuo (1): drm/amd/display: Fix debugfs link_settings entry Feifei Xu (1): drm/amdgpu: skip PP_MP1_STATE_UNLOAD on aldebaran Guchun Chen (6): drm/amd/pm: fix MP1 state setting failure in s3 test drm/amd/pm: fix gpu reset failure by MP1 state setting drm/amd/display: add DMCUB trace irq support for DCN302 drm/amdgpu: fix NULL pointer dereference drm/amdgpu: fix compiler warning(v2) drm/radeon: avoid potential null pointer access Horace Chen (1): drm/amdgpu: move vram recover into sriov full access Huacai Chen (1): drm/amdgpu: Set a suitable dev_info.gart_page_size Jack Zhang (1): drm/amd/amdgpu implement tdr advanced mode Jake Wang (1): drm/amd/display: Use pwrseq instance to determine eDP instance Jimmy Kizito (2): drm/amd/display: Add dynamic link encoder selection. drm/amd/display: Update display endpoint control path. John Clements (2): drm/amdgpu: update host to psp interface drm/amdgpu: added support for dynamic GECC Krunoslav Kovac (1): drm/amd/display: Rename fs_params to hdr_tm_params Lee Jones (3): drm/amd/display/dc/dce80/dce80_resource: Make local functions static drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap drm/amd/display/dc/calcs/dce_calcs: Remove some large variables from the stack Leo (Hanghong) Ma (2): drm/amd/display: Log DMCUB trace buffer events drm/amd/display: Fix static checker warnings on tracebuff_fb Lijo Lazar (14): drm/amdgpu: Enable VCN/JPEG CG on aldebaran drm/amd/pm: Update aldebaran pmfw interface drm/amd/pm: Modify mode2 msg sequence on aldebaran drm/amd/pm: Add function to wait for smu events drm/amd/pm: Add support for reset completion on aldebaran drm/amdgpu: Add reset control to amdgpu_device drm/amdgpu: Add reset control handling to reset workflow drm/amdgpu: Add PSP public function to load a list of FWs drm/amdgpu: Make set PG/CG state functions public drm/amdgpu: Add mode2 reset support for aldebaran drm/amdgpu: Enable recovery on aldebaran drm/amdgpu: Fix build warnings drm/amd/pm: Fix DPM level count on aldebaran drm/amdgpu: Reset error code for 'no handler' case Luben Tuikov (2): drm/amd/display: Use appropriate DRM_DEBUG_... level drm/amdgpu: Fix check for RAS support Mark Yacoub (1): drm/amdgpu: Ensure that the modifier requested is supported by plane. Nikola Cornij (1): drm/amd/display: Fix black screen with scaled modes on some eDP panels Nirmoy Das (9): drm/amdgpu: wrap kiq ring ops with kiq spinlock drm/amd/display: use GFP_ATOMIC in dcn20_resource_construct drm/amdgpu: fix amdgpu_res_first() drm/amdgpu: allow variable BO struct creation drm/amdgpu: introduce struct amdgpu_bo_user drm/amdgpu: use amdgpu_bo_create_user() for when possible drm/amdgpu: use amdgpu_bo_user bo for metadata and tiling flag drm/amdgpu: make BO type check less restrictive drm/amdgpu: fix offset calculation in amdgpu_vm_bo_clear_mappings() Oak Zeng (1): drm/ttm: ioremap buffer according to TTM mem caching setting Philip Cox (1): drm/amdgpu: Set amdgpu.noretry=1 for Arcturus Pratik Vishwakarma (1): drm/amdgpu: skip CG/PG for gfx during S0ix Prike Liang (1): drm/amdgpu: fix the hibernation suspend with s0ix Qingqing Zhuo (2): drm/amd/display: enable DP DSC Compliance automation drm/amd/display: add log for automated test Qu Huang (2): drm/amdkfd: Fix cat debugfs hang_hws file causes system crash bug drm/amdkfd: dqm fence memory corruption Rodrigo Siqueira (1): drm/amd/display: Add refresh rate trace Rohit Khaire (1): drm/amdgpu: Add new PF2VF flags for VF register access method Roman Li (1): drm/amd/display: Populate socclk entries for dcn2.1 Sefa Eyeoglu (1): drm/amd/display: check fb of primary plane Shirish S (1): drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD Stylon Wang (1): drm/amd/display: Guard ASSR with internal display flag Tian Tao (3): drm/radeon/radeon_pm: Convert sysfs sprintf/snprintf family to sysfs_emit drm/amdgpu: Convert sysfs sprintf/snprintf family to sysfs_emit drm/amd/pm: Convert sysfs sprintf/snprintf family to sysfs_emit Tom St Denis (1): drm/amd/amdgpu: Add CP_IB1_BASE_* to gc_10_3_0 headers Tong Zhang (1): drm/radeon: don't evict if not initialized Victor Lu (2): drm/amd/display: Deallocate IRQ handlers on amdgpu_dm_irq_fini drm/amd/display: Use pr_debug in DM to prevent dmesg flooding Vladimir Stempen (1): drm/amd/display: Fix typo for variable name Wan Jiabing (1): drivers: gpu: Remove duplicate include of amdgpu_hdp.h Wayne Lin (1): drm/amd/display: Add kernel doc to crc_rd_wrk field Wenjing Liu (2): drm/amd/display: define mod_hdcp_display_disable_option struct drm/amd/display: add mod hdcp interface for supporting encryption state query Werner Sembach (1): drm/amd/display: Try YCbCr420 color when YCbCr444 fails Wesley Chalmers (6): drm/amd/display: BIOS LTTPR Caps Interface drm/amd/display: Interface for LTTPR interop drm/amd/display: Enumerate LTTPR modes drm/amd/display: LTTPR config logic drm/amd/display: New path for enabling DPG drm/amd/display: Set max TTU on DPG enable Xiaojian Du (1): Revert "drm/amdgpu: disable gpu reset on Vangogh for now" Xℹ Ruoyao (1): drm/amdgpu: check alignment on CPU page for bo map xinhui pan (1): drm/amdgpu: Use correct size when access vram drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- drivers/gpu/drm/amd/amdgpu/aldebaran.c | 407 +++++++ drivers/gpu/drm/amd/amdgpu/aldebaran.h | 32 + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 35 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 414 ++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 102 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 102 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 40 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 - drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 94 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 19 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 51 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 23 +- drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 98 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 85 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 11 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 32 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 17 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 15 +- drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 26 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 17 +- drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 3 +- drivers/gpu/drm/amd/amdgpu/nv.c | 30 +- drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 25 + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +- drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +- drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 143 ++- drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 116 +- drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 7 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 8 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 28 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 108 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 203 +++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 19 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 6 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 12 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 72 ++ .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 134 +-- .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 40 + drivers/gpu/drm/amd/display/dc/Makefile | 5 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 190 ++++ drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1154 ++++++++++---------- drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 120 +- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 7 + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 101 +- .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 28 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 46 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 207 +++- .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 303 +++++ drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 24 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 6 + drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 16 + drivers/gpu/drm/amd/display/dc/dc_types.h | 15 + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 9 +- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 16 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 24 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 3 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 2 +- .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 3 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 32 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +- .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 28 +- .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 28 +- .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 28 +- .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 28 +- .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 28 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 10 +- drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 13 + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 86 ++ .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 29 +- .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 25 +- .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 30 + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 41 +- drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 144 ++- drivers/gpu/drm/amd/display/include/logger_types.h | 3 + .../drm/amd/display/modules/color/color_gamma.c | 6 +- .../drm/amd/display/modules/color/color_gamma.h | 4 +- .../drm/amd/display/modules/freesync/freesync.c | 37 +- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 10 +- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 4 +- .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 37 +- .../amd/display/modules/hdcp/hdcp1_transition.c | 6 +- .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 10 +- .../amd/display/modules/hdcp/hdcp2_transition.c | 10 +- .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 10 + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 7 +- drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 10 +- .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 6 + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 9 + drivers/gpu/drm/amd/include/atombios.h | 4 +- drivers/gpu/drm/amd/include/atomfirmware.h | 38 +- drivers/gpu/drm/amd/include/kgd_pp_interface.h | 14 + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 198 +++- drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 3 +- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 128 +-- .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 11 +- drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 5 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 13 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 3 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 4 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 406 ++++--- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 25 + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 18 + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 5 + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 71 +- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 58 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 30 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 5 + drivers/gpu/drm/drm_atomic.c | 4 +- drivers/gpu/drm/radeon/r600_cs.c | 6 +- drivers/gpu/drm/radeon/radeon_object.c | 2 + drivers/gpu/drm/radeon/radeon_pm.c | 36 +- drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- drivers/gpu/drm/scheduler/sched_entity.c | 6 +- drivers/gpu/drm/scheduler/sched_main.c | 103 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 14 + include/drm/gpu_scheduler.h | 3 + 197 files changed, 5039 insertions(+), 2273 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.c create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.h create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h