[pull] amdgpu, ttm drm-next-5.3

Hi Dave, Daniel, More new stuff for 5.3: amdgpu: - Revert timeline support until KHR is ready - Various driver reload fixes - Refactor clock handling in DC - Aux fixes for DC - Bandwidth calculation updates for DC - Fix documentation due to file rename - RAS fix - Fix race in late_init ttm: - Allow for better forward progress when there is heavy memory contention The following changes since commit 91c1ead6aee22d4595f50ba66070b94a4a8f84a9: Merge branch 'drm-next-5.3' of git://people.freedesktop.org/~agd5f/linux into drm-next (2019-05-31 10:04:39 +1000) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-5.3 for you to fetch changes up to 137a7da9255763f259351edc1a6f8d0e30ff66db: Revert "drm/amdgpu: add DRIVER_SYNCOBJ_TIMELINE to amdgpu" (2019-06-05 09:54:27 -0500) ---------------------------------------------------------------- Alex Deucher (3): drm/amdgpu: fix a race in GPU reset with IB test (v2) drm/amdgpu/display: Drop some new CONFIG_DRM_AMD_DC_DCN1_01 guards Revert "drm/amdgpu: add DRIVER_SYNCOBJ_TIMELINE to amdgpu" Anthony Koo (2): drm/amd/display: do not power on eDP power rail early drm/amd/display: fix issues with bad AUX reply on some displays Aric Cyr (2): drm/amd/display: 3.2.32 drm/amd/display: program manual trigger only for bottom most pipe Chris Park (1): drm/amd/display: Move link functions from dc to dc_link Christian König (7): drm/ttm: Make LRU removal optional v2 drm/ttm: return immediately in case of a signal drm/ttm: remove manual placement preference drm/ttm: cleanup ttm_bo_mem_space drm/ttm: immediately move BOs to the new LRU v3 drm/ttm: fix busy memory to fail other user v10 drm/ttm: fix ttm_bo_unreserve Chunming Zhou (1): drm/amd/display: use ttm_eu_reserve_buffers instead of amdgpu_bo_reserve v2 Daniel He (1): drm/amd/display: Modified AUX_DPHY_RX_CONTROL0 Emily Deng (3): drm/amdgpu:Fix the unpin warning about csb buffer drm/amdgpu/sriov: Correct some register program method drm/amdgpu/display: Fix reload driver error Eric Bernstein (1): drm/amd/display: Refactor DIO stream encoder Eric Yang (5): drm/amd/display: make clk mgr soc specific drm/amd/display: Move CLK_BASE_INNER macro drm/amd/display: move clk_mgr files to right place drm/amd/display: Fix type of pp_smu_wm_set_range struct drm/amd/display: Refactor clk_mgr functions Eryk Brol (3): drm/amd/display: Disable audio stream only if it's currently enabled drm/amd/display: Ensure DRR triggers in BP drm/amd/display: Increase Backlight Gain Step Size Gary Kattan (1): drm/amd/display: Implement CM dealpha and bias interfaces Hugo Hu (1): drm/amd/display: Don't use ROM for output TF if GAMMA_CS_TFM_1D Ilya Bakoulin (1): drm/amd/display: Add writeback_config to VBA vars Jun Lei (1): drm/amd/display: Add min_dcfclk_mhz field to bb overrides Krunoslav Kovac (2): drm/amd/display: Add GSL source select registers drm/amd/display: CS_TFM_1D only applied post EOTF Mauro Carvalho Chehab (1): gpu: amdgpu: fix broken amdgpu_dma_buf.c references Nicholas Kazlauskas (1): drm/amd/display: Reset planes for color management changes Oak Zeng (1): drm/amdkfd: Return proper error code for gws alloc API Paul Hsieh (1): drm/amd/display: disable PSR/ABM before destroy DMCU struct Su Sung Chung (2): drm/amd/display: fix calculation of total_data_read_bandwidth drm/amd/display: fix crash on setmode when mode is close to bw limit Wenjing Liu (1): drm/amd/display: assign new stream id in dc_copy_stream xinhui pan (2): drm/amdgpu: ras injection use gpu address drm/amdgpu: cancel late_init_work before gpu reset Documentation/gpu/amdgpu.rst | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 116 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 16 + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 8 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 2 +- drivers/gpu/drm/amd/display/Makefile | 1 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 66 +- drivers/gpu/drm/amd/display/dc/Makefile | 2 +- .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.h | 1 + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 57 +- drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 75 ++ drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 134 +++ .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 471 +++++++++ .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.h | 81 ++ .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 276 ++++++ .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.h | 44 + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 239 +++++ .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.h | 39 + .../amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.c | 145 +++ .../amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.h | 34 + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 262 +++++ .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.h | 31 + .../amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.c | 79 ++ .../amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.h | 29 + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 126 +++ .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.h | 32 + .../drm/amd/display/dc/clk_mgr/dcn10/rv2_clk_mgr.c | 43 + .../dcn10/rv2_clk_mgr.h} | 13 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 155 +-- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 128 ++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 12 + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 5 +- drivers/gpu/drm/amd/display/dc/dc.h | 5 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 - drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 13 +- drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 1031 -------------------- .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 1 + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 2 + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 13 - .../amd/display/dc/dce100/dce100_hw_sequencer.c | 9 +- .../drm/amd/display/dc/dce100/dce100_resource.c | 28 - .../amd/display/dc/dce110/dce110_hw_sequencer.c | 23 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 27 - .../drm/amd/display/dc/dce112/dce112_resource.c | 28 - .../drm/amd/display/dc/dce120/dce120_resource.c | 20 +- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 47 - drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c | 355 ------- .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 31 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 30 +- .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 32 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 39 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 33 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 21 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 17 + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 31 +- .../drm/amd/display/dc/dml/display_mode_enums.h | 6 + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 - drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw/audio.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 33 +- .../dce_clk_mgr.h => inc/hw/clk_mgr_internal.h} | 159 ++- drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 17 + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 13 + .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 11 +- .../drm/amd/display/modules/color/color_gamma.c | 6 +- drivers/gpu/drm/qxl/qxl_release.c | 2 +- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/ttm/ttm_bo.c | 270 +++-- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 20 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 2 +- include/drm/ttm/ttm_bo_driver.h | 9 +- include/drm/ttm/ttm_execbuf_util.h | 3 +- 93 files changed, 3080 insertions(+), 2117 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.h create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.h create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.h create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.h create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.h create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.h create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.h create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv2_clk_mgr.c rename drivers/gpu/drm/amd/display/dc/{dcn10/dcn10_clk_mgr.h => clk_mgr/dcn10/rv2_clk_mgr.h} (82%) delete mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c rename drivers/gpu/drm/amd/display/dc/{dce/dce_clk_mgr.h => inc/hw/clk_mgr_internal.h} (60%)