Hi Dave, Daniel, Fixes for 5.3. Mostly fixes for Navi10 and a few other odds and ends. Also contains a patch to ease the merge with hmm. Trivial merge fix when the trees are merged: diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -783,7 +783,7 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) 0 : range->flags[HMM_PFN_WRITE]; range->pfn_flags_mask = 0; range->pfns = pfns; - hmm_range_register(range, mm, start, + hmm_range_register(range, mirror, start, start + ttm->num_pages * PAGE_SIZE, PAGE_SHIFT); The following changes since commit 440e80ce02cde7b810e4eb555768c2d77e7a27c8: drm/amd/display: fix a couple of spelling mistakes (2019-06-27 11:22:57 -0500) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux tags/drm-next-5.3-2019-07-09 for you to fetch changes up to 7f963d9f69bf28d639013630da30d7a4c95edd5d: drm/amdgpu/navi10: add uclk activity sensor (2019-07-09 17:43:36 -0500) ---------------------------------------------------------------- drm-next-5.3-2019-07-09: amdgpu: - GPU reset for navi10 - Powerplay fixes for navi10 - GFX fixes for navi10 - Prepare for hmm_range_register API change - XGMI fixes - clang warning fixes - Fixes for various kconfig scenarios - Misc fixes and cleanups amdkfd: - Add workaround for soft hangs with oversubscribed runlists - Remove duplicated pcie atomics request ---------------------------------------------------------------- Alex Deucher (8): drm/amdgpu/gfx9: use reset default for PA_SC_FIFO_SIZE drm/amdgpu/gfx10: use reset default for PA_SC_FIFO_SIZE drm/amdgpu/display: fix interrupt client id for navi drm/amdgpu: properly guard DC support in navi code drm/amdgpu/psp11: simplify the ucode register logic drm/amdgpu: add missing documentation on new module parameters drm/amdgpu: properly guard the generic discovery code drm/amdgpu/navi10: add uclk activity sensor Arnd Bergmann (4): amdgpu: make pmu support optional drm/amd/display: dcn20: include linux/delay.h drm/amd/powerplay: vega20: fix uninitialized variable use drm/amd/display: avoid 64-bit division Evan Quan (2): drm/amdgpu: fix MGPU fan boost enablement for XGMI reset drm/amd/powerplay: use hardware fan control if no powerplay fan table Felix Kuehling (5): drm/amdkfd: Print a warning when the runlist becomes oversubscribed drm/amdgpu: Use FENCE_OWNER_KFD in process_sync_pds_resv drm/amdgpu: Fix tracking of invalid userptrs drm/amdkfd: Add chained_runlist_idle_disable flag to pm4_mes_runlist drm/amdkfd: Disable idle optimization for chained runlist Flora Cui (1): drm/amdgpu: fix scheduler timeout calc Fuqian Huang (1): drm/amdgpu: Use kmemdup rather than duplicating its implementation Jack Xiao (5): drm/amdgpu: add field indicating if has PCIE atomics support drm/amdgpu: enable PCIE atomics ops support drm/amdkfd: remove duplicated PCIE atomics request drm/amdkfd: remove an unused variable drm/amd/powerplay: increase waiting time for smu response Kevin Wang (3): drm/amd/powerplay: add baco smu reset function for smu11 drm/amdgpu: add mode1 (psp) reset for navi asic drm/amd/powerplay: add temperature sensor support for navi10 Lyude Paul (1): drm/amdgpu: Don't skip display settings in hwmgr_resume() Marek Olšák (3): drm/amdgpu: fix transform feedback GDS hang on gfx10 (v2) drm/amdgpu: handle AMDGPU_IB_FLAG_RESET_GDS_MAX_WAVE_ID on gfx10 drm/amdgpu: don't invalidate caches in RELEASE_MEM, only do the writeback Nathan Chancellor (4): drm/amdgpu/mes10.1: Fix header guard drm/amd/powerplay: Use memset to initialize metrics structs drm/amd/powerplay: Zero initialize freq in smu_v11_0_get_current_clk_freq drm/amd/powerplay: Zero initialize current_rpm in vega20_get_fan_speed_percent Philip Yang (1): drm/amdgpu: Prepare for hmm_range_register API change (v2) Yrjan Skrimstad (1): drm/amd/powerplay/smu7_hwmgr: replace blocking delay with non-blocking tiancyin (1): drm/amd/powerplay: update smu11_driver_if_navi10.h xinhui pan (1): drm/amdgpu: Disable ras features on all IPs before gpu reset drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 13 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 38 ++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 26 +++++- drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 37 -------- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 46 ++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 5 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 59 +++++++------ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 24 +----- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/mes_v10_1.h | 2 +- drivers/gpu/drm/amd/amdgpu/nv.c | 47 +++++++++- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 11 +-- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 6 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 1 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 14 +++ drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 2 +- .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +- drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 26 ++++++ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + .../drm/amd/powerplay/inc/smu11_driver_if_navi10.h | 6 +- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 8 ++ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 75 ++++++++++++++-- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 99 +++++++++++++++++++++- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 4 + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 8 +- 45 files changed, 478 insertions(+), 164 deletions(-) _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel