Hi Dave, Daniel, More stuff for 5.5. Mostly bug fixes and cleanups at this point. The following changes since commit 0e04ad7d1857670944786a8465930a049aaf995f: drm/amdgpu/powerplay: use local renoir array sizes for clock fetching (2019-10-25 16:48:14 -0400) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux tags/drm-next-5.5-2019-11-01 for you to fetch changes up to 5ab5e4e60accd13b0a505a4a34b6feafde2c8fbf: drm/amd/display: Add a conversion function for transmitter and phy_id enums (2019-10-30 11:07:13 -0400) ---------------------------------------------------------------- drm-next-5.5-2019-11-01: amdgpu: - Add EEPROM support for Arcturus - Enable VCN encode support for Arcturus - Misc PSP fixes - Misc DC fixes - swSMU cleanup amdkfd: - Misc cleanups - Fix typo in cu bitmap parsing ---------------------------------------------------------------- Aidan Yang (2): drm/amd/display: Don't use optimized gamma22 with eetf drm/amd/display: Allow inverted gamma Alex Deucher (1): drm/amdgpu/gmc10: properly set BANK_SELECT and FRAGMENT_SIZE Alex Sierra (1): drm/amdkfd: bug fix for out of bounds mem on gpu cache filling info Alvin Lee (1): drm/amd/display: Update min dcfclk Andrey Grodzovsky (6): drm/amd/powerplay: Add interface for I2C transactions to SMU. drm/amd/powerplay: Add EEPROM I2C read/write support to Arcturus. drm/amdgpu: Use ARCTURUS in RAS EEPROM. drm/amdgpu: Move amdgpu_ras_recovery_init to after SMU ready. drm/sched: Set error to s_fence if HW job submission failed. drm/amdgpu: If amdgpu_ib_schedule fails return back the error. Anthony Koo (2): drm/amd/display: correctly populate dpp refclk in fpga drm/amd/display: Proper return of result when aux engine acquire fails Aric Cyr (2): drm/amd/display: 3.2.55 drm/amd/display: 3.2.56 Chenwandun (1): drm/amd/display: remove gcc warning Wunused-but-set-variable Colin Ian King (1): drm/amdgpu/psp: fix spelling mistake "initliaze" -> "initialize" Dmytro Laktyushkin (8): drm/amd/display: remove unused code drm/amd/display: split dcn20 fast validate into more functions drm/amd/display: correctly initialize dml odm variables drm/amd/display: move dispclk vco freq to clk mgr base drm/amd/display: remove unnecessary assert drm/amd/display: fix number of dcn21 dpm clock levels drm/amd/display: add embedded flag to dml drm/amd/display: fix avoid_split for dcn2+ validation Eric Yang (2): drm/amd/display: move wm ranges reporting to end of init hw drm/amd/display: fix hubbub deadline programing Evan Quan (6): drm/amd/powerplay: update Arcturus driver smu interface XGMI link part drm/amd/powerplay: add lock protection for swSMU APIs V2 drm/amd/powerplay: split out those internal used swSMU APIs V2 drm/amd/powerplay: clear the swSMU code layer drm/amd/powerplay: skip unsupported clock limit settings on Arcturus V2 drm/amd/powerplay: correct current clock level label for Arcturus Geert Uytterhoeven (1): drm/amdgpu: Remove superfluous void * cast in debugfs_create_file() call Guchun Chen (2): drm/amdgpu: refine reboot debugfs operation in ras case (v3) drm/amdgpu: define macros for retire page reservation HaiJun Chang (1): drm/amdgpu: fix gfx VF FLR test fail on navi James Zhu (1): drm/amdgpu/vcn: Enable VCN2.5 encoding Jane Jian (1): drm/amdgpu: add VCN0 and VCN1 needed headers Jiange Zhao (1): drm/amdgpu/SRIOV: SRIOV VF doesn't support BACO Jordan Lazare (1): drm/amd/display: Remove superfluous assert Joshua Aberback (1): drm/amd/display: Apply vactive dram clock change workaround to dcn2 DMLv2 Jun Lei (4): drm/amd/display: add 50us buffer as WA for pstate switch in active drm/amd/display: add odm visual confirm drm/amd/display: add flag to allow diag to force enumerate edp drm/amd/display: do not synchronize "drr" displays Krunoslav Kovac (1): drm/amd/display: Only use EETF when maxCL > max display Kyle Mahlkuch (1): drm/radeon: Fix EEH during kexec Le Ma (3): drm/amdgpu: clear UVD VCPU buffer when err_event_athub generated drm/amdgpu: bypass some cleanup work after err_event_athub (v2) drm/amdgpu: fix no ACK from LDS read during stress test for Arcturus Leo Li (1): drm/amdgpu: Add DC feature mask to disable fractional pwm Lewis Huang (1): drm/amd/display: take signal type from link Marek Olšák (1): drm/amdgpu: Allow reading more status registers on si/cik Michael Strauss (3): drm/amd/display: Fix MPO & pipe split on 3-pipe dcn2x drm/amd/display: Passive DP->HDMI dongle detection fix drm/amd/display: Disable force_single_disp_pipe_split on DCN2+ Nathan Chancellor (1): drm/amd/display: Add a conversion function for transmitter and phy_id enums Nicholas Kazlauskas (1): drm/amd/display: Free gamma after calculating legacy transfer function Nirmoy Das (1): drm/amdgpu: remove unused parameter in amdgpu_gfx_kiq_free_ring Noah Abradjian (1): drm/amd/display: Make clk mgr the only dto update point Paul Hsieh (1): drm/amd/display: audio endpoint cannot switch Pelle van Gils (1): drm/amdgpu/powerplay/vega10: allow undervolting in p7 Pelloux-prayer, Pierre-eric (1): drm/amdgpu/sdma5: do not execute 0-sized IBs (v2) Philip Yang (1): drm/amdkfd: don't use dqm lock during device reset/suspend/resume Reza Amini (1): drm/amd/display: Add center mode for integer scaling in DC Roman Li (3): drm/amd/display: Add debugfs entry for reading psr state drm/amd/display: Enable PSR drm/amdgpu/display: add dc feature mask for psr enablement Sung Lee (1): drm/amd/display: Do not call update bounding box on dc create Tianci.Yin (3): drm/amdgpu/gfx10: update gfx golden settings drm/amdgpu/gfx10: update gfx golden settings for navi14 drm/amdgpu/gfx10: update gfx golden settings for navi12 Wambui Karuga (3): drm/radeon: remove assignment for return value drm/amd: declare amdgpu_exp_hw_support in amdgpu.h drm/amd: correct "_LENTH" mispelling in constant Wayne Lin (1): drm/amd/display: Avoid sending abnormal VSIF Xiaojie Yuan (2): drm/amdgpu/psp11: wait for sOS ready for ring creation drm/amdgpu/psp11: fix typo in comment Yogesh Mohan Marimuthu (1): drm/amd/display: map TRANSMITTER_UNIPHY_x to LINK_REGS_x Yong Zhao (2): drm/amdkfd: Delete unnecessary pr_fmt switch drm/amdkfd: Delete duplicated queue bit map reservation Yongqiang Sun (2): drm/amd/display: Add unknown clk state. drm/amd/display: enable vm by default for rn. YueHaibing (3): drm/amd/display: Make calculate_integer_scaling static drm/amd/powerplay: Make two functions static drm/amdgpu: remove set but not used variable 'adev' Zhan liu (2): drm/amd/display: setting the DIG_MODE to the correct value. drm/amd/display: Change Navi14's DWB flag to 1 chen gong (3): drm/amdgpu: Fix SDMA hang when performing VKexample test drm/amdgpu/powerplay: modify the parameters of SMU_MSG_PowerUpVcn to 0 drm/amd/powerplay: Disable gfx CGPG when suspend smu zhong jiang (1): drm/amd/display: remove redundant null pointer check before kfree zhongshiqi (1): dc.c:use kzalloc without test drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 - .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 4 - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 23 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 6 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 36 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 56 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 20 - drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 +- drivers/gpu/drm/amd/amdgpu/cik.c | 19 + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 9 + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 9 + drivers/gpu/drm/amd/amdgpu/nv.c | 3 +- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 + drivers/gpu/drm/amd/amdgpu/si.c | 11 + drivers/gpu/drm/amd/amdgpu/soc15.c | 1 + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 3 - drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 5 - .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 47 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 1 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 140 +++- .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 2 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 21 + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 1 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 48 +- .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 14 +- .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 4 +- .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 10 +- .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 38 +- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 178 ++--- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h | 7 - .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 12 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 194 ++++++ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 24 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 54 +- drivers/gpu/drm/amd/display/dc/dc.h | 9 +- drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 3 +- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 4 + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 10 +- .../drm/amd/display/dc/dce100/dce100_resource.c | 37 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 11 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 37 +- .../drm/amd/display/dc/dce112/dce112_resource.c | 37 +- .../drm/amd/display/dc/dce120/dce120_resource.c | 37 +- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 37 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 22 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 4 + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 28 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 33 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 4 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 262 +++++--- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 31 + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 79 ++- drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 4 +- .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 3 +- .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 3 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 3 + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 1 + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 4 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 4 - drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 3 +- .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 2 - .../drm/amd/display/modules/color/color_gamma.c | 51 +- drivers/gpu/drm/amd/include/amd_shared.h | 2 + .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 12 + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 722 +++++++++++++++++++-- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 450 +++++++++---- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 4 +- drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 339 +++------- .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 28 +- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 122 +++- drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 41 +- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 66 +- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 32 +- drivers/gpu/drm/amd/powerplay/smu_internal.h | 204 ++++++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 196 ++---- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 74 +-- drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 76 ++- drivers/gpu/drm/radeon/cik.c | 8 +- drivers/gpu/drm/radeon/radeon_drv.c | 14 + drivers/gpu/drm/scheduler/sched_main.c | 19 +- 100 files changed, 3131 insertions(+), 1155 deletions(-) create mode 100644 drivers/gpu/drm/amd/powerplay/smu_internal.h _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel