Hi Dave, This is the main feature pull for radeon and amdgpu for 4.11. Highlights: - Power and clockgating improvements - Preliminary SR-IOV support - ttm buffer priority support - ttm eviction fixes - Removal of the ttm lru callbacks - Remove SI DPM quirks due to MC firmware issues - Handle VFCT with multiple vbioses - Powerplay improvements - Lots of driver cleanups The following changes since commit a5b2b6ebf34b20e70a2bdb5214c371744e7fa260: drm/sti: Fix compilation failure for drm_framebuffer.pixel_format (2017-01-27 12:54:15 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-4.11 for you to fetch changes up to 268c3001842cb179b54a2825dad9b70151bf4de6: drm/amdgpu: fix amdgpu_bo_va_mapping flags (2017-01-27 12:20:45 -0500) ---------------------------------------------------------------- Alex Deucher (7): drm/amdgpu: use the num_rings variable for checking vce rings drm/amdgpu: drop pitcairn dpm quirks drm/radeon: drop pitcairn dpm quirks drm/amdgpu: remove unused header si_reg.h drm/amdgpu: move misc si headers into amdgpu drm/radeon: handle vfct with multiple vbios images drm/amdgpu: handle vfct with multiple vbios images Amber Lin (1): drm/amdgpu: PCI I/O bar can be disabled Andrey Grodzovsky (2): drm/amdgpu: Switch error code when bo pin fails. (v3) drm/amdgpu: Refactor flip into prepare submit and submit. (v3) Arindam Nath (1): drm/amd/amdgpu: get maximum and used UVD handles (v4) Arvind Yadav (2): drm/amd/amdgpu/amdgpu_ttm: Handle return NULL error from ioremap_nocache drm: radeon: radeon_ttm: Handle return NULL error from ioremap_nocache Christian König (9): drm/ttm: remove allow_errors parameter from ttm_bo_force_list_clean drm/ttm: add BO priorities for the LRUs drm/amdgpu: user BO priority instead of self coding it (v2) drm/amdgpu: double the priority of kernel allocations drm/ttm: revert "implement LRU add callbacks v2" drm/ttm: revert "add optional LRU removal callback v2" drm/amdgpu: access stolen VRAM directly on KV/KB (v2) drm/amdgpu: access stolen VRAM directly on CZ (v2) drm/amdgpu: fix amdgpu_bo_va_mapping flags Harry Wentland (2): drm/amd/amdgpu: Add HDMI_DATA_SCRAMBLE register definition drm/amd/amdgpu: Add DPHY_SCRAM_CNTL register defines Huang Rui (20): drm/amd/powerplay: add callbacks to move smc firmware request into sw_init phase drm/amd/powerplay: add request_firmware/release_firmware for smu7 drm/amd/powerplay: fix request smc_sk firmware case drm/amdgpu: cleanup useless smu_ucode_xfer_vi.h drm/amdgpu: cleanup useless extern functions drm/amd/powerplay: add prefix for all powerplay pr_* prints drm/amd/powerplay: reshuffle headers to make pr_fmt macro before <linux/xxx.h> drm/amd/powerplay: refine print message for amd_powerplay drm/amd/powerplay: update all printk to pr_* on eventmgr drm/amd/powerplay: update all printk to pr_* on hwmgr drm/amd/powerplay: update all printk to pr_* on smumgr drm/amdgpu: introduce an interface to get clock gating status dynamically drm/amdgpu: add parse clock gating state drm/amdgpu: add get clockgating_state method for gfx v8 drm/amdgpu: add get clockgating_state method for gmc v8 drm/amdgpu: add get clockgating_state method for sdma v3 drm/amdgpu: add get clockgating_state method for vi common drm/amdgpu: add get clockgating_state method for uvd v5&v6 drm/amdgpu: add get clockgating_state method for vce v3 drm/amdgpu: fix typo of CGTS Julia Lawall (1): drm/amdgpu/gfx8: fix bugon.cocci warnings Junwei Zhang (1): drm/amd/amdgpu: remove the uncessary parameter for ib scheduler Kees Cook (1): drm/amdgpu: use designated initializers Ken Xue (1): drm/amdgpu: Refine the way to get atom bios Monk Liu (11): drm/amdgpu:new field members for SRIOV drm/amdgpu:add new file for SRIOV drm/amdgpu:invoke CSA functions (v2) drm/amdgpu:add META_DATA struct for CSA/SRIOV v2 drm/amdgpu:implement ring_write_multiple drm/amdgpu:implement CE/DE meta-init routines drm/amdgpu:introduce new flag to identify VM domain for cntx_ctrl drm/amdgpu:in cntx_ctrl we need insert meta-init for CE/DE(V2) drm/amdgpu:set cond_exec polling value to 1 in ring_init drm/amdgpu:Preamble is forbid to be ignored in SRIOV drm/amdgpu:insert switch buffer only for VM submit Nicolai Hähnle (7): drm/ttm: add evict parameter to ttm_bo_driver::move_notify drm/amd/amdgpu: move eviction counting to amdgpu_bo_move_notify drm/amd/amdgpu: add amdgpu_bo_gpu_accessible helper function drm/amd/amdgpu: add check that shadow page directory is GPU-accessible drm/amd/amdgpu: add check that shadow page tables are GPU-accessible drm/amd/amdgpu: lock reservation object while creating shadow bo drm/amd/amdgpu: fix locking in bo creation error path Nicolas Iooss (1): drm/amd/powerplay: fix misspelling in header guard Nils Holland (1): drm/amdgpu: Bring bo creation in line with radeon driver (v2) Nils Wallménius (2): drm/amdgpu: Remove checking for atombios drm/amdgpu: simplify allocation of scratch regs Rex Zhu (30): drm/amd/powerplay: move vi smu firmware declares to powerplay. drm/amdgpu: add cgs interface for enter/exit rlc safe mode. drm/amdgpu: add drm light sleep support for Vi drm/amdgpu: refine gfx_v8 pg code. drm/amd/powerplay: delete dpm code for Cz/St. drm/amd/powerplay: Unify dpm level defines drm/amd/powerplay: fix bug dpm level unexpectly be reset to auto. drm/amd/powerplay: refine code in cz_smumgr.c drm/amd/powerplay: fix issue can't load another smu firmware. drm/amdgpu: delete dead module parameter:amdgpu_powerplay. drm/amdgpu: delete dead definitions of dpm_ip_funcs drm/amd/powerplay: add profiling mode in dpm level drm/amdgpu: use same enter/exit safe mode for gfx_8. drm/amd/powerplay: refine powerplay interface. drm/amd/powerplay: not use module parameter in powerplay. drm/amd/powerplay: not free hwmgr/smumgr in asic private functions. drm/amd/powerplay: fix memory leak in cz_hwmgr.c drm/amd/powerplay: fix memory leak in smu7_hwmgr drm/amd/powerplay: refine smumgr code drm/amd/powerplay: change function name to make code more readable drm/amdgpu: fix bug return invalid value to sysfs. drm/amd/powerplay: Configuring DIDT blocks only SQ enabled on Polaris11. drm/amd/powerplay: add new smu message. drm/amd/powerplay: refine DIDT feature in Powerplay. drm/amdgpu: extend profiling mode. drm/amdgpu: refine vce3.0 initialize. drm/amdgpu: refine ci uvd dpm code. drm/amd/powerplay: fix regresstion issue can't set manual dpm mode. drm/amdgpu: fix dpm bug on Kv. drm/amdgpu: fix kernel panic when dpm disabled on Kv. Tom St Denis (3): drm/amd/amdgpu: De-numberify golden SI registers drm/amd/amdgpu: Widen mmio trace register address width drm/amd/amdgpu: Add PCI info to gca_config debugfs Xiangliang Yu (16): drm/amdgpu/gfx8: add support kernel interface queue(KIQ) drm/amdgpu/virt: rename fieldes of virtualization structure drm/amdgpu/vi: move virtualization detection forward drm/amdgpu: remove detect_hw_virtualization interface drm/amdgpu/ring: add two interfaces to support r/w registers with kiq drm/amdgpu/gfx8: implement emit_rreg/wreg function drm/amdgpu/virt: add runtime flag drm/amdgpu/virt: use kiq to access registers (v2) drm/amdgpu/virt: add high level interfaces for virt drm/amdgpu/virt: implement VI virt operation interfaces drm/amdgpu: request/release full gpu access if device is vf drm/amdgpu/vi: add support virtualization drm/amdgpu/virt: enable virtual display drm/amdgpu: do not reset gpu for virtualization drm/amdgpu: fix reboot failure issue for virtualization drm/amdgpu/vi: fix mailbox irq mistake Yintian Tao (1): drm/amdgpu: add new virtual display ID drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 65 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 227 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 106 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 76 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 147 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 19 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 - drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 20 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 41 + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 15 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 42 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 99 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 116 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 75 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 12 - drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 27 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 222 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 50 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 +- drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 6 - drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 35 +- drivers/gpu/drm/amd/amdgpu/cik.c | 5 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 2 +- .../asic_reg/si => amdgpu}/clearstate_si.h | 0 drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 2320 -------------------- drivers/gpu/drm/amd/amdgpu/cz_dpm.h | 239 -- drivers/gpu/drm/amd/amdgpu/cz_smc.c | 995 --------- drivers/gpu/drm/amd/amdgpu/cz_smumgr.h | 94 - drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 11 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 890 +++++++- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 25 +- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 66 +- drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 592 +++++ drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 55 + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 19 +- drivers/gpu/drm/amd/amdgpu/si.c | 982 +++++---- drivers/gpu/drm/amd/amdgpu/si_dma.c | 4 +- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 67 +- drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/si_smc.c | 2 +- .../drm/amd/{include/asic_reg/si => amdgpu}/sid.h | 0 drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h | 101 - drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 33 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 33 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 61 +- drivers/gpu/drm/amd/amdgpu/vi.c | 156 +- drivers/gpu/drm/amd/amdgpu/vi.h | 112 + drivers/gpu/drm/amd/amdgpu/vi_dpm.h | 4 - drivers/gpu/drm/amd/amdgpu/vid.h | 2 + drivers/gpu/drm/amd/include/amd_shared.h | 14 + .../gpu/drm/amd/include/asic_reg/dce/dce_10_0_d.h | 8 + .../amd/include/asic_reg/dce/dce_10_0_sh_mask.h | 4 + .../gpu/drm/amd/include/asic_reg/dce/dce_11_0_d.h | 9 + .../amd/include/asic_reg/dce/dce_11_0_sh_mask.h | 6 + .../gpu/drm/amd/include/asic_reg/dce/dce_11_2_d.h | 9 + .../amd/include/asic_reg/dce/dce_11_2_sh_mask.h | 6 + .../gpu/drm/amd/include/asic_reg/dce/dce_8_0_d.h | 8 + .../drm/amd/include/asic_reg/dce/dce_8_0_sh_mask.h | 4 + drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h | 105 - drivers/gpu/drm/amd/include/cgs_common.h | 7 + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 741 ++++--- drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c | 2 +- drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c | 9 +- .../gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 5 +- .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 12 +- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 99 +- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h | 1 - .../gpu/drm/amd/powerplay/hwmgr/functiontables.c | 14 +- .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 175 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 8 +- .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 6 +- .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 2 +- .../amd/powerplay/hwmgr/smu7_clockpowergating.h | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 214 +- .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 228 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 28 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h | 1 + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 20 +- drivers/gpu/drm/amd/powerplay/inc/eventmgr.h | 3 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 21 +- drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 10 +- drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 5 + drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h | 3 + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 19 +- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 181 +- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.h | 4 - drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 6 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 44 +- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 10 +- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 32 +- .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 6 +- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 36 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 14 +- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 39 +- drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 16 +- .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 32 +- drivers/gpu/drm/ast/ast_ttm.c | 2 - drivers/gpu/drm/bochs/bochs_mm.c | 2 - drivers/gpu/drm/cirrus/cirrus_ttm.c | 2 - drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 - drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 - drivers/gpu/drm/nouveau/nouveau_bo.c | 5 +- drivers/gpu/drm/qxl/qxl_ttm.c | 3 +- drivers/gpu/drm/radeon/radeon_bios.c | 66 +- drivers/gpu/drm/radeon/radeon_object.c | 1 + drivers/gpu/drm/radeon/radeon_object.h | 1 + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- drivers/gpu/drm/radeon/si_dpm.c | 47 +- drivers/gpu/drm/ttm/ttm_bo.c | 123 +- drivers/gpu/drm/virtio/virtgpu_ttm.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 3 +- include/drm/ttm/ttm_bo_api.h | 2 + include/drm/ttm/ttm_bo_driver.h | 31 +- include/uapi/drm/amdgpu_drm.h | 9 + 134 files changed, 4838 insertions(+), 6122 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c rename drivers/gpu/drm/amd/{include/asic_reg/si => amdgpu}/clearstate_si.h (100%) delete mode 100644 drivers/gpu/drm/amd/amdgpu/cz_dpm.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/cz_dpm.h delete mode 100644 drivers/gpu/drm/amd/amdgpu/cz_smc.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/cz_smumgr.h create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h rename drivers/gpu/drm/amd/{include/asic_reg/si => amdgpu}/sid.h (100%) delete mode 100644 drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel