Hi Dave, Last pull for 4.17. Highlights: - Vega12 support - A few more bug fixes and cleanups for powerplay The following changes since commit 6da2b9332c572fcda94de9631f8fa514f574388a: amdgpu/dm: Default PRE_VEGA ASIC support to 'y' (2018-03-16 16:16:50 -0500) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-4.17 for you to fetch changes up to 09695ad78f1f5f315c7e9c5090f0c7b846a43690: drm/amd/pp: clean header file hwmgr.h (2018-03-23 09:42:42 -0500) ---------------------------------------------------------------- Alex Deucher (23): drm/amdgpu: add VCN to firmware query interface drm/amdgpu: add documentation for amdgpu_device.c drm/amdgpu: add gpu_info firmware for vega12 drm/amdgpu: set asic family and ip blocks for vega12 drm/amdgpu/psp: initial vega12 support drm/amdgpu: specify vega12 uvd firmware drm/amdgpu: specify vega12 vce firmware drm/amdgpu/virtual_dce: add vega12 support drm/amd/display/dm: add vega12 support drm/amdgpu: add vega12 to dc support check drm/amdgpu/gmc9: add vega12 support (v2) drm/amdgpu/mmhub: add clockgating support for vega12 drm/amdgpu/sdma4: specify vega12 firmware drm/amdgpu/sdma4: Add placeholder for vega12 golden settings drm/amdgpu/sdma4: add clockgating support for vega12 drm/amdgpu/gfx9: add support for vega12 firmware drm/amdgpu/gfx9: Add placeholder for vega12 golden settings drm/amdgpu/gfx9: add gfx config for vega12 drm/amdgpu/gfx9: add support for vega12 drm/amdgpu/gfx9: add clockgating support for vega12 drm/amdgpu/soc15: add support for vega12 drm/amdgpu: add vega12 pci ids (v2) drm/amdgpu: Add an ATPX quirk for hybrid laptop Andrey Grodzovsky (2): drm/amd/powerplay: Fix NULL pointer deref on driver unbind. drm/amdgpu: Fix NULL ptr on driver unload due to init failure. Christian König (1): drm/amdgpu: fix "mitigate workaround for i915" Chunming Zhou (1): drm/amdgpu: Don't change preferred domian when fallback GTT v5 Colin Ian King (2): drm/amdgpu: fix spelling mistake: "asssert" -> "assert" drm/amd/pp: use mlck_table.count for array loop index limit Evan Quan (12): drm/amdgpu: initilize vega12 psp firmwares drm/amdgpu/soc15: update vega12 cg_flags drm/amd/powerplay: add vega12_inc.h drm/amd/powerplay: update atomfirmware.h (v2) drm/amd/powerplay: add new smu9_driver_if.h for vega12 (v2) drm/amd/powerplay: add vega12_ppsmc.h drm/amd/powerplay: add vega12_pptable.h drm/amd/powerplay: update ppatomfwctl (v2) drm/amd/powerplay: add new pp_psm infrastructure for vega12 (v2) drm/amd/powerplay: add the smu manager for vega12 (v4) drm/amd/powerplay: add the hw manager for vega12 (v4) drm/amdgpu: no job timeout setting on compute queues Feifei Xu (5): drm/amd/include: Add ip header files for vega12. drm/amdgpu: add vega12 to asic_type enum drm/amdgpu: add vega12 ucode loading method drm/amdgpu/sdma4: Update vega12 sdma golden setting. drm/amd/soc15: Add external_rev_id for vega12. Hawking Zhang (5): drm/amdgpu/nbio6: Correct PCIE_INDEX/DATA pair used for smn register accessing drm/amdgpu: vega12 to smu firmware drm/amdgpu/sdma4: add sdma4_0_1 support for vega12 (v3) drm/amdgpu/gfx9: add golden setting for vega12 (v3) drm/amdgpu/soc15: initialize reg base for vega12 Jerry (Fangzhi) Zuo (1): drm/amd/display: Add bios firmware info version for VG12 Kenneth Feng (2): drm/amd/powerplay: Remove the SOC floor voltage setting drm/amd/powerplay: Return per DPM level clock Mikita Lipski (3): drm/amdgpu: Use atomic function to disable crtcs with dc enabled drm/amdgpu: Disable irq on device before destroying it drm/amdgpu - Disable all irqs before disabling all CRTCs Rex Zhu (19): drm/amdgpu: Delete dead code when early init drm/amd/pp: Remove dead functions in vega10_smumgr.c drm/amd/pp: Mark bunches of functins in vega10_smumgr.c static drm/amd/pp: Move functions to smu backend table for vega10 drm/amd/pp: Clean up header file for Vega10 drm/amd/pp: Delete get_xclk function in powerplay (v2) drm/amd/pp: Remove unneeded void * casts for Vega10 drm/amdgpu: Fix kernel NULL pointer dereference when amdgpu fini drm/amdgpu: Fix kernel NULL pointer dereference in dpm functions drm/amd/pp: Fix gfx ring test failed on Fiji without hw avfs support drm/amd/pp: Fix unable to handle kernel paging request when set pp table drm/amdgpu: Remove wrapper layer of cgs irq handling drm/amd/pp: Refine register_thermal_interrupt function drm/amd/pp: Add smu irq handlers in sw_init instand of hw_init drm/amd/pp: Fix set wrong temperature range on smu7 drm/amd/pp: Add smu irq handlers for legacy asics drm/amd/pp: Clean up powerplay code on Vega12 drm/amd/pp: Add new asic support in pp_psm.c drm/amd/pp: clean header file hwmgr.h Tom St Denis (1): drm/amd/amdgpu: fix offset into page with amdgpu_iomem debugfs file drivers/gpu/drm/amd/acp/include/acp_gfx_if.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 119 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 467 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 12 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 9 +- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 1 + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 65 + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 1 + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 2 +- drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 4 +- drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 5 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 25 +- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 1 + drivers/gpu/drm/amd/amdgpu/soc15.c | 30 +- drivers/gpu/drm/amd/amdgpu/vi.c | 5 - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 + drivers/gpu/drm/amd/display/dc/os_types.h | 2 +- .../drm/amd/include/asic_reg/gc/gc_9_2_1_offset.h | 7497 +++++ .../drm/amd/include/asic_reg/gc/gc_9_2_1_sh_mask.h | 31160 +++++++++++++++++++ .../include/asic_reg/mmhub/mmhub_9_3_0_offset.h | 1991 ++ .../include/asic_reg/mmhub/mmhub_9_3_0_sh_mask.h | 10265 ++++++ .../amd/include/asic_reg/oss/osssys_4_0_1_offset.h | 337 + .../include/asic_reg/oss/osssys_4_0_1_sh_mask.h | 1249 + drivers/gpu/drm/amd/include/atomfirmware.h | 82 +- drivers/gpu/drm/amd/include/cgs_common.h | 2 - drivers/gpu/drm/amd/include/cgs_linux.h | 119 - drivers/gpu/drm/amd/include/dm_pp_interface.h | 2 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 12 +- drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 2 + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 6 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 54 +- drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 46 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 87 + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 65 + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 80 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 1 - drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 6 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 74 + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h | 9 + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 266 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 2 + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 16 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 26 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 2090 ++ drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 438 + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_inc.h | 39 + .../gpu/drm/amd/powerplay/hwmgr/vega12_powertune.c | 1364 + .../gpu/drm/amd/powerplay/hwmgr/vega12_powertune.h | 53 + .../gpu/drm/amd/powerplay/hwmgr/vega12_pptable.h | 109 + .../amd/powerplay/hwmgr/vega12_processpptables.c | 430 + .../amd/powerplay/hwmgr/vega12_processpptables.h | 58 + .../gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 324 + .../gpu/drm/amd/powerplay/hwmgr/vega12_thermal.h | 66 + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 16 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 44 +- drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 8 + .../drm/amd/powerplay/inc/vega12/smu9_driver_if.h | 758 + drivers/gpu/drm/amd/powerplay/inc/vega12_ppsmc.h | 123 + drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 3 +- drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 5 +- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 2 +- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 12 +- drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 4 +- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 1 + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 2 +- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 116 +- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h | 24 +- .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 561 + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.h | 62 + include/drm/amd_asic_type.h | 1 + include/uapi/drm/amdgpu_drm.h | 2 + 88 files changed, 60267 insertions(+), 737 deletions(-) create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_2_1_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_2_1_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_3_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_3_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_0_1_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_0_1_sh_mask.h delete mode 100644 drivers/gpu/drm/amd/include/cgs_linux.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_inc.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_powertune.c create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_powertune.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_pptable.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_processpptables.c create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_processpptables.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_thermal.h create mode 100644 drivers/gpu/drm/amd/powerplay/inc/vega12/smu9_driver_if.h create mode 100644 drivers/gpu/drm/amd/powerplay/inc/vega12_ppsmc.h create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.h _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel