From patchwork Tue May 19 20:25:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11558729 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7C100618 for ; Tue, 19 May 2020 20:25:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 59E5E20657 for ; Tue, 19 May 2020 20:25:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="J9pS69ff" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 59E5E20657 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 42EAD6E45F; Tue, 19 May 2020 20:25:17 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) by gabe.freedesktop.org (Postfix) with ESMTPS id E36366E454; Tue, 19 May 2020 20:25:15 +0000 (UTC) Received: by mail-qt1-x82d.google.com with SMTP id l1so758331qtp.6; Tue, 19 May 2020 13:25:15 -0700 (PDT) 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=2kg1fp0G9RDQT0q3aOBvMqyGYAIgc8XRlMj7R9IDGoI=; b=J9pS69ff6f80Y4lYbdhmqie5zSttAZnh4rJZvFkpSxmCm+5yEc8nZel23oeK72MgOC 9EMH0GwGP9BYoJy92lG9ZQKZA3P3VqLDieMWrFx/CR3RmtzZGK6+Exgutri/f9m/Wu7N XTkN305gCk+4spgFOU9+kYs5X+tYYqm58X9oj0x+uLBrO1GGB9BOSFPKL4+N+/u6lmNp QXgSL+idTiFj4NyIOfSGww29Yjydx53lJgKuzEEHmaT3bTuis69lE8Gi/p/rgwrVaIuK gJsrprmJwWZvUAaavfEny5bH0HGgbcGU9pu/4qD40wJrE6iSHMHSoyEI+05aNkmtzcJF JqkQ== 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=2kg1fp0G9RDQT0q3aOBvMqyGYAIgc8XRlMj7R9IDGoI=; b=lHf6m4l6HCsDvz9DdbAOX73E1ehtflYRzthK4XuQsOmSDcE8t/cvn2EJ1InbXn0LfS /mFAIJMGZqjnTMeZZIun4vJ6/WohxWL+fSPPx7211Z67UaJCck1rnG5BN4fOl1xhdYrb 5Ra2PpToCFw6KHZXI7h9z6H7eOvE9yhadKzBC7OsYRoFMEBJenkGntI5nkNmOMV4WkcP K7GN4opB4lCNgeuj+Ma0mlObWkt6b2Xutlnyt8zXKhUSFN22ZhhUFi+D7gGIqv60yb4d 7mGFib146blw2S2tpjktyW0Cshtqy58wiLwGHLgQgM6sn92+ukx6HERVL8s7QMIZ/if2 dOQQ== X-Gm-Message-State: AOAM533FqQgVuXro+rQdiFdbHPwDmDFHs01sfi4yWQy+dt86NxFlSA0V xriCgQQSx7oAaGiqB0PdbjHmQeKw X-Google-Smtp-Source: ABdhPJz/htgt94YwrERJMPqcFgwjKuB7igvmYvJU8qa1MYzP/Qcj1NhBf8CPCgggxfvo74CfCYZGmA== X-Received: by 2002:ac8:5693:: with SMTP id h19mr1784288qta.252.1589919914567; Tue, 19 May 2020 13:25:14 -0700 (PDT) Received: from localhost.localdomain ([71.51.180.250]) by smtp.gmail.com with ESMTPSA id 19sm527044qks.8.2020.05.19.13.25.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 13:25:13 -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 drm-next-5.8 Date: Tue, 19 May 2020 16:25:05 -0400 Message-Id: <20200519202505.4126-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 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" Hi Dave, Daniel, Last few bits for 5.8. The following changes since commit 80c9b58e9503f33a707a23172b2dd8d015b8c036: Merge tag 'du-next-20200514' of git://linuxtv.org/pinchartl/media into drm-next (2020-05-14 13:41:51 +1000) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux tags/amd-drm-next-5.8-2020-05-19 for you to fetch changes up to 43c8546bcd854806736d8a635a0d696504dd4c21: drm/amdgpu: Add a UAPI flag for user to call mem_sync (2020-05-18 11:24:21 -0400) ---------------------------------------------------------------- amd-drm-next-5.8-2020-05-19: amdgpu: - Improved handling for CTF (Critical Thermal Fault) situations - Clarify AC/DC mode switches - SR-IOV fixes - XGMI fixes for RAS - Misc cleanups - Add autodump debugfs node to aid in GPU hang debugging UAPI: - Add a MEM_SYNC IB flag for handling proper acquire memory semantics if UMDs expect the kernel to handle this Used by AMDVLK: https://github.com/GPUOpen-Drivers/pal/blob/dev/src/core/os/amdgpu/amdgpuQueue.cpp#L1262 ---------------------------------------------------------------- Andrey Grodzovsky (4): drm/amdgpu: Add AQUIRE_MEM PACKET3 fields defintion drm/amdgpu: Add new ring callback to insert memory sync drm/amdgpu: Add mem_sync implementation for all the ASICs. drm/amdgpu: Add a UAPI flag for user to call mem_sync Colin Ian King (1): drm/amdgpu: remove redundant assignment to variable ret Evan Quan (3): drm/amd/powerplay: try to do a graceful shutdown on SW CTF drm/amd/powerplay: shutdown on HW CTF drm/amd/powerplay: report correct AC/DC event based on ctxid V2 Jiange Zhao (1): drm/amdgpu: Add autodump debugfs node for gpu reset v8 John Clements (4): drm/amdgpu: Add cmd to control XGMI link sleep drm/amdgpu: Add DPM function for XGMI link power down control drm/amdgpu: Update RAS XGMI error inject sequence drm/amdgpu: Updated XGMI power down control support check Kevin Wang (2): drm/amdgpu: add amdgpu_virt_get_vf_mode helper function drm/amdgpu: optimize amdgpu device attribute code Marek Olšák (1): drm/amdgpu: apply AMDGPU_IB_FLAG_EMIT_MEM_SYNC to compute IBs too (v3) Yintian Tao (1): drm/amdgpu: turn back rlcg write for gfx_v10 drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 78 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 10 + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 494 +++++++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 46 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 30 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 16 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 8 + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- drivers/gpu/drm/amd/amdgpu/cikd.h | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 45 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 34 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 36 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 27 +- drivers/gpu/drm/amd/amdgpu/nvd.h | 48 ++ drivers/gpu/drm/amd/amdgpu/soc15d.h | 25 +- drivers/gpu/drm/amd/amdgpu/vid.h | 2 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 22 + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 31 ++ drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 37 +- drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 + drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 3 +- drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 46 +- include/uapi/drm/amdgpu_drm.h | 4 + 32 files changed, 775 insertions(+), 313 deletions(-)