From patchwork Fri Sep 18 20:43:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11786295 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 121D859D for ; Fri, 18 Sep 2020 20:43:37 +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 D544E208DB for ; Fri, 18 Sep 2020 20:43:36 +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="cg8e74gE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D544E208DB 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 CBE846ED88; Fri, 18 Sep 2020 20:43:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A5F96ED87; Fri, 18 Sep 2020 20:43:31 +0000 (UTC) Received: by mail-qk1-x72e.google.com with SMTP id q5so7749896qkc.2; Fri, 18 Sep 2020 13:43:31 -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=jh7dl5R/mRLlwikhFmIBqOM3H2q+9PG3KTFba7L0jUc=; b=cg8e74gEVZU5txBFXDm4RJddHyv8IrHz4Okx7jnbbSYawMlB2ud00Mkv/QB9oFW3Db Vb7XCnmrwO7aNDwh+vYNGU20VNBy80dYY6apc5+6dTcs/p7Gi/PzU+F9qQ5/7nLUDIl8 Me0R1M1KX4Z8FvWiSS5sf4UH5nrKhFvH3X2AoIASSEuZqR1GtI4Dg37XS2fUVM7f2VeF t6zDAgxLyAQ485V5hFjjYOjusGG3AEpsTXUv9T4dsq7gZaeHEYEwvACk7Mi/2r4sY9xk 91TX0L0HvCkViGEh6TZmu8FshMuNnhV7MGMzvhz+sfeLMgf8yPCN0eiw0fhos7zbQGR0 ZnIA== 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=jh7dl5R/mRLlwikhFmIBqOM3H2q+9PG3KTFba7L0jUc=; b=n7DybfFzV6dopyWRsc8OsrjQoRj8Lle2sQ35hdSWREGaEmyVhxQIe4SeGvT0TqiNUz Mj/Ebk1pBO+UI/y9Gt+BPU5zRbHNCaFxzvNtVVAGr2lGNJNq3k/XSaQ2ea1LZMdFmPQz mkEk5YUzH/ABQHGd9SNDgyvBJofIjLTtdcLGHNeLsMqQm2u4gAQo+1EY/Qzm0On57XoS NM4O50clrEutIascKY7DsFkDQiDSrcK+Eu2ruLHJWWrSwb9ycFQormjeDqW0eZwbfjxM r5bflL22iBwXP2RDEbZI7t0Y4kryfWaeBlRZ28aOfAeJ/Vlx3MGeWkCcKLWkv/SVj79q UNGg== X-Gm-Message-State: AOAM532mOC07aGU6Bsqq7nOdRIMbgpdxuIl9L0o1OEkWKYwjsqCDfprn LUksQ8ka9YvCWhSTfMN/hw1thjVVH0s= X-Google-Smtp-Source: ABdhPJzRb6j96/SqKbAQCVmDQBuoJqTisqgx+0mDx++999fAQugtvYy+PVQUdklOg1cECn+KGH9sCQ== X-Received: by 2002:a05:620a:13a5:: with SMTP id m5mr35948906qki.280.1600461810041; Fri, 18 Sep 2020 13:43:30 -0700 (PDT) Received: from localhost.localdomain ([71.219.66.138]) by smtp.gmail.com with ESMTPSA id i5sm2789462qko.86.2020.09.18.13.43.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2020 13:43:29 -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, radeon, scheduler drm-next-5.10 Date: Fri, 18 Sep 2020 16:43:22 -0400 Message-Id: <20200918204322.3931-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 new stuff for 5.10. The following changes since commit 818280d5adf1d80e78f95821815148abe9407e14: Merge v5.9-rc5 into drm-next (2020-09-14 17:19:11 +0200) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux tags/amd-drm-next-5.10-2020-09-18 for you to fetch changes up to 911d5bd5e7b8531b39301c2c27e5b90d7bd71b88: drm/amd/pm: Skip smu_post_init in SRIOV (2020-09-18 16:14:56 -0400) ---------------------------------------------------------------- amd-drm-next-5.10-2020-09-18: amdgpu: - Support for PCIe DPC recovery - Sienna Cichlid updates - Navy Flounder updates - RAS fixes - Refactor DC interrupt handling - Display fixes - Fix issues with OLED panels - Mclk fixes for navi1x - Watermark fixes for renoir and raven2 - Misc code cleanups - Misc bug fixes amdkfd: - Fix a memory leak - Fix a crach in GPU reset - Add process eviction counters radeon: - expose sclk via sysfs hwmon interface - Revert bad PLL fix scheduler: - Kernel doc fixes ---------------------------------------------------------------- Aidan Gratton (1): drm/amd/display: Increase Max EDID Size Constant Alex Deucher (7): drm/amdgpu: Fail to load on RAVEN if SME is active drm/amdgpu/gmc9: remove mmhub client duplicated case drm/amdgpu: unmap register bar on device init failure drm/amdgpu: add the GC 10.3 VRS registers drm/amdgpu: add VCN 3.0 AV1 registers drm/amdgpu: use the AV1 defines for VCN 3.0 drm/amdgpu: remove experimental flag from navi12 Alvin Lee (1): drm/amd/display: Compare plane when looking for pipe split being lost Andrey Grodzovsky (9): drm/amdgpu: Implement DPC recovery drm/amdgpu: Avoid accessing HW when suspending SW state drm/amdgpu: Block all job scheduling activity during DPC recovery drm/amdgpu: Fix SMU error failure drm/amdgpu: Fix consecutive DPC recovery failures. drm/amdgpu: Trim amdgpu_pci_slot_reset by reusing code. drm/amdgpu: Disable DPC for XGMI for now. drm/amdgpu: Minor checkpatch fix drm/amdgpu: Include sienna_cichlid in USBC PD FW support. Anthony Koo (3): drm/amd/display: [FW Promotion] Release 0.0.30 drm/amd/display: [FW Promotion] Release 0.0.31 drm/amd/display: [FW Promotion] Release 0.0.32 Aric Cyr (6): drm/amd/display: 3.2.100 drm/amd/display: Triplebuffering should not be used by default drm/amd/display: 3.2.101 drm/amd/display: Flip pending check timeout due to disabled hubp drm/amd/display: Multi display cause system lag on mode change drm/amd/display: 3.2.102 Ashley Thomas (1): drm/amd/display: Power eDP panel back ON before link training retry Aurabindo Pillai (3): drm/amdgpu: Move existing pflip fields into separate struct drm/amd/display: Refactor to prevent crtc state access in DM IRQ handler drm/amd/display: Move disable interrupt into commit tail Bernard Zhao (1): drm/amd/display: optimize code runtime a bit Bhawanpreet Lakha (3): drm/amd/display: Don't use DRM_ERROR() for DTM add topology drm/amd/display: Don't log hdcp module warnings in dmesg drm/amd/display: Add missing "Copy GSL groups when committing a new context" Changfeng (1): drm/amdgpu: add ta DTM/HDCP print in amdgpu_firmware_info for apu Chen Zhou (1): drm/amd/display: Remove duplicate include Christian König (1): drm/radeon: revert "Prefer lower feedback dividers" Dennis Li (2): drm/kfd: fix a system crash issue during GPU recovery drm/amdkfd: fix a memory leak issue Dmytro Laktyushkin (2): drm/amd/display: make dcn20 stream_gating use a pointer for dsc_pg_control drm/amd/display: update dcn30_optc header with missing declarations Eric Yang (1): drm/amd/display: implement notify stream mask Eryk Brol (5): drm/amd/display: Add DSC force disable to dsc_clock_en debugfs entry drm/amd/display: Add trigger connector unplug drm/amd/display: Return the number of bytes parsed than allocated drm/amd/display: Calculate DSC number of slices in debugfs when forced drm/amd/display: Add connector to the state if DSC debugfs is set Evan Quan (23): drm/amd/pm: wrapper for postponing some setup job after DAL initializatioa(V2) drm/amd/pm: postpone SOCCLK/UCLK enablement after DAL initialization(V2) drm/amd/pm: put Navi1X umc cdr workaround in post_smu_init drm/amd/pm: revise the umc hybrid cdr workaround drm/amd/pm: allocate a new buffer for pstate dummy reading drm/amd/pm: implement a new umc cdr workaround drm/amd/pm: apply the CDR workarounds only with some specific UMC firmwares(V2) drm/amd/pm: correct the requirement for umc cdr workaround drm/amd/pm: make namings and comments more readable drm/amd/pm: drop unnecessary feature->mutex lock protections(V2) drm/amd/pm: drop unnecessary smu_baco->mutex lock protections(V2) drm/amd/pm: drop unnecessary table existence and dpm enablement check drm/amd/pm: minor cleanups drm/amd/pm: drop dead code drm/amd/pm: drop unnecessary wrappers around watermark setting drm/amd/pm: add Renoir watermark WmType setting drm/amd/pm: add Raven2 watermark WmType setting drm/amd/pm: process pending AC/DC switch interrupt drm/amd/pm: apply no power source workaround if dc reported by gpio drm/amd/pm: move NAVI1X power mode switching workaround to post_init drm/amd/pm: lower Raven UMD Stable Pstate VCN values drm/amd/pm: correct Renoir UMD Stable Pstate settings drm/amd/pm: apply dummy reads workaround for CDR enabled only Fangzhi Zuo (1): drm/amd/display: Further fix of psr eDP p-state warning Flora Cui (1): drm/amdgpu: drop BOOLEAN define in display part George Shen (1): drm/amd/display: Rename set_mst_bandwidth to align with DP spec Harmanprit Tatla (2): drm/amd/display: Add CP_IRQ clear capability drm/amd/display: Fix CP_IRQ clear bit and logic Jiansong Chen (3): drm/amd/pm: update driver if version for navy_flounder drm/amd/pm: support runtime pptable update for sienna_cichlid etc. drm/amdgpu: declare ta firmware for navy_flounder JinZe.Xu (1): drm/amd/display: Detect plane change when detect pipe change. Jingwen Chen (1): drm/amd/pm: Skip smu_post_init in SRIOV John Clements (1): drm/amdgpu: Update RAS init handling Jonathan Kim (1): drm/amdgpu: stop resetting xgmi perfmons on disable Joshua Aberback (2): drm/amd/display: Compare mpcc_inst to mpcc_count instead of a constant drm/amd/display: Update idle optimization handling Josip Pavic (1): drm/amd/display: remove dc context from transfer function Jun Lei (2): drm/amd/display: update nv1x stutter latencies drm/amd/display: get socBB from VBIOS Lewis Huang (1): drm/amd/display: update clock when non-seamless boot stream exist Likun Gao (2): drm/amd/pm: update driver if file for sienna cichlid drm/amdgpu: add device ID for sienna_cichlid (v2) Liu ChengZhe (1): drm/amdgpu: Do gpu recovery when no job is running Luben Tuikov (1): drm/amdgpu: No sysfs, not an error condition Martin Leung (1): drm/amd/display: adding pathway to retrieve stutter period Mauro Rossi (1): drm/amd/display: dc/clk_mgr: make function static Michel Dänzer (1): drm/amdgpu/dc: Require primary plane to be enabled whenever the CRTC is Mukul Joshi (1): drm/amdgpu: Enable SDMA utilization for Arcturus Naveed Ashfaq (1): drm/amd/display: Fixed Intermittent blue screen on OLED panel Oak Zeng (2): drm/amdgpu: Add comment to function amdgpu_ttm_alloc_gart drm/amdgpu: More accurate description of a function param Philip Cox (3): drm/amdkfd: Add some eveiction debugging code drm/amdkfd: Add process eviction counters to sysfs drm/amdkfd: Reduce eviction/restore message levels Philip Yang (1): drm/amdgpu: prevent double kfree ttm->sg Randy Dunlap (1): drm: amd/display: fix spelling of "function" Rodrigo Siqueira (1): drm/amd/display: Check clock table return Roman Li (2): drm/amd/display: remove early return from dm_late_init drm/amd/display: fix compile warning in dml Sandeep Raghuraman (1): drm/radeon: Add sclk frequency as hwmon sensor Shirish S (1): amdgpu/gmc_v9: Warn if SDPIF_MMIO_CNTRL_0 is not set Tian Tao (1): drm/scheduler: fix sched_fence.c kernel-doc warnings Tom St Denis (1): drm/amd/amdgpu: add mmUVD_FW_STATUS register to uvd700 Wenjing Liu (2): drm/amd/display: add option to override cr training pattern drm/amd/display: always use 100us for cr aux rd interval Wesley Chalmers (1): drm/amd/display: Only use offset for first ODM pipe Xiaoliang Pang (1): drm/amdgpu/powerplay: hwmgr - modify the return value Ye Bin (2): drm/amd/display: Remove set but used 'temp' drm/amd/display: Delete duplicated argument to '&&' or '||' YueHaibing (3): drm/amdkfd: Fix -Wunused-const-variable warning drm/amd/display: Fix possible memleak in dp_trigger_hotplug() drm/amd/display: Create trigger_hotplug entry Zhan Liu (2): drm/amd/display: Enabling PSR on DCN30 on driver side drm/amd/display: Disable idle optimization when PSR is enabled Zheng Bin (8): drm/amd/amdgpu: fix comparison pointer to bool warning in gfx_v9_0.c drm/amd/amdgpu: fix comparison pointer to bool warning in gfx_v10_0.c drm/amd/amdgpu: fix comparison pointer to bool warning in sdma_v5_0.c drm/amd/amdgpu: fix comparison pointer to bool warning in sdma_v5_2.c drm/amd/amdgpu: fix comparison pointer to bool warning in si.c drm/amd/amdgpu: fix comparison pointer to bool warning in uvd_v6_0.c drm/amd/amdgpu: fix comparison pointer to bool warning in amdgpu_atpx_handler.c drm/amd/amdgpu: fix comparison pointer to bool warning in sdma_v4_0.c drivers/gpu/drm/amd/amdgpu/amdgpu.h | 14 + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 306 +++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 35 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 43 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 20 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +- drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 23 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 3 +- drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 2 +- drivers/gpu/drm/amd/amdgpu/nv.c | 4 +- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 13 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 2 +- drivers/gpu/drm/amd/amdgpu/si.c | 2 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 16 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 21 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 9 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 101 +++++++ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 252 +++++++++-------- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 81 ++++-- .../amd/display/amdgpu_dm/amdgpu_dm_irq_params.h | 37 +++ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 30 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 102 +------ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 71 ++++- .../amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c | 2 +- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 7 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 57 +++- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 67 +++-- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 6 + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 29 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 12 +- drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 7 +- drivers/gpu/drm/amd/display/dc/dc.h | 9 +- drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 4 + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 16 ++ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 1 + drivers/gpu/drm/amd/display/dc/dc_types.h | 2 +- .../drm/amd/display/dc/dce/dce_stream_encoder.c | 6 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 84 ++++-- .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 4 - drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 3 + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 14 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 6 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 2 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 3 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 44 ++- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 6 +- .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 4 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 4 - .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 4 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 30 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 5 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 4 + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 38 ++- drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 4 +- .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 11 +- .../display/dc/dml/dcn20/display_rq_dlg_calc_20.h | 2 +- .../dc/dml/dcn20/display_rq_dlg_calc_20v2.h | 2 +- .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 +- .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 18 +- .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 2 +- .../display/dc/dml/dcn30/display_rq_dlg_calc_30.h | 2 +- .../amd/display/dc/gpio/dce120/hw_factory_dce120.c | 2 +- .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 2 +- .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 2 +- .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c | 2 +- .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 2 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 6 + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 2 +- .../display/dc/virtual/virtual_stream_encoder.c | 9 +- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 9 +- .../drm/amd/display/include/bios_parser_types.h | 6 + .../drm/amd/display/include/link_service_types.h | 1 + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 8 + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 1 + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 17 ++ .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 2 +- .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 2 +- .../amd/include/asic_reg/gc/gc_10_3_0_default.h | 2 + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 4 + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 50 ++++ .../drm/amd/include/asic_reg/uvd/uvd_7_0_offset.h | 3 + .../drm/amd/include/asic_reg/uvd/uvd_7_0_sh_mask.h | 20 ++ .../amd/include/asic_reg/vcn/vcn_3_0_0_sh_mask.h | 34 +++ drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 +- drivers/gpu/drm/amd/pm/inc/smu10_driver_if.h | 3 +- .../amd/pm/inc/smu11_driver_if_sienna_cichlid.h | 20 +- drivers/gpu/drm/amd/pm/inc/smu_11_0_cdr_table.h | 194 +++++++++++++ drivers/gpu/drm/amd/pm/inc/smu_types.h | 3 + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- drivers/gpu/drm/amd/pm/inc/smu_v11_0_ppsmc.h | 7 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 15 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.h | 1 + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 2 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 2 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 103 ++++--- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 2 - drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 312 ++++++++++++++------- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 76 ++--- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 90 +++--- drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 100 +++++-- drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.h | 1 + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 9 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 3 +- drivers/gpu/drm/radeon/radeon_display.c | 2 +- drivers/gpu/drm/radeon/radeon_pm.c | 29 +- drivers/gpu/drm/scheduler/sched_fence.c | 2 +- 125 files changed, 2154 insertions(+), 831 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq_params.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_11_0_cdr_table.h