From patchwork Wed Jul 10 03:50:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11037771 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F38E81395 for ; Wed, 10 Jul 2019 03:50:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E179020134 for ; Wed, 10 Jul 2019 03:50:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D03A7286A2; Wed, 10 Jul 2019 03:50:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 44CC420134 for ; Wed, 10 Jul 2019 03:50:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8BC228990D; Wed, 10 Jul 2019 03:50:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by gabe.freedesktop.org (Postfix) with ESMTPS id 818E8897E8; Wed, 10 Jul 2019 03:50:36 +0000 (UTC) Received: by mail-qt1-x842.google.com with SMTP id d17so959687qtj.8; Tue, 09 Jul 2019 20:50:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xf+8kkcjZeQWrCKYtUzvfQFOHgFkJ32MVrB1uDJs6bs=; b=Nj28N6MZwtV/QypQ19gzzbW0iNCnzo9Am4dptKMHSdHQKO+4A1UGkKJMLWBfJfH9t6 m5LAsWDqMkUPK0tIiWVvisFDO8pAzo7DdgXlCiwXlX+N6vjDexdboWLNNLwNei7rQdTj VONXog7Xztwa2dKfU99d23/X8oAZwtXULnfjHIdvG36X7SvNp49m/YtH8O/MlFrKReN5 Vgx9rksUAdMYwVUPwoH0RR358QRb1IO7B+wfoHqv16yIAK0xO1aY8ai7tXl5CgQQElln BJEQ/34B2PTBvdE/n8tXdDR4/DGThM8D8ln4tTc24bK7FgBpi9/XA6c3OO9ThmaP2rO/ Q7oQ== X-Gm-Message-State: APjAAAW16dUGhhMkitlEl6jqNm4z16xRKiKYa3vbAsOawjG5rE+wauuK nTtotzA/DhhoXLih8viGLtLG+DPZ X-Google-Smtp-Source: APXvYqztYitV/Z1RuB/pLwKq5JDQIn8ahkYYc9AEPIKYQhS77X8GKbIo5NlPNRttYm9bTgsMzI2PdA== X-Received: by 2002:ac8:45d0:: with SMTP id e16mr21491515qto.337.1562730635350; Tue, 09 Jul 2019 20:50:35 -0700 (PDT) Received: from localhost.localdomain ([71.219.79.35]) by smtp.gmail.com with ESMTPSA id i1sm397322qtb.7.2019.07.09.20.50.34 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 09 Jul 2019 20:50:34 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, airlied@gmail.com, daniel.vetter@ffwll.ch Subject: [pull] amdgpu, amdkfd drm-next-5.3 Date: Tue, 9 Jul 2019 22:50:17 -0500 Message-Id: <20190710035017.3407-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xf+8kkcjZeQWrCKYtUzvfQFOHgFkJ32MVrB1uDJs6bs=; b=Bl1D8r//TvuTF0HPooiRMT8HKId5URNy+wkcTkiLGlCb+vgGOALWZNP/nKU9emmbrs wi812oMTRdPXkdnnMoP9WOCuZS8UZOyGno+S7NyqbVUOiBb7IQ8cT7L2z6Ww9xybqlMN OAOU6Nxa8H5l8qOhcXoQ8WliHG4vE0Kvs2wV2HGoJlcRQD5L1R5uPp35Dbeih95zLjjj LVsGFDFfGes2r7u8pDPQ3phbbAAKYQQ9OKocXV7KOYkETrDg1CjbhGSCA2bo0PF2Awdd R6ZjDzzF0BMMLLGfwO5pszmGNBXpbgv6LnenUcpUnFSOaSo3n1USjMLeiTDgF0juTLjL 460g== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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(-)