Re: [pull] amdgpu, radeon drm-next-5.13

On Mon, Apr 12, 2021 at 06:07:32PM -0400, Alex Deucher wrote:

Hi Dave, Daniel,

Same PR as last week plus a few accumulated fixes, rebased on drm-next to resolve the dependencies between ttm and scheduler with changes in amdgpu.

The following changes since commit c103b850721e4a79ff9578f131888129c37a4679:

Merge tag 'drm-misc-next-2021-04-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (2021-04-10 05:46:35 +1000)

are available in the Git repository at:

https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.13-2021-04-12

for you to fetch changes up to cbb8f989d5a07cb3e39e9c149a6f89d6c83432aa:

drm/amdgpu: page retire over debugfs mechanism (2021-04-09 16:58:28 -0400)

Applied to drm-next, thanks. -Daniel

---

amd-drm-next-5.13-2021-04-12:

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
• RAS updates
• Misc cleanups and fixes

radeon:

• Typo fixes
• Fix error handling for firmware on r6xx
• Fix a missing check in DP MST handling

---

Alex Deucher (22): 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 drm/amdgpu: drop some unused atombios functions drm/amdgpu/smu7: fix CAC setting on TOPAZ

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

Amber Lin (1): drm/amdkfd: Avoid null pointer in SMI event

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 (3): drm/amd/display: [FW Promotion] Release 0.0.57 drm/amd/display: [FW Promotion] Release 0.0.58 drm/amd/display: [FW Promotion] Release 0.0.59

Aric Cyr (3): drm/amd/display: 3.2.128 drm/amd/display: 3.2.129 drm/amd/display: 3.2.130

Arnd Bergmann (3): amdgpu: avoid incorrect %hu format string amdgpu: fix gcc -Wrestrict warning amdgpu: securedisplay: simplify i2c hexdump output

Aurabindo Pillai (1): drm/amd/display: Add debugfs entry for LTTPR register status

Bernard Zhao (2): drm/amd: use kmalloc_array over kmalloc with multiply drm/amd: cleanup coding style a bit

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 (4): 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/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 (Dingchen) Zhang (1): drm/amd/display: use MST downstream AUX to dump DPRX CRCs

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

Harry VanZyllDeJong (1): drm/amd/display: Fixed corruption on 4K tvs

Harry Wentland (2): drm/amd/display: Add debug prints for SMU messages drm/amd/display: Add dc_debug flag to disable min fclk

Hawking Zhang (12): drm/amdgpu: initialze ras caps per paltform config drm/amdgpu: create umc_v6_7_funcs for aldebaran drm/amdgpu: add helper funtion to query umc ras error drm/amdgpu: implement umc query error count callback drm/amdgpu: implement query_ras_error_address callback drm/amdgpu: split nbio callbacks into ras and non-ras ones drm/amdgpu: move xgmi ras functions to xgmi_ras_funcs drm/amdgpu: split umc callbacks to ras and non-ras ones drm/amdgpu: do not register df_mca interrupt in certain config drm/amdgpu: split mmhub callbacks into ras and non-ras ones drm/amdgpu: split gfx callbacks into ras and non-ras ones drm/amdgpu: move mmhub ras_func init to ip specific file

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 (2): drm/amd/display: Use pwrseq instance to determine eDP instance drm/amd/display: Added dc_edp_id_count to dc_context

Jimmy Kizito (2): drm/amd/display: Add dynamic link encoder selection. drm/amd/display: Update display endpoint control path.

John Clements (6): drm/amdgpu: update host to psp interface drm/amdgpu: added support for dynamic GECC drm/amdgpu: add ras aldebaran ras eeprom driver drm/amdgpu: RAS harvest on driver load drm/amdgpu: enable ras eeprom on aldebaran drm/amdgpu: page retire over debugfs mechanism

Joshua Aberback (1): drm/amd/display: Update DCN302 SR Exit Latency

Jude Shih (1): drm/amdgpu: add DMUB outbox event IRQ source define/complete/debug flag

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

Leo Li (1): drm/amd/display: Move vupdate keepout programming from DCN20 to DCN10

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.

Mikita Lipski (4): drm/amd/display: Set initial value to a divider drm/amd/display: Directly retrain link from debugfs drm/amd/display: Add MST capability to trigger_hotplug interface drm/amd/display: Determine synchronization edge based on master's vsync

Nicholas Kazlauskas (1): drm/amd/display: Cleanup DML DSC input bpc validation

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()

Peng Ju Zhou (4): drm/amdgpu: indirect register access for nv12 sriov drm/amdgpu: indirect register access for nv12 sriov drm/amdgpu: indirect register access for nv12 sriov drm/amdgpu: indirect register access for nv12 sriov

Philip Cox (1): drm/amdgpu: Set amdgpu.noretry=1 for Arcturus

Philip Yang (1): drm/amdgpu: reserve fence slot to update page table

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 (4): drm/amd/display: enable DP DSC Compliance automation drm/amd/display: add log for automated test drm/amd/display: Add missing mask for DCN3 Revert "drm/amdgpu: Ensure that the modifier requested is supported by plane."

Qu Huang (2): drm/amdkfd: Fix cat debugfs hang_hws file causes system crash bug drm/amdkfd: dqm fence memory corruption

Robin Singh (1): drm/amd/display: add NULL check to avoid kernel crash in DC.

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

Shaokun Zhang (1): drm/amd/display: Fix the Wunused-function warning

Shirish S (1): drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD

Stanley.Yang (1): drm/amdgpu: support sdma error injection

Stylon Wang (1): drm/amd/display: Guard ASSR with internal display flag

Thomas Zimmermann (1): drm/amdgpu: Remove unused function amdgpu_bo_fbdev_mmap()

Tian Tao (4): 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 drm/radeon/r600: Fix variables that are not used after assignment

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 (3): drm/amd/display: Deallocate IRQ handlers on amdgpu_dm_irq_fini drm/amd/display: Use pr_debug in DM to prevent dmesg flooding drm/amd/display: Add function and debugfs to dump DCC_EN bit

Vladimir Stempen (1): drm/amd/display: Fix typo for variable name

Wan Jiabing (2): drivers: gpu: Remove duplicate include of amdgpu_hdp.h amd: display: modules: Remove repeated struct declaration

Wayne Lin (2): drm/amd/display: Add kernel doc to crc_rd_wrk field drm/amd/display: Tweak the kernel doc for crc_rd_wrk

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

Wyatt Wood (2): drm/amd/display: Retry getting PSR state if command times out drm/amd/display: Add delay in dmub_srv_send_gpint_command

Xiaojian Du (2): Revert "drm/amdgpu: disable gpu reset on Vangogh for now" drm/amd/pm: add the callback to get vbios bootup values for vangogh

Xℹ Ruoyao (1): drm/amdgpu: check alignment on CPU page for bo map

Yingjie Wang (1): drm/radeon: Fix a missing check bug in radeon_dp_mst_detect()

charles sun (1): drm/amd/pm: increase time out value when sending msg to SMU

xinhui pan (3): drm/amdgpu: Use correct size when access vram drm/amdgpu: Fix size overflow drm/radeon: Fix size overflow

drivers/gpu/drm/amd/amdgpu/Makefile | 9 +- drivers/gpu/drm/amd/amdgpu/aldebaran.c | 407 +++++++ drivers/gpu/drm/amd/amdgpu/aldebaran.h | 32 + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 36 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 153 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 12 - drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 432 +++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 89 ++ 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 | 45 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 39 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 9 + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 17 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 19 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 113 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 21 +- 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 | 256 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 8 +- 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_rlc.h | 3 +- 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 | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 17 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 9 +- 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.c | 10 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 28 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 32 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 26 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 7 +- 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 | 151 ++- 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 | 101 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 20 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h | 12 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 13 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 9 +- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 48 +- 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/mmhub_v1_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 1 + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 8 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h | 1 + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 1 - drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 1 - drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 8 +- drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 1 + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 16 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 1 + 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 | 20 +- drivers/gpu/drm/amd/amdgpu/soc15_common.h | 75 +- drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 4 +- drivers/gpu/drm/amd/amdgpu/umc_v6_1.h | 2 +- drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 281 +++++ drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 37 + drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 4 +- drivers/gpu/drm/amd/amdgpu/umc_v8_7.h | 2 +- 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 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 +- .../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/amdkfd/kfd_smi_events.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 206 +++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 2 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 224 +++- .../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/dcn301_smu.c | 29 +- .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 105 +- .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 28 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 49 +- 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 | 3 +- 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 | 19 +- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 29 +- .../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 | 40 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 7 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 3 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 16 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 3 + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 3 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 16 - drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 3 - .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 34 +- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 3 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 1 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 3 +- .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 3 +- .../drm/amd/display/dc/dcn301/dcn301_resource.c | 4 +- .../drm/amd/display/dc/dcn302/dcn302_resource.c | 4 +- .../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 +- .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 2 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 4 +- .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 8 +- .../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 | 5 +- 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 | 54 +- drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 146 ++- 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 | 41 +- 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 | 12 +- .../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 +- .../drm/amd/include/ivsrcid/dcn/irqsrcs_dcn_1_0.h | 2 + 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 | 6 +- .../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/smu_v11_0.c | 1 + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 6 + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 300 ++++- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 58 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 32 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 5 + drivers/gpu/drm/drm_atomic.c | 4 +- drivers/gpu/drm/radeon/r600.c | 2 + drivers/gpu/drm/radeon/r600_cs.c | 6 +- drivers/gpu/drm/radeon/radeon_dp_mst.c | 3 + drivers/gpu/drm/radeon/radeon_object.c | 2 + drivers/gpu/drm/radeon/radeon_pm.c | 36 +- drivers/gpu/drm/radeon/radeon_ttm.c | 11 +- drivers/gpu/drm/scheduler/sched_main.c | 103 +- include/drm/gpu_scheduler.h | 3 + 251 files changed, 6567 insertions(+), 2798 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/amdgpu/umc_v6_7.c create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_7.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