From patchwork Fri Jul 24 20:57:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11684399 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 AF893138A for ; Fri, 24 Jul 2020 20:57:27 +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 8875E206EB for ; Fri, 24 Jul 2020 20:57:27 +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="dI16N+nj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8875E206EB 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 60B8B6E998; Fri, 24 Jul 2020 20:57:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) by gabe.freedesktop.org (Postfix) with ESMTPS id A28D46E997; Fri, 24 Jul 2020 20:57:21 +0000 (UTC) Received: by mail-qk1-x732.google.com with SMTP id e13so9934936qkg.5; Fri, 24 Jul 2020 13:57:21 -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=43RWM4RAZVJDC0dMevdyU0SoG4YO84f5VMyHAfi5ouY=; b=dI16N+nj1P8Rksmdx6JCO6TlpkNCzXJMauV5a8A0xisr2c1l6zIZrNwX91Ak2iwOgF pTABvjbkisL0aVo28gzYbMjznSSTTs68ea7hkz3CxXDzyalDCuFoOcu/LtoNqhcASkCQ DWXngQr5fXAVTYOa4sCRVALeKlQZ6h0wsvo3A0vSCrbiXzcpk0OtLUH5KnpZnd1KgiNc W380nwqgDxzHT7qKCvUrdvAvBpIQeFccb/9QWt1kcXVfz2bwofYtKd5MykslKQzdIajj lt3e9XkfJi3uDCvzsZ+jKL+i3GNP3+fCGlhcno2QzgCbhq4lwNf0YD+Dt15cMBaV8vgA E9xw== 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=43RWM4RAZVJDC0dMevdyU0SoG4YO84f5VMyHAfi5ouY=; b=fGEMWNfZAF3lwzfkAUUPtYngpF0Thvr95KLRzTqAmBIRK7ezyN0NXNT0nwAFqcqtk/ 5F5FOcIpawTpWOQ2iwHkKI7CitUrapCLp85s5mfcEqqIu1pNLdR3mqWb9s4fc8qMTyuD oAI8zKuEjIB6Mejv7Vz+4McrHsZ9tgDOx/Fa+48sUmkJ8o6V6PCH8S0jt+Ov88aXWQJY JMp7fHd8swS+CQBV9BuAigx76TtRAJBiUcarkKFzzfRv9pq7VXaKesZmYaxmdaiUkDqQ ViXfu7Ikk1yRR5Y6rm2+EMxPkjj0+deeRSvIwfHyKtjq84j5RwniHqP9we8wYnHnAvwu YGcQ== X-Gm-Message-State: AOAM533hFvdHliAwq0Z78061iYwMmfGWUw/IvL13vJ7hactfO2FAgmuj OiTx0ZQ5b76YL7J4fqSMB6xkJCgs X-Google-Smtp-Source: ABdhPJwUzjkuGGkJyslY5LLCuTidLIx1tFJTXIBe6rSIfmTV0I368EMYdpbQMrDDAogAA3PjkpNZKw== X-Received: by 2002:a37:556:: with SMTP id 83mr12288530qkf.208.1595624240252; Fri, 24 Jul 2020 13:57:20 -0700 (PDT) Received: from localhost.localdomain ([71.219.66.138]) by smtp.gmail.com with ESMTPSA id f189sm7507253qke.15.2020.07.24.13.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 13:57:19 -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.9 Date: Fri, 24 Jul 2020 16:57:12 -0400 Message-Id: <20200724205712.3913-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 5.9. Fixes and cleanups. The following changes since commit 6e14adea0ac3037d923a9591d1a094c115d7947c: drm/amd/amdkfd: Fix large framesize for kfd_smi_ev_read() (2020-07-15 13:27:34 -0400) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux tags/amd-drm-next-5.9-2020-07-24 for you to fetch changes up to 922e7455bb6122696b0420172700ea2b4e2f5739: Revert "drm/amd/display: Expose connector VRR range via debugfs" (2020-07-21 20:21:30 -0400) ---------------------------------------------------------------- amd-drm-next-5.9-2020-07-24: amdgpu: - Misc sienna cichlid fixes - Final bits of swSMU cleanup - Misc display fixes - Misc VCN fixes - Eeprom i2c cleanup - Drop amd vrr_range debugfs in favor of core drm ---------------------------------------------------------------- Alex Deucher (7): drm/amdgpu/smu11: drop code chuck that got accidently re-added drm/amdgpu: move i2c bus lock out of ras structure drm/amdgpu: remove eeprom from the smu i2c handlers drm/amdgpu/vega20: enable the smu i2c bus for all boards drm/amdgpu/swSMU: remove eeprom from the smu i2c handlers (v2) drm/amdgpu/navi1x: add SMU i2c support (v2) drm/amdgpu/sienna_cichlid: add SMU i2c support (v2) Anthony Koo (1): drm/amd/display: [FW Promotion] Release 0.0.25 Aric Cyr (2): drm/amd/display: remove unhelpful 5ms delay drm/amd/display: 3.2.95 Aurabindo Pillai (3): drm/amd/display: Make new dc interface for adding dsc resource drm/amd/display: Call dsc related functions indirectly via dc interface drm/amd/display: Add additional config guards for DCN Bhanuprakash Modem (1): Revert "drm/amd/display: Expose connector VRR range via debugfs" Bhawanpreet Lakha (1): drm/amdgpu: load ta firmware for sienna cichlid Chengming Gui (1): drm/amdgpu: add timeout flush mechanism to update wptr for self interrupt (v2) Eryk Brol (1): drm/amd/display: Add DSC parameters logging to debugfs Evan Quan (18): drm/amd/powerplay: suppress compile error around BUG_ON drm/amd/powerplay: widely share the API for data table retrieving drm/amd/powerplay: unify swSMU index to asic specific index mapping drm/amd/powerplay: drop unused code drm/amd/powerplay: move clock dpm enablement check to smu_v11/v12 drm/amd/powerplay: move dpm feature support checking to smu_cmn.c drm/amd/powerplay: move dpm feature enablement checking to smu_cmn.c drm/amd/powerplay: implement smu_cmn_get_enabled_mask() for all ASICs drm/amd/powerplay: move ppfeature mask setting to smu_cmn.c drm/amd/powerplay: common API for disabling all features with exception drm/amd/powerplay: move more APIs to smu_cmn.c drm/amd/powerplay: maximum code sharing around watermarks setting drm/amd/powerplay: move table setting common code to smu_cmn.c drm/amd/powerplay: update the tables init related drm/amd/powerplay: move SMC message issuing APIs to smu_cmn.c drm/amd/powerplay: drop unnecessary message support check drm/amd/powerplay: revise the calling flow on OD table update drm/amd/powerplay: tag swSMU code layers Igor Kravchenko (1): drm/amd/display: interface to obtain minimum plane size caps James Zhu (2): Revert "drm/amdgpu/vcn: add shared memory restore after wake up from sleep." drm/amdgpu/vcn: merge shared memory into vcpu Jiansong Chen (3): drm/amd/powerplay: fix typos for clk map drm/amd/powerplay: update driver if version for navy_flounder drm/amd/powerplay: retrieve VCN dpm table per instances Jinzhou.Su (1): drm/amdgpu: add read amdgpu_gfxoff status in debugfs John Clements (2): drm/amdgpu: load asd for sienna cichlid drm/amdgpu: enable xgmi support for sienna cichlid Naveed Ashfaq (1): drm/amd/display: Improve compatibility by re-ordering info-packets Nirmoy Das (1): drm/amdgpu: do not disable SMU on vm reboot Paweł Gronowski (1): drm/amdgpu: Fix NULL dereference in dpm sysfs handlers Qiu Wenbo (1): drm/amd/powerplay: fix a crash when overclocking Vega M Reza Amini (1): drm/amd/display: Implement AMD VSIF V3 Roman Li (1): drm/amd/display: Decouple ABM init from dmcu Wenjing Liu (1): drm/amd/display: rename dsc extended caps as dsc branch decoder caps drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 17 + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 7 + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 53 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 14 + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 46 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 - drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 45 ++ drivers/gpu/drm/amd/amdgpu/nv.c | 3 + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 62 +- drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h | 4 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 40 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 536 +++++++++++++- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 30 + drivers/gpu/drm/amd/display/dc/dc.h | 5 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 4 +- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 7 + drivers/gpu/drm/amd/display/dc/dc_stream.h | 10 + .../drm/amd/display/dc/dce110/dce110_resource.c | 8 +- .../drm/amd/display/dc/dce112/dce112_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 5 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 5 +- .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 8 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 5 +- drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 10 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 4 +- drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 5 + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- .../drm/amd/display/modules/freesync/freesync.c | 41 ++ drivers/gpu/drm/amd/powerplay/Makefile | 4 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 364 +--------- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 330 ++++----- drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 96 ++- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 42 +- drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 23 +- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 612 ++++++++++------ drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 385 +++++----- drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 776 +++++++++++++-------- drivers/gpu/drm/amd/powerplay/smu_cmn.c | 633 +++++++++++++++++ drivers/gpu/drm/amd/powerplay/smu_cmn.h | 83 +++ drivers/gpu/drm/amd/powerplay/smu_internal.h | 24 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 367 +++------- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 176 +---- .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 11 +- .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 10 +- 53 files changed, 3002 insertions(+), 1950 deletions(-) create mode 100644 drivers/gpu/drm/amd/powerplay/smu_cmn.c create mode 100644 drivers/gpu/drm/amd/powerplay/smu_cmn.h