From patchwork Tue May 12 21:37:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11544185 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 9E0F914C0 for ; Tue, 12 May 2020 21:37:20 +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 74A1E20740 for ; Tue, 12 May 2020 21:37:20 +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="Igj2Be+y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 74A1E20740 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 A871E6E9C2; Tue, 12 May 2020 21:37:15 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E4726E9C1; Tue, 12 May 2020 21:37:14 +0000 (UTC) Received: by mail-qk1-x730.google.com with SMTP id b6so14196855qkh.11; Tue, 12 May 2020 14:37:14 -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=EFTN/pUaLqmNMHTpW0SvdOf+bjgQv7Lsz29BxkjR/G0=; b=Igj2Be+ycnRvxHsTSyfII0qhjFT3TnFwDDR4NgzAErh1d5H42342ArTLXcPidDLBIn Ox8fm//OTuuP5A3hoAwMoezTCfw5RplNaKeREizJn1Dd5J0NhEZ6WeYUVsb1AguM7wJ/ yEirASJOhIFxf/Lpq3djQxk9AAfKiUhrdKdSuQzJ5wHw60P1xpWaiVqq2zH8Ly6SS9L8 qVNsq28XGCGzLghA/WpmTA2xX3IywvB5c+dMJmnJ2atpxps+laoevvRB6lAQkJHrDMAG IUBE/OaixjzkeUcwqpogNTUHq3hoqgXyrtFfMt17tODaC8uxs+e1jUzDK44+WwYCkll2 s3fw== 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=EFTN/pUaLqmNMHTpW0SvdOf+bjgQv7Lsz29BxkjR/G0=; b=YkCuUvHl/u8dPWcOOa1B4y7kLi46si7BCyKIdLvxqux8BJaSxePcfJVNvUXIceHGul yqDM0gGtI7Tl5/doAszBxnMwhtiMwrdWusEJ9v7VGssM77ryqXp9QYsy5V9LKiV+xjv7 5vPgaAz+wv4J8zUSa4Zi2o1wOn+Uc31VIvKhu1jriqCzPfieOFTNQgokXzW29yiGC3e+ NfktzZWVYD8o/HleC6YHaavk6SQ9dj7IK0uENY3ZmpLqiRMUvNyMsZd2UP3BurYWW2DK MYgSWLkUD6AVrOYGO/SLIAocrU7lzW44IomwKSnLjIkTSMDvffhQEy99XEZCCY/7avQR 5RJg== X-Gm-Message-State: AGi0PuZavJQeJ3p3gdMW0ldgB6MYNnAsOLf1l7Bd1VRlEFXKeV8FzAii QvURLkAN+i/fyHqT8RLIupaPazml X-Google-Smtp-Source: APiQypI4ZVWcMyE7cF4DKkim4NMbzi1g8ybxC0nUvPBAzskHn3vaMX80g2d/J3X3rVwXZIX4zeBtUQ== X-Received: by 2002:a05:620a:6d5:: with SMTP id 21mr21860710qky.417.1589319433089; Tue, 12 May 2020 14:37:13 -0700 (PDT) Received: from localhost.localdomain ([71.219.37.167]) by smtp.gmail.com with ESMTPSA id d50sm6651420qtb.13.2020.05.12.14.37.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2020 14:37:12 -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.8 Date: Tue, 12 May 2020 17:37:03 -0400 Message-Id: <20200512213703.4039-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, More stuff for 5.8. The following changes since commit b8020b0304c8f44e5e29f0b1a04d31e0bf68d26a: drm/amdkfd: Enable over-subscription with >1 GWS queue (2020-04-28 16:20:30 -0400) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux tags/amd-drm-next-5.8-2020-05-12 for you to fetch changes up to 37e4f052cc9749db608ad63e53acc49354c98200: drm/amd/amdgpu: remove defined but not used 'crtc_offsets' (2020-05-11 18:04:09 -0400) ---------------------------------------------------------------- amd-drm-next-5.8-2020-05-12: amdgpu: - Misc cleanups - RAS fixes - Expose FP16 for modesetting - DP 1.4 compliance test fixes - Clockgating fixes - MAINTAINERS update - Soft recovery for gfx10 - Runtime PM cleanups - PSP code cleanups amdkfd: - Track GPU memory utilization per process - Report PCI domain in topology ---------------------------------------------------------------- Alex Deucher (6): drm/amdgpu: force fbdev into vram drm/amdgpu: implement soft_recovery for gfx10 drm/amdgpu: drop pm_runtime_set_active drm/amdgpu: fix runpm logic in amdgpu_pmops_resume drm/amdgpu: drop extra runtime pm handling in resume pmop drm/amdgpu: only set DPM_FLAG_NEVER_SKIP for legacy ATPX BOCO Alvin Lee (1): drm/amd/display: Allow PState switch in VBLANK one display VACTIVE Andriy Gapon (1): amdgpu_acpi: add backlight control for the DC case Anthony Koo (3): drm/amd/display: add addition dc type to translate to dmub fw type drm/amd/display: move location of dmub_srv.h file drm/amd/display: Add struct field for future use Aric Cyr (2): drm/amd/display: Mode change with same timing causing long display blank drm/amd/display: 3.2.84 Arnd Bergmann (1): drm/amdgpu: allocate large structures dynamically Aurabindo Pillai (2): drm/amd/display: Prevent dpcd reads with passive dongles drm/amd/display: remove unused module/stats Bernard Zhao (2): drm/radeon: cleanup coding style a bit drm/amd/amdgpu: cleanup coding style a bit Boyuan Zhang (1): drm/amdgpu: change HWIP from UVD to VCN for VCN2.5 Chen Zhou (1): drm/amd/display: remove duplicate headers ChenTao (2): drm/radeon: fix unsigned comparison with 0 drm/amdgpu/navi10: fix unsigned comparison with 0 Christian König (1): drm/amdgpu: use the BAR if possible in amdgpu_device_vram_access v2 Chunming Zhou (1): MAINTAINERS: Remove me from amdgpu maintainers Daniel Kolesa (1): drm/amd/display: work around fp code being emitted outside of DC_FP_START/END Evan Quan (5): drm/amdgpu: put the audio codec into suspend state before gpu reset V3 drm/amdgpu: disable MGCG/MGLS also on gfx CG ungate drm/amdgpu: drop unnecessary cancel_delayed_work_sync on PG ungate drm/amd/powerplay: perform PG ungate prior to CG ungate drm/amdgpu: enable hibernate support on Navi1X Felix Kuehling (3): drm/amdkfd: Fix comment formatting drm/amdgpu: Add missing parameter description in comments drm/amdgpu: Use GEM obj reference for KFD BOs Hawking Zhang (7): drm/amdgpu: re-structue members for ip discovery drm/amdgpu: skip reservation of discovery tmr region in pre-Navi drm/amdgpu: switch to common xgmi ta helpers drm/amdgpu: switch to common ras ta helper drm/amdgpu: drop unused ras ta helper function drm/amdgpu: switch to common rlc_autoload helper drm/amdgpu: use node_id and node_size to calcualte dram_base_address Isabel Zhang (1): drm/amd/display: Add 4 to 1 MPC split support Jane Jian (1): drm/amd/powerplay: skip judging if baco support for Arcturus sriov Jason Yan (5): drm/amd/display: remove duplicate assignment of dcn21_funcs members drm/amdgpu/smu10: remove duplicate assignment of smu10_hwmgr_funcs members drm/amd/display: remove unused variable 'ret' in dm_suspend() drm/amd/display: remove variable "result" in dcn20_patch_unknown_plane_state() drm/amd/amdgpu: remove defined but not used 'crtc_offsets' Jerry (Fangzhi) Zuo (2): drm/amd/display: Check DMCU Exists Before Loading drm/amd/display: Add dm support for DP 1.4 Compliance edid corruption test John Clements (4): drm/amdgpu: update RAS error handling drm/amdgpu: update RAS TA to Host interface drm/amdgpu: update RAS sequence to parse TA flags drm/amdgpu: Fix bug in RAS invoke Leo (Hanghong) Ma (1): drm/amd/amdgpu: Update update_config() logic Lewis Huang (1): drm/amd/display: temporary clamp the vratio used to 1.0 Likun Gao (2): drm/amdgpu: check SMU NULL ptr on gfx hw init drm/amdgpu: update the method to set kcq queue mask Michel Dänzer (1): drm/amdgpu/dc: Use WARN_ON_ONCE for ASSERT Mukul Joshi (1): drm/amdkfd: Track GPU memory utilization per process Nathan Chancellor (1): drm/amdgpu: Avoid integer overflow in amdgpu_device_suspend_display_audio Nicholas Kazlauskas (1): drm/amd/display: Fix vblank and pageflip event handling for FreeSync Nirmoy Das (1): drm/amdgpu: cleanup sysfs file handling Oak Zeng (1): drm/amdgpu: Changed CU reservation golden settings Ori Messinger (1): drm/amdkfd: Report domain with topology Roman Li (1): drm/amd/display: fix counter in wait_for_no_pipes_pending Simon Ser (1): drm/amd/display: add basic atomic check for cursor plane Stylon Wang (1): drm/amd/display: Support FP16 pixel format Sung Lee (1): drm/amd/display: Update DCN2.1 DV Code Revision Tom St Denis (2): drm/amd/amdgpu: add raven1 part to the gfxoff quirk list drm/amd/amdgpu: Add missing GRBM bits for GFX 10.1 Yong Zhao (2): drm/amdgpu: Rename amdgpu_gfx_kcq_queue_mask_transform() drm/amdkfd: Use a systematic method to calculate queue mask bit Yongqiang Sun (1): drm/amd/display: Move panel_cntl specific register from abm to panel_cntl. Zheng Bin (7): drm/amdgpu: remove set but not used variable 'priority' drm/amdgpu: remove set but not used variable 'direct_poll' in vcn_v2_0.c drm/amdgpu: remove set but not used variable 'direct_poll' in vcn_v2_5.c drm/amd/display: remove set but not used variable 'dc' drm/amd/display: remove set but not used variable 'pixel_width' drm/amd/display: remove set but not used variable 'speakers' in dce_stream_encoder.c drm/amd/display: remove set but not used variable 'speakers' in dcn10_stream_encoder.c Zou Wei (1): drm/amd/display: Fix unsigned comparison to zero shaoyunl (1): amd/amdgpu: Limit rlcg write registers only for nv12 yanyan kang (1): drm/amd/display: The external monitor will show gray screen during SUT reboot MAINTAINERS | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 137 +++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 56 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 19 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 173 +++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 40 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 71 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 20 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 43 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 27 +- drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 54 --- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 70 +++- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 11 - drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 182 --------- drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 59 ++- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 3 - drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 394 +++++++++--------- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 13 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 7 + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 61 ++- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 208 +++++----- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 2 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 10 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 40 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 11 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 65 ++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 1 - drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 67 --- drivers/gpu/drm/amd/display/dc/dc.h | 4 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 2 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_link.h | 5 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 5 + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 215 +--------- drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 30 +- .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 204 +++++++++- .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.h | 48 ++- .../drm/amd/display/dc/dce/dce_stream_encoder.c | 2 - drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 129 +----- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 15 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 49 ++- .../amd/display/dc/dce110/dce110_hw_sequencer.h | 1 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 7 - .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 35 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 18 - .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 2 - drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 8 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 162 +++++--- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 5 +- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 6 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 29 +- .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 26 +- .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 8 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 1 + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 15 +- drivers/gpu/drm/amd/display/dc/inc/hw/panel_cntl.h | 16 +- drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 2 + drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 - drivers/gpu/drm/amd/display/dc/os_types.h | 2 +- .../gpu/drm/amd/display/dmub/{inc => }/dmub_srv.h | 9 +- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 1 + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 2 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 2 +- drivers/gpu/drm/amd/display/dmub/src/dmub_reg.c | 2 +- drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 2 +- .../amd/display/modules/info_packet/info_packet.c | 3 +- drivers/gpu/drm/amd/display/modules/stats/stats.c | 448 --------------------- .../amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h | 4 + drivers/gpu/drm/amd/include/atomfirmware.h | 12 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 6 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 8 +- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 1 - drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 2 - drivers/gpu/drm/radeon/atom.c | 3 +- drivers/gpu/drm/radeon/radeon_kms.c | 4 +- include/uapi/linux/kfd_ioctl.h | 2 +- 98 files changed, 1549 insertions(+), 1981 deletions(-) rename drivers/gpu/drm/amd/display/dmub/{inc => }/dmub_srv.h (99%) delete mode 100644 drivers/gpu/drm/amd/display/modules/stats/stats.c