| Message ID | 20190125231517.26268-1-alexander.deucher@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [pull] amdgpu, amdkfd, ttm, sched drm-next-5.1 | expand |
On Sat, 26 Jan 2019 at 09:15, Alex Deucher <alexdeucher@gmail.com> wrote: > > Hi Dave, Daniel, > > New stuff for 5.1. > amdgpu: > - DC bandwidth formula updates > - Support for DCC on scanout surfaces > - Support for multiple IH rings on soc15 asics > - Fix xgmi locking > - Add sysfs interface to get pcie usage stats > - Simplify DC i2c/aux code > - Initial support for BACO on vega10/20 > - New runtime SMU feature debug interface > - Expand existing sysfs power interfaces to new clock domains > - Handle kexec properly > - Simplify IH programming > - Rework doorbell handling across asics > - Drop old CI DPM implementation > - DC page flipping fixes > - Misc SR-IOV fixes > Hi Alex, I pulled this, but it introduced a warning, so I dropped it for now and the fix is on the list, please add it and resend, Thanks. Dave.
On Mon, 4 Feb 2019 at 13:27, Dave Airlie <airlied@gmail.com> wrote: > > On Sat, 26 Jan 2019 at 09:15, Alex Deucher <alexdeucher@gmail.com> wrote: > > > > Hi Dave, Daniel, > > > > New stuff for 5.1. > > amdgpu: > > - DC bandwidth formula updates > > - Support for DCC on scanout surfaces > > - Support for multiple IH rings on soc15 asics > > - Fix xgmi locking > > - Add sysfs interface to get pcie usage stats > > - Simplify DC i2c/aux code > > - Initial support for BACO on vega10/20 > > - New runtime SMU feature debug interface > > - Expand existing sysfs power interfaces to new clock domains > > - Handle kexec properly > > - Simplify IH programming > > - Rework doorbell handling across asics > > - Drop old CI DPM implementation > > - DC page flipping fixes > > - Misc SR-IOV fixes > > > > Hi Alex, > > I pulled this, but it introduced a warning, so I dropped it for now > and the fix is on the list, please add it and resend, > Just realised the warning was already there, so I pulled this again, please send another next with the warning fix when you can. Dave.
On Sun, Feb 3, 2019 at 11:57 PM Dave Airlie <airlied@gmail.com> wrote: > > On Mon, 4 Feb 2019 at 13:27, Dave Airlie <airlied@gmail.com> wrote: > > > > On Sat, 26 Jan 2019 at 09:15, Alex Deucher <alexdeucher@gmail.com> wrote: > > > > > > Hi Dave, Daniel, > > > > > > New stuff for 5.1. > > > amdgpu: > > > - DC bandwidth formula updates > > > - Support for DCC on scanout surfaces > > > - Support for multiple IH rings on soc15 asics > > > - Fix xgmi locking > > > - Add sysfs interface to get pcie usage stats > > > - Simplify DC i2c/aux code > > > - Initial support for BACO on vega10/20 > > > - New runtime SMU feature debug interface > > > - Expand existing sysfs power interfaces to new clock domains > > > - Handle kexec properly > > > - Simplify IH programming > > > - Rework doorbell handling across asics > > > - Drop old CI DPM implementation > > > - DC page flipping fixes > > > - Misc SR-IOV fixes > > > > > > > Hi Alex, > > > > I pulled this, but it introduced a warning, so I dropped it for now > > and the fix is on the list, please add it and resend, > > > > Just realised the warning was already there, so I pulled this again, > please send another next with the warning fix when you can. I was planning to send it via -fixes since the original patch was in 5.0, but I can include it in both -fixes and -next if you'd prefer. Alex
On Tue, 5 Feb 2019 at 04:35, Alex Deucher <alexdeucher@gmail.com> wrote: > > On Sun, Feb 3, 2019 at 11:57 PM Dave Airlie <airlied@gmail.com> wrote: > > > > On Mon, 4 Feb 2019 at 13:27, Dave Airlie <airlied@gmail.com> wrote: > > > > > > On Sat, 26 Jan 2019 at 09:15, Alex Deucher <alexdeucher@gmail.com> wrote: > > > > > > > > Hi Dave, Daniel, > > > > > > > > New stuff for 5.1. > > > > amdgpu: > > > > - DC bandwidth formula updates > > > > - Support for DCC on scanout surfaces > > > > - Support for multiple IH rings on soc15 asics > > > > - Fix xgmi locking > > > > - Add sysfs interface to get pcie usage stats > > > > - Simplify DC i2c/aux code > > > > - Initial support for BACO on vega10/20 > > > > - New runtime SMU feature debug interface > > > > - Expand existing sysfs power interfaces to new clock domains > > > > - Handle kexec properly > > > > - Simplify IH programming > > > > - Rework doorbell handling across asics > > > > - Drop old CI DPM implementation > > > > - DC page flipping fixes > > > > - Misc SR-IOV fixes > > > > > > > > > > Hi Alex, > > > > > > I pulled this, but it introduced a warning, so I dropped it for now > > > and the fix is on the list, please add it and resend, > > > > > > > Just realised the warning was already there, so I pulled this again, > > please send another next with the warning fix when you can. > > I was planning to send it via -fixes since the original patch was in > 5.0, but I can include it in both -fixes and -next if you'd prefer. Oh wow, I'm not sure how I missed it, please send via -fixes and I'll backmerge. Dave.
Hi Dave, Daniel, New stuff for 5.1. amdgpu: - DC bandwidth formula updates - Support for DCC on scanout surfaces - Support for multiple IH rings on soc15 asics - Fix xgmi locking - Add sysfs interface to get pcie usage stats - Simplify DC i2c/aux code - Initial support for BACO on vega10/20 - New runtime SMU feature debug interface - Expand existing sysfs power interfaces to new clock domains - Handle kexec properly - Simplify IH programming - Rework doorbell handling across asics - Drop old CI DPM implementation - DC page flipping fixes - Misc SR-IOV fixes amdkfd: - Simplify the interfaces between amdkfd and amdgpu ttm: - Add a callback to notify the driver when the lru changes sched: - Refactor mirror list handling - Rework hw fence processing The following changes since commit e3d093070eb0b5e3df668d3eb04100ea79343c65: Merge tag 'tilcdc-4.22' of https://github.com/jsarha/linux into drm-next (2019-01-11 06:29:31 +1000) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-5.1 for you to fetch changes up to 10117450735c7a7c0858095fb46a860e7037cb9a: drm/amd/display: add -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines (2019-01-25 16:15:37 -0500) ---------------------------------------------------------------- Aaron Liu (1): drm/amdgpu/psp: ignore psp response status Alex Deucher (12): drm/amdgpu: expose sclk and mclk via hwmon drm/amdgpu: add need_reset_on_init asic callback (v2) drm/amdgpu/si: add need_reset_on_init asic callback for SI (v2) drm/amdgpu/cik: add need_reset_on_init asic callback for CIK (v2) drm/amdgpu/vi: add need_reset_on_init asic callback for VI (v2) drm/amdgpu/soc15: add need_reset_on_init asic callback for SOC15 (v2) drm/amdgpu: check if we need to reset at init time (v2) drm/amdgpu/soc15: return proper error codes in baco reset drm/amdgpu: Add APTX quirk for Lenovo laptop drm/amdgpu: Add missing power attribute to APU check drm/radeon: check if device is root before getting pci speed caps drm/amdgpu: remove old CI DPM implementation Amber Lin (3): drm/amdgpu: Relocate kgd2kfd function declaration drm/amdgpu: Simplify kgd2kfd interface drm/amdgpu: Remove kgd2kfd function pointers Andrey Grodzovsky (2): drm/sched: Refactor ring mirror list handling. drm/sched: Rework HW fence processing. Bayan Zabihiyan (1): drm/amd/display: Add new infopacket definition Brajeswar Ghosh (3): drm/amd/display: Remove duplicate header drm/amd/display/dcn10_hw_sequencer_debug: Remove duplicate header drm/amd/display/i2c_hw_engine_dce110: Remove duplicate header Charlene Liu (2): drm/amd/display: fix PME notification not working in RV desktop drm/amd/display: dp interlace MSA timing programming for Interlace mode. Christian König (11): drm/amdgpu: disable system memory page tables for now drm/amdgpu: add IH ring to ih_get_wptr/ih_set_rptr v2 drm/amdgpu: simplify IH programming drm/amdgpu: fix IH overflow on Vega10 v2 drm/amdgpu: add the IH to the IV trace drm/amdgpu: improve GMC v9 page fault message drm/ttm: stop always moving BOs on the LRU on page fault drm/amdgpu: set the executable flag on unused Vega10 PTEs v2 drm/amdgpu: enable IH ring 1 and ring 2 v4 drm/amdgpu: add support for processing IH ring 1 & 2 drm/amdgpu: add support for self irq on Vega10 v2 Chunming Zhou (2): drm/ttm: add lru notify to bo driver v2 drm/amdgpu: set bulk_moveable to false when lru changed v2 Colin Ian King (1): amdgpu/dc: remove various variables that are defined but never used David Francis (12): drm/amd/display: Detach backlight from stream drm/amd/display: Add backlight pwm debugfs drm/amd/display: Remove unused parameter plane_states drm/amd/display: Shift dc link aux to aux_payload drm/amd/display: Switch ddc to new aux interface drm/amd/display: Change from aux_engine to dce_aux drm/amd/display: Remove i2caux folder drm/amd/display: Let updates with no scaling changes be fast drm/amd/display: Simplify underscan and ABM commit drm/amd/display: Call into DC once per multiplane flip drm/amd/display: Perform plane updates only when needed drm/amd/display: Know what a pageflip is Derek Lai (1): drm/amd/display: Set link rate set if eDP ver >= 1.4. Dmytro Laktyushkin (4): drm/amd/display: Remove some extra braces drm/amd/display: update DCN dml calcs drm/amd/display: add dsclk to pipe bw struct drm/amd/display: Rename configure_encoder to enc1_configure_encoder Emily Deng (4): drm/amdgpu/virtual_dce: No need to pin the fb's bo drm/amdgpu/virtual_dce: No need to pin the cursor bo drm/amdgpu/sriov:Correct pfvf exchange logic drm/amdgpu/sriov: For finishing routine send rel event after init failed Eric Bernstein (4): drm/amd/display: Expose hubp1_vready_workaround function drm/amd/display: Fix runtime errors for diagnostic tests drm/amd/display: Improve logging of validation failures during atomic_check drm/amd/display: Check if registers are available before accessing Eric Yang (4): drm/amd/display: update bw formula to v252 drm/amd/display: add workaround for 4k video underflow revert "drm/amd/display: Add condition to sync eDP SW status and HW status" drm/amd/display: take dpms_off into account for edp turn off logic Eryk Brol (2): drm/amd/display: Restructure DCN10 hubbub drm/amd/display: Introduce DC VM interface Evan Quan (24): drm/amd/powerplay: support BOOTUP_DEFAULT power profile mode drm/amd/powerplay: update OD support flag for SKU with no OD capabilities drm/amd/powerplay: create pp_od_clk_voltage device file under OD support drm/amd/powerplay: avoid possible buffer overflow drm/amd/powerplay: drop the unnecessary uclk hard min setting drm/amd/powerplay: support enabled ppfeatures retrieving and setting V3 drm/amd/powerplay: support retrieving and adjusting SOC clock power levels V2 drm/amd/powerplay: support retrieving and adjusting fclock power levels V2 drm/amd/powerplay: support retrieving and adjusting dcefclock power levels V2 drm/amdgpu: check PSP support before adding the ip block drm/amdgpu: fix wrong APU judgement drm/amd/powerplay: avoid unnecessary dpm level setting drm/amd/powerplay: enforce display related settings only on needed drm/amd/powerplay: fit the SOC clock also to the new performance level drm/amd/powerplay: run btc before enabling all SMU features drm/amd/display: change the max clock level to 16 drm/amd/powerplay: support Vega10 fan table V3 drm/amd/powerplay: enable MGPU fan boost feature on Vega10 drm/amd/powerplay: correct Vega20 gfxclk readout under DS drm/amd/powerplay: avoid frequent metrics table export drm/amd/powerplay: support Vega10 SOCclk and DCEFclk dpm level settings drm/amd/powerplay: support Vega10 retrieving and setting ppfeatures drm/amd/powerplay: support Vega12 SOCclk and DCEFclk dpm level settings drm/amd/powerplay: support Vega12 retrieving and setting ppfeatures Fatemeh Darbehani (2): drm/amd/display: Add pixel clock values to dtn logs drm/amd/display: Start using the new pp_smu interface Felix Kuehling (2): drm/amdkfd: Allow building KFD on ARM64 (v2) drm/amdkfd: Don't assign dGPUs to APU topology devices Gustavo A. R. Silva (3): drm/amd/display: Fix boolean expression in get_surf_rq_param drm/amdgpu_vm: fix boolean expressions drm/amdgpu: Replace kzalloc with kcalloc Hawking Zhang (2): drm/amdgpu/psp: update the naming of GFX_FW_TYPE_RLC_RESTORE_LIST_CNTL drm/amdgpu/psp: make get_fw_type and prep_cmd_buf to be common interfaces Hugo Hu (1): drm/amd/display: Add debug option to force fclk request Imad Syed (1): drm/amd/display: Remove unused headers Jack Xiao (1): drm/amdgpu: add flags to emit_ib interface v2 Jerry (Fangzhi) Zuo (1): drm/amd/display: Skip create new stream if crtc state doesn't change Jim Qu (12): drm/amdgpu: set WRITE_BURST_LENGTH to 64B to workaround SDMA1 hang drm/amdgpu: update nbio v6.1 register/master to support BACO drm/amdgpu: add BACO interfaces in pm and hwmgr function table drm/amdpgu: add common functions for BACO feature in PP (v2) drm/amdgpu: add BACO interfaces for vega10 drm/amdgpu: expose BACO interfaces to upper level from PP drm/amdgpu: update NBIO v7.4 to support BACO drm/amdgpu: also include NBIO v7.4 register mask header drm/amdgpu: update THM IP register header to support BACO drm/amdgpu/powerper: add vega20 BACO functions drm/amdgpu: use BACO reset if platform support (v2) drm/amdgpu: use BACO reset on vega20 if platform support John Barberiz (1): drm/amd/display: Fix use of uninitialized union Joshua Aberback (2): drm/amd/display: Fix missing hwss function for dce drm/amd/display: Fix for NULL ramp pointer crashing driver Josip Pavic (4): drm/amd/display: Pack DMCU iRAM alignment drm/amd/display: Update DMCU versioning mechanism drm/amd/display: Create switching mechanism for ABM 2.2 drm/amd/display: Adjust ABM 2.2 contrast parameters Jun Lei (3): drm/amd/display: Add a PP_SMU_VER_MAX enum drm/amd/display: remove sink reference in dc_stream_state drm/amd/display: add stream ID and otg instance in dc_stream_state Ken Chalmers (3): drm/amd/display: Use 100 Hz precision for pipe pixel clocks drm/amd/display: Expand set_pixel_clock debug log message drm/amd/display: Fix 64-bit division for 32-bit builds Kenneth Feng (2): drm/amd/powerplay: run acg btc for Vega12 drm/amd/powerplay: OD setting fix on Vega10 Kent Russell (3): drm/amdgpu: Cleanup 2 compiler warnings drm/amdgpu: Add NBIO SMN headers v2 drm/amdgpu: Add sysfs file for PCIe usage v5 Krunoslav Kovac (3): drm/amd/display: Fix issue with VLine interrupt not firing drm/amd/display: Check for NULL when creating gamma struct drm/amd/display: Default to linear output gamma Leo Li (8): drm/amd/display: Remove stream_status->link drm/amd/display: Use local variable instead of caching global drm/amd/display: Fix driver load crash in amdgpu_dm drm/amd/display: Compensate for XGMI SS downspread on dprefclk drm/amd/display: Move iteration out of dm_update_planes drm/amd/display: Move iteration out of dm_update_crtcs Revert "drm/amd/display: Signal hw_done() after waiting for flip_done()" drm/amd/display: Fully remove i2caux folder Lewis Huang (1): drm/amd/display: add plane size change check condition Likun Gao (1): drm/amdgpu: make gfx9 enter into rlc safe mode when set MGCG Martin Tsai (1): drm/amd/display: Redefine DMCU_SCRATCH to identify DMCU state Matteo Croce (1): drm/amd: fix typo Nicholas Kazlauskas (3): drm/amd/display: Set requested plane state DCC params for GFX9 drm/amd/display: Only get the connector state for VRR when toggled drm/amd/display: Fix disabled cursor on top screen edge Oak Zeng (4): drm/amdgpu: Use sdma_engine array drm/amdgpu: Add per device sdma_doorbell_range field drm/amdgpu: Fix sdma doorbell range setting drm/amdgpu: Setting doorbell range registers earlier Prike Liang (1): drm/amd/powerplay:clean up phm_enable_clock_power_gatings Rafał Miłecki (1): drm/amd/display: Include names of all PP clock types Roman Li (1): drm/amd/display: fix warning on raven hotplug Shirish S (2): drm/amd/display: fix compliler errors [-Werror,-Wmissing-braces] drm/amdgpu/gmc: fix compiler errors [-Werror,-Wmissing-braces] (V2) SivapiriyanKumarasamy (1): drm/amd/display: Minor code cleanup Steven Chiu (7): drm/amd/display: 3.2.09 drm/amd/display: 3.2.10 drm/amd/display: 3.2.11 drm/amd/display: 3.2.12 drm/amd/display: 3.2.13 drm/amd/display: 3.2.14 drm/amd/display: 3.2.15 Tao Zhou (1): drm/amdgpu: fix CPDMA hang in PRT mode for VEGA20 Tiecheng Zhou (1): drm/amdgpu/gfx_v8_0: Reorder the gfx, kiq and kcq rings test sequence Tom St Denis (1): drm/amd/amdgpu: add missing mutex lock to amdgpu_get_xgmi_hive() (v3) Tony Cheng (1): drm/amd/display: refactor reg_update Wenjing Liu (1): drm/amd/display: implement dc_init_callbacks to assign callback pointers after dc_create Xiangliang Yu (2): drm/amdgpu/psp: Fix to get wrong xgmi session id drm/amdgpu/psp: Fix can't detect psp INVOKE command failed abdoulaye berthe (1): drm/amd/display: fix CTS 4.2.2.8 hersen wu (3): drm/amd/display: dal-pplib interface refactor dal part drm/amd/display: fix eDP fast bootup for pre-raven asic drm/amd/display: Connect dig_fe to otg directly instead of calling bios ndesaulniers@google.com (1): drm/amd/display: add -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines shaoyunl (1): drm/amdgpu: Add message print when unable to get valid hive wentalou (3): drm/amdgpu: psp_ring_destroy cause psp->km_ring.ring_mem NULL drm/amdgpu: distinguish early and late re-init log in sriov drm/amdgpu: sriov should skip asic_reset in device_init drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 84 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 19 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 77 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 20 +- drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 8 + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 40 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 36 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 37 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 379 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 141 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 65 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 47 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 5 +- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6844 -------------------- drivers/gpu/drm/amd/amdgpu/ci_dpm.h | 349 - drivers/gpu/drm/amd/amdgpu/ci_smc.c | 279 - drivers/gpu/drm/amd/amdgpu/cik.c | 75 +- drivers/gpu/drm/amd/amdgpu/cik_dpm.h | 1 - drivers/gpu/drm/amd/amdgpu/cik_ih.c | 36 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 2 +- drivers/gpu/drm/amd/amdgpu/cz_ih.c | 40 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 17 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 52 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 36 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 2 +- drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 10 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 9 +- drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 90 - drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 75 - drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 72 - drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 15 +- drivers/gpu/drm/amd/amdgpu/si.c | 54 + drivers/gpu/drm/amd/amdgpu/si_dma.c | 2 +- drivers/gpu/drm/amd/amdgpu/si_ih.c | 38 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 167 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 60 +- 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_v3_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 324 +- drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 5 +- drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 17 +- drivers/gpu/drm/amd/amdgpu/vi.c | 69 +- drivers/gpu/drm/amd/amdkfd/Kconfig | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 8 + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 31 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 22 - drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 21 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1262 ++-- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 49 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 8 +- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 84 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 57 + drivers/gpu/drm/amd/display/dc/Makefile | 5 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 14 - drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 16 - .../drm/amd/display/dc/bios/bios_parser_helper.c | 96 +- .../drm/amd/display/dc/bios/bios_parser_helper.h | 4 - .../gpu/drm/amd/display/dc/bios/command_table.c | 135 +- .../gpu/drm/amd/display/dc/bios/command_table.h | 3 - .../gpu/drm/amd/display/dc/bios/command_table2.c | 82 +- .../gpu/drm/amd/display/dc/bios/command_table2.h | 3 - drivers/gpu/drm/amd/display/dc/calcs/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 10 +- .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.c | 43 +- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 19 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 65 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 88 +- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 162 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 123 +- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 13 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 26 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 69 +- drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 9 +- drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 127 + drivers/gpu/drm/amd/display/dc/dc.h | 15 +- drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 9 - drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 13 +- drivers/gpu/drm/amd/display/dc/dc_helper.c | 36 +- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 4 +- drivers/gpu/drm/amd/display/dc/dc_link.h | 4 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 35 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 647 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 30 +- drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 123 +- drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.h | 35 +- .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 196 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 129 +- drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 12 + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 8 +- .../drm/amd/display/dc/dce/dce_stream_encoder.c | 79 +- .../drm/amd/display/dc/dce/dce_stream_encoder.h | 8 +- .../drm/amd/display/dc/dce100/dce100_resource.c | 4 +- .../drm/amd/display/dc/dce110/dce110_compressor.c | 2 - .../amd/display/dc/dce110/dce110_hw_sequencer.c | 155 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 16 +- .../drm/amd/display/dc/dce112/dce112_resource.c | 6 +- .../amd/display/dc/dce120/dce120_hw_sequencer.c | 15 + .../amd/display/dc/dce120/dce120_hw_sequencer.h | 1 + .../drm/amd/display/dc/dce120/dce120_resource.c | 84 +- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 4 +- .../amd/display/dc/dce80/dce80_timing_generator.c | 8 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c | 107 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 2 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 12 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 42 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 188 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 35 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 7 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 7 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 43 +- .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 15 +- .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 26 +- .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 2 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 48 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 74 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 79 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 10 +- drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 3 +- drivers/gpu/drm/amd/display/dc/dm_services_types.h | 14 +- drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- .../drm/amd/display/dc/dml/display_mode_enums.h | 26 + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 28 + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 2 + .../drm/amd/display/dc/dml/display_mode_structs.h | 107 +- .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 6 +- drivers/gpu/drm/amd/display/dc/i2caux/Makefile | 99 - drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c | 606 -- drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.h | 86 - .../amd/display/dc/i2caux/dce100/i2caux_dce100.c | 106 - .../amd/display/dc/i2caux/dce100/i2caux_dce100.h | 32 - .../display/dc/i2caux/dce110/aux_engine_dce110.c | 505 -- .../display/dc/i2caux/dce110/aux_engine_dce110.h | 78 - .../dc/i2caux/dce110/i2c_hw_engine_dce110.c | 574 -- .../dc/i2caux/dce110/i2c_hw_engine_dce110.h | 218 - .../dc/i2caux/dce110/i2c_sw_engine_dce110.c | 160 - .../amd/display/dc/i2caux/dce110/i2caux_dce110.c | 329 - .../amd/display/dc/i2caux/dce110/i2caux_dce110.h | 54 - .../amd/display/dc/i2caux/dce112/i2caux_dce112.c | 129 - .../amd/display/dc/i2caux/dce112/i2caux_dce112.h | 32 - .../amd/display/dc/i2caux/dce120/i2caux_dce120.c | 120 - .../display/dc/i2caux/dce80/i2c_hw_engine_dce80.c | 875 --- .../display/dc/i2caux/dce80/i2c_hw_engine_dce80.h | 54 - .../display/dc/i2caux/dce80/i2c_sw_engine_dce80.c | 173 - .../drm/amd/display/dc/i2caux/dce80/i2caux_dce80.c | 284 - .../drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c | 120 - .../drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.h | 32 - .../display/dc/i2caux/diagnostics/i2caux_diag.c | 97 - .../display/dc/i2caux/diagnostics/i2caux_diag.h | 32 - drivers/gpu/drm/amd/display/dc/i2caux/engine.h | 111 - drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.c | 118 - drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.h | 115 - .../amd/display/dc/i2caux/i2c_generic_hw_engine.c | 284 - .../amd/display/dc/i2caux/i2c_generic_hw_engine.h | 77 - .../gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.c | 251 - .../gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.h | 80 - .../gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.c | 601 -- .../gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.h | 81 - drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 491 -- drivers/gpu/drm/amd/display/dc/i2caux/i2caux.h | 122 - drivers/gpu/drm/amd/display/dc/inc/clock_source.h | 8 +- drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 9 +- drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 17 +- drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 19 + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 16 +- drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 5 + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 4 +- .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 4 + .../dc/{i2caux/engine_base.c => inc/hw/vmid.h} | 45 +- .../i2c_sw_engine_dce110.h => inc/vm_helper.h} | 38 +- .../drm/amd/display/include/bios_parser_types.h | 4 +- .../gpu/drm/amd/display/include/i2caux_interface.h | 33 +- .../drm/amd/display/modules/color/color_gamma.c | 78 +- .../drm/amd/display/modules/freesync/freesync.c | 106 +- .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 2 +- .../gpu/drm/amd/display/modules/inc/mod_shared.h | 3 +- .../drm/amd/display/modules/power/power_helpers.c | 597 +- .../amd/include/asic_reg/nbio/nbio_6_1_offset.h | 2 + .../amd/include/asic_reg/nbio/nbio_6_1_sh_mask.h | 4 + .../drm/amd/include/asic_reg/nbio/nbio_6_1_smn.h | 58 + .../drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h | 54 + .../drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h | 53 + .../amd/include/asic_reg/nbio/nbio_7_4_offset.h | 2 + .../amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h | 3 + .../amd/include/asic_reg/thm/thm_11_0_2_offset.h | 3 + drivers/gpu/drm/amd/include/atombios.h | 2 +- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 53 - drivers/gpu/drm/amd/include/kgd_pp_interface.h | 21 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 96 + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/common_baco.c | 101 + .../hwmgr/common_baco.h} | 39 +- .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 9 - drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 34 +- drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 14 +- drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.h | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 8 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.c | 136 + .../hwmgr/vega10_baco.h} | 22 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 201 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 1 + .../gpu/drm/amd/powerplay/hwmgr/vega10_pptable.h | 24 + .../amd/powerplay/hwmgr/vega10_processpptables.c | 72 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 37 + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h | 1 + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 219 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 81 + .../hwmgr/vega20_baco.h} | 18 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 398 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h | 3 + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_inc.h | 1 + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 1 - drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 14 +- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 11 +- drivers/gpu/drm/radeon/ci_dpm.c | 5 +- drivers/gpu/drm/radeon/si_dpm.c | 5 +- drivers/gpu/drm/scheduler/sched_main.c | 219 +- drivers/gpu/drm/ttm/ttm_bo.c | 11 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 19 +- drivers/gpu/drm/v3d/v3d_sched.c | 13 +- include/drm/gpu_scheduler.h | 13 +- include/drm/ttm/ttm_bo_driver.h | 9 + 253 files changed, 6565 insertions(+), 18723 deletions(-) delete mode 100644 drivers/gpu/drm/amd/amdgpu/ci_dpm.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/ci_dpm.h delete mode 100644 drivers/gpu/drm/amd/amdgpu/ci_smc.c create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/Makefile delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce100/i2caux_dce100.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce100/i2caux_dce100.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/aux_engine_dce110.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/aux_engine_dce110.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_hw_engine_dce110.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_hw_engine_dce110.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_sw_engine_dce110.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2caux_dce110.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2caux_dce110.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce112/i2caux_dce112.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce112/i2caux_dce112.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce120/i2caux_dce120.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2c_hw_engine_dce80.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2c_hw_engine_dce80.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2c_sw_engine_dce80.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2caux_dce80.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/diagnostics/i2caux_diag.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/diagnostics/i2caux_diag.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/engine.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_generic_hw_engine.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_generic_hw_engine.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.h delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2caux.h rename drivers/gpu/drm/amd/display/dc/{i2caux/engine_base.c => inc/hw/vmid.h} (63%) rename drivers/gpu/drm/amd/display/dc/{i2caux/dce110/i2c_sw_engine_dce110.h => inc/vm_helper.h} (65%) create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_1_smn.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/common_baco.c rename drivers/gpu/drm/amd/{display/dc/i2caux/dce80/i2c_sw_engine_dce80.h => powerplay/hwmgr/common_baco.h} (65%) create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.c rename drivers/gpu/drm/amd/{display/dc/i2caux/dce80/i2caux_dce80.h => powerplay/hwmgr/vega10_baco.h} (74%) create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c rename drivers/gpu/drm/amd/{display/dc/i2caux/dce120/i2caux_dce120.h => powerplay/hwmgr/vega20_baco.h} (73%)