[pull] radeon, amdgpu, amd ttm drm-next-4.17
Alex Deucher
alexdeucher at gmail.com
Fri Mar 16 21:38:00 UTC 2018
Hi Dave,
Updates for 4.17. Highlights:
- Continued cleanup and restructuring of powerplay
- Fetch VRAM type from vbios rather than hardcoding for SOC15 asics
- Allow ttm to drop its backing store when drivers don't need it
- DC bandwidth calc updates
- Enable DC backlight control pre-DCE11 asics
- Enable DC on all supported asics
- DC Fixes for planes due to the way our hw is ordered vs what drm expects
- DC CTM/regamma fixes
- Misc cleanup and bug fixes
The following changes since commit 963976cfe9c54d4d9e725e61c90c47a4af6b5ea2:
Merge tag 'drm-intel-next-2018-03-08' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2018-03-14 14:53:01 +1000)
are available in the git repository at:
git://people.freedesktop.org/~agd5f/linux drm-next-4.17
for you to fetch changes up to 6da2b9332c572fcda94de9631f8fa514f574388a:
amdgpu/dm: Default PRE_VEGA ASIC support to 'y' (2018-03-16 16:16:50 -0500)
----------------------------------------------------------------
Alex Deucher (9):
drm/amdgpu: save/restore backlight level in legacy dce code
drm/amdgpu/psp: add a few more fw load type checks
drm/amdgpu: move firmware loading type setup to common code
drm/amdgpu: use adev->firmware to determine whether to load the PSP module
drm/amdgpu/soc15: always load the psp module
drm/amdgpu: move getting pcie info to common code
drm/amdgpu/powerplay/vega10: fix memory leak in error path
drm/amdgpu: remove trailing whitespace from soc15ip.h
drm/amdgpu/sdma4: use num_instances for clock/powergating config
Andrey Grodzovsky (2):
drm/amd/powerplay: Fix KASAN user after free on driver unload.
drm/amdgpu: Improve documentation of bo_ptr in amdgpu_bo_create_kernel
Anthony Koo (2):
drm/amd/display: Implement stats logging
drm/amd/display: Add variable refresh rate parameters to DC structures
Bhawanpreet Lakha (3):
drm/amd/display: Fix takover from VGA mode
drm/amd/display: Move DTRACE and dml_print defines
drm/amd/display: Use MACROS instead of dm_logger
Christian König (11):
drm/ttm: move ttm_tt defines into ttm_tt.h
drm/ttm: add ttm_sg_tt_init
drm/amdgpu: stop allocating a page array for prime shared BOs
drm/ttm: add ttm_bo_pipeline_gutting
drm/ttm: add bo as parameter to the ttm_tt_create callback
drm/ttm: move initializing ttm->sg into ttm_tt_init_fields
drm/amdgpu: drop the backing store when DMA-buf imports are evicted
drm/amdgpu: initial validate the prime BOs into the CPU domain
drm/amdgpu: explicit give BO type to amdgpu_bo_create
drm/amdgpu: fix prime teardown order
drm/radeon: fix prime teardown order
Clark Zheng (1):
drm/amd/display: Refine disable VGA
Colin Ian King (1):
drm/amd/pp: remove redundant pointer internal_buf
Dmytro Laktyushkin (2):
drm/amd/display: update dce_calcs to latest version
drm/amd/display: clean up dcn pplib notification call
Emily Deng (2):
drm/amdgpu: Correct the place of amdgpu_pm_sysfs_fini
drm/amdgpu: Correct the amdgpu_ucode_fini_bo place for Tonga
Eric Yang (2):
drm/amd/display: fix check condition for edp power control
drm/amd/display: early return if not in vga mode in disable_vga
Feifei Xu (1):
drm/amdgpu/sdma4: Remove unused header file from sdma_v4_0.c
Harry Wentland (3):
drm/amdgpu: Remove some unused elements from amdgpu_connector struct
drm/amd/display: Check for HW blocks in HWSS, rather than DC core for cursor
amdgpu/dm: Default PRE_VEGA ASIC support to 'y'
Hawking Zhang (1):
drm/amdgpu: query vram type from atombios
Jerry (Fangzhi) Zuo (2):
drm/amd/display: Allow passing of syspll id to get_smu_clock_info
drm/amd/display: Use actual TG instance instead of pipe instance
Krunoslav Kovac (1):
drm/amd/display: use HW hdr mult for brightness boost
Leo (Sunpeng) Li (3):
drm/amd/display: Fix memleaks when atomic check fails.
drm/amd/display: Use correct error codes
drm/amd/display: Convert CTM to 2's complement
Michel Dänzer (2):
drm/amdgpu/dce: Don't turn off DP sink when disconnected
drm/radeon: Don't turn off DP sink when disconnected
Mikita Lipski (1):
drm/amd/display: Enable backlight support for pre-DCE11 ASICs
Monk Liu (2):
drm/amdgpu: implement mmio byte access helper for MB
drm/amdgpu: refactoring mailbox to fix TDR handshake bugs(v2)
Oak Zeng (1):
drm/amdgpu: Move IH clientid defs to separate file
Rex Zhu (23):
drm/amd/pp: Simplified the avfs btc state on smu7
drm/amd/pp: Fix memory leak in error path in smumgr
drm/amd/pp: Clean up header file include
drm/amd/pp: Delete is_smc_ram_running function on RV
drm/amd/pp: Remove meanless return value check in RV
drm/amd/pp: Add rv_read_arg_from_smc to smu backend function table
drm/amd/pp: Mark internal functions as static in rv_smumgr.c
drm/amd/pp: Add new smu backend function smc_table_manager
drm/amd/pp: Add rv_copy_table_from/to_smc to smu backend function table
drm/amd/pp: Fix function parameter not correct
drm/amd/pp: Replace rv_* with smu10_*
drm/amd/pp: Move helper functions to smu_help.c
drm/amdgpu: Plus NULL function pointer check
drm/amdgpu: Don't compared ip_block_type with ip_block_index
drm/amdgpu: Remove wrapper layer of smu ip functions
drm/amdgpu: Call amdgpu_ucode_fini_bo in amd_powerplay.c
drm/amd/pp: Delete dead code on cz_clockpowergating.c
drm/amd/pp: Remove dead header file pp_asicblocks.h
drm/amd/pp: Mv cz uvd/vce pg/dpm functions to cz_hwmgr.c
drm/amd/pp: Remove unneeded void * casts in cz_hwmgr.c/cz_smumgr.c
drm/amd/pp: Replace function/struct name cz_* with smu8_*
drm/amd/pp: Rename file name cz_* to smu8_*
drm/amd/pp: Remove the cgs wrapper for notify smu version on APU
Samson Tam (1):
drm/amd/display: add support for regkey "LCDFreeSyncDefault"
Shirish S (3):
drm/amd/display: Correct the plane enumeration order (v2)
drm/amd/display: Check msg->size before starting aux transfer
drm/amd/display: fix dereferencing possible ERR_PTR()
SivapiriyanKumarasamy (3):
drm/amd/display: Vari-bright looks disabled near end of MM14
drm/amd/display: Varibright fix bug and review comments
drm/amd/display: Varibright add null check
Tom St Denis (1):
drm/amd/amdgpu: Add missing "DDR4" label
Tony Cheng (1):
drm/amd/display: dal 3.1.38
Vitaly Prosyak (1):
drm/amd/display: Fix handling of linear transfer function
Yongqiang Sun (4):
drm/amd/display: Remove 300Mhz minimum disp clk limit.
drm/amd/display: Modified set bandwidth sequence.
drm/amd/display: Set disp clk in a safe way to avoid over high dpp clk. (v2)
drm/amd/display: Fixed dim around 1sec when resume from S3 (v2)
drivers/gpu/drm/amd/amdgpu/Makefile | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 12 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 95 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 5 -
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 31 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 45 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 9 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 43 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 30 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 59 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 11 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 288 ------
drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 9 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 9 +
drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 11 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 28 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 +-
drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 4 +-
drivers/gpu/drm/amd/amdgpu/atombios_encoders.h | 5 +
drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 16 +-
drivers/gpu/drm/amd/amdgpu/cik.c | 19 +-
drivers/gpu/drm/amd/amdgpu/cik_dpm.h | 7 +-
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 8 +
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 8 +
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 8 +
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 8 +
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 8 +-
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 +-
drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 16 +-
drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 200 +++--
drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 7 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 18 +-
drivers/gpu/drm/amd/amdgpu/si.c | 8 +-
drivers/gpu/drm/amd/amdgpu/si_dpm.c | 16 +-
drivers/gpu/drm/amd/amdgpu/si_dpm.h | 3 +-
drivers/gpu/drm/amd/amdgpu/soc15.c | 12 +-
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +-
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/vega10_ih.c | 4 +-
drivers/gpu/drm/amd/amdgpu/vi.c | 18 +-
drivers/gpu/drm/amd/display/Kconfig | 2 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 123 ++-
.../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 15 +-
.../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 +
drivers/gpu/drm/amd/display/dc/basics/logger.c | 3 +-
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 6 +-
.../gpu/drm/amd/display/dc/bios/command_table2.c | 5 +-
.../gpu/drm/amd/display/dc/bios/command_table2.h | 2 +-
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 160 ++--
drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 23 +-
drivers/gpu/drm/amd/display/dc/core/dc.c | 20 +-
drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 32 +-
drivers/gpu/drm/amd/display/dc/core/dc_link.c | 7 +
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 5 +
drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 3 +-
drivers/gpu/drm/amd/display/dc/dc.h | 9 +-
drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 12 +-
drivers/gpu/drm/amd/display/dc/dc_stream.h | 7 +
drivers/gpu/drm/amd/display/dc/dc_types.h | 18 +
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 35 +
drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 10 +-
drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 24 +-
.../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 3 +-
.../drm/amd/display/dc/dce100/dce100_resource.c | 50 ++
.../amd/display/dc/dce110/dce110_hw_sequencer.c | 28 +-
.../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 87 ++
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 1 +
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 16 +-
.../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 9 +
.../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 261 ++++--
.../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 7 +-
.../amd/display/dc/dml/display_rq_dlg_helpers.c | 1 +
.../gpu/drm/amd/display/dc/dml/dml_common_defs.h | 2 -
.../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 1 +
.../dc/dml/dml_logger.h} | 17 +-
drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +
drivers/gpu/drm/amd/display/dc/inc/dce_calcs.h | 6 +
drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 3 +
drivers/gpu/drm/amd/display/include/logger_types.h | 1 +
.../drm/amd/display/modules/color/color_gamma.c | 6 +-
.../drm/amd/display/modules/freesync/freesync.c | 155 +++-
.../gpu/drm/amd/display/modules/inc/mod_freesync.h | 9 +
.../modules/inc/mod_stats.h} | 56 +-
drivers/gpu/drm/amd/display/modules/stats/stats.c | 334 +++++++
drivers/gpu/drm/amd/include/kgd_pp_interface.h | 3 +-
drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 70 ++
drivers/gpu/drm/amd/include/vega10_ip_offset.h | 286 +++---
drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 617 ++++++-------
drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 8 +-
.../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 209 -----
.../drm/amd/powerplay/hwmgr/cz_clockpowergating.h | 36 -
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 577 +-----------
.../powerplay/hwmgr/{rv_hwmgr.c => smu10_hwmgr.c} | 547 ++++++-----
.../powerplay/hwmgr/{rv_hwmgr.h => smu10_hwmgr.h} | 130 +--
.../amd/powerplay/hwmgr/{rv_inc.h => smu10_inc.h} | 4 +-
.../amd/powerplay/hwmgr/smu7_clockpowergating.h | 1 -
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 14 +-
.../powerplay/hwmgr/{cz_hwmgr.c => smu8_hwmgr.c} | 997 ++++++++++++---------
.../powerplay/hwmgr/{cz_hwmgr.h => smu8_hwmgr.h} | 79 +-
drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 536 +++++++++++
drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h | 180 ++++
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 6 +-
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 174 +---
drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 36 -
drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 28 +-
drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 4 +-
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 883 ------------------
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 74 +-
.../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 4 +-
.../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 87 +-
drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 399 ---------
.../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 344 +++++++
.../smumgr/{rv_smumgr.h => smu10_smumgr.h} | 19 +-
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 6 +-
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 7 +-
drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 891 ++++++++++++++++++
.../smumgr/{cz_smumgr.h => smu8_smumgr.h} | 82 +-
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 9 +-
.../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 4 +-
.../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 61 +-
drivers/gpu/drm/ast/ast_ttm.c | 6 +-
drivers/gpu/drm/bochs/bochs_mm.c | 5 +-
drivers/gpu/drm/cirrus/cirrus_ttm.c | 6 +-
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 5 +-
drivers/gpu/drm/mgag200/mgag200_ttm.c | 6 +-
drivers/gpu/drm/nouveau/nouveau_bo.c | 10 +-
drivers/gpu/drm/nouveau/nouveau_sgdma.c | 7 +-
drivers/gpu/drm/nouveau/nouveau_ttm.h | 4 +-
drivers/gpu/drm/qxl/qxl_ttm.c | 8 +-
drivers/gpu/drm/radeon/radeon_connectors.c | 31 +-
drivers/gpu/drm/radeon/radeon_gem.c | 2 -
drivers/gpu/drm/radeon/radeon_object.c | 2 +
drivers/gpu/drm/radeon/radeon_ttm.c | 12 +-
drivers/gpu/drm/ttm/ttm_agp_backend.c | 6 +-
drivers/gpu/drm/ttm/ttm_bo.c | 15 +-
drivers/gpu/drm/ttm/ttm_bo_util.c | 24 +
drivers/gpu/drm/ttm/ttm_tt.c | 75 +-
drivers/gpu/drm/virtio/virtgpu_ttm.c | 7 +-
drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 10 +-
drivers/staging/vboxvideo/vbox_ttm.c | 5 +-
include/drm/ttm/ttm_bo_driver.h | 252 +-----
include/drm/ttm/ttm_tt.h | 272 ++++++
include/uapi/drm/amdgpu_drm.h | 1 +
150 files changed, 5739 insertions(+), 5158 deletions(-)
delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
rename drivers/gpu/drm/amd/{amdgpu/amdgpu_powerplay.h => display/dc/dml/dml_logger.h} (80%)
rename drivers/gpu/drm/amd/{powerplay/inc/pp_asicblocks.h => display/modules/inc/mod_stats.h} (51%)
create mode 100644 drivers/gpu/drm/amd/display/modules/stats/stats.c
create mode 100644 drivers/gpu/drm/amd/include/soc15_ih_clientid.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.h
rename drivers/gpu/drm/amd/powerplay/hwmgr/{rv_hwmgr.c => smu10_hwmgr.c} (55%)
rename drivers/gpu/drm/amd/powerplay/hwmgr/{rv_hwmgr.h => smu10_hwmgr.h} (67%)
rename drivers/gpu/drm/amd/powerplay/hwmgr/{rv_inc.h => smu10_inc.h} (97%)
rename drivers/gpu/drm/amd/powerplay/hwmgr/{cz_hwmgr.c => smu8_hwmgr.c} (59%)
rename drivers/gpu/drm/amd/powerplay/hwmgr/{cz_hwmgr.h => smu8_hwmgr.h} (80%)
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_instance.h
delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c
rename drivers/gpu/drm/amd/powerplay/smumgr/{rv_smumgr.h => smu10_smumgr.h} (77%)
create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c
rename drivers/gpu/drm/amd/powerplay/smumgr/{cz_smumgr.h => smu8_smumgr.h} (52%)
create mode 100644 include/drm/ttm/ttm_tt.h
More information about the amd-gfx
mailing list