From patchwork Fri Apr 24 19:08:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11508841 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 6B79481 for ; Fri, 24 Apr 2020 19:08:41 +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 4A09D206EC for ; Fri, 24 Apr 2020 19:08:41 +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="ld6E0jTk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A09D206EC 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 D584E6EB0D; Fri, 24 Apr 2020 19:08:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 49EA76EB0C; Fri, 24 Apr 2020 19:08:37 +0000 (UTC) Received: by mail-qk1-x72f.google.com with SMTP id g74so11265045qke.13; Fri, 24 Apr 2020 12:08:37 -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=09xN05PDMp1pgLfrpcqlX+lVoWByYWJGB+muyWFgYWg=; b=ld6E0jTkFupyBppZqdbvTbJoUViul5D7OfDNm/JfEQfRCJdr8v70V114v92Ye+pm/I fK5VWVW5NFlqY4jYYl2kpR3flECDEQKd+onc6I0LMx7EwCX4OiKchr7sTgOGudfyfHqt t1NFuTTPQ+hfgLvK2iNfS45OyL+wzZHLgOt/j6gIwhnHvjrkYskh4fPWltI0yoqJz5GE j21AFSzgJzYgg+ebkpAZYCVKXLvewHblnqsDIkNi0hUKqs2i6gEkrKZ7GQwNLOtFOU+W owEB/OPgJFOwznDYflmmAfkxAUCAsSk5u2pwrEm7890FAY5//nI99tV89GdxXTNrUIpX Eiog== 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=09xN05PDMp1pgLfrpcqlX+lVoWByYWJGB+muyWFgYWg=; b=CcxMHAbfyt5DSRv6GzXl47U2/NcQ/SwhvpQubLuS40VJsYSRzApjIpFRPeeDe3/+yD Ds9gleNTUFhdjLhLA8pXUB88181p6H7mmT1KuSE+MjeNKjxaHyYN4EyuCurDGPInwyp4 MPLyTt9IEvCICacd9Q8O4+eyUm6yIgFIIo+CHWdsTYuyhb+TQbRNewc/pk34/60sOAjB 0oqTsBikYUPXk9TGaaNY7QPhZ+a0M5CuTsglughHXE0NzWLyQ419sxKw0r/3VTv3bHWZ ZSp6tdYvgcna8GB1DldaSvi5D8CCS1ZkaFYuy8u3fyza/ggFGoJD1GbGjKi8LfPkh/Zn qSWg== X-Gm-Message-State: AGi0PuY/zdaVf5Y5iQENFnEGV0o0VfVOygnInIOV6gH0ldfpCCDtED3j jnECprk8sUrR7YyIn9D1uoOZGr+Y X-Google-Smtp-Source: APiQypIjaDrnfIfLlE/tFbTDphU3uO7lQtsvtGefesqPxqB7TX2NTgah76Anf0xVlzrtBFaET7UBpg== X-Received: by 2002:a37:b15:: with SMTP id 21mr10620253qkl.104.1587755315322; Fri, 24 Apr 2020 12:08:35 -0700 (PDT) Received: from localhost.localdomain ([71.219.72.172]) by smtp.gmail.com with ESMTPSA id g133sm4281858qke.73.2020.04.24.12.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2020 12:08: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, radeon drm-next-5.8 Date: Fri, 24 Apr 2020 15:08:27 -0400 Message-Id: <20200424190827.4542-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.25.3 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, First pull for 5.8. The following changes since commit 3148a6a0ef3cf93570f30a477292768f7eb5d3c3: drm/amdkfd: kfree the wrong pointer (2020-04-01 14:44:22 -0400) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux tags/amd-drm-next-5.8-2020-04-24 for you to fetch changes up to e748f07d00c1c4a9106acafac52df7ea4ecf6264: drm/amdgpu: retire legacy vega10 sos version check (2020-04-23 15:41:06 -0400) ---------------------------------------------------------------- amd-drm-next-5.8-2020-04-24: amdgpu: - Documentation improvements - Enable FRU chip access on boards that support it - RAS updates - SR-IOV updates - Powerplay locking fixes for older SMU versions - VCN DPG (dynamic powergating) cleanup - VCN 2.5 DPG enablement - Rework GPU scheduler handling - Improve scheduler priority handling - Add SPM (streaming performance monitor) golden settings for navi - GFX10 clockgating fixes - DC ABM (automatic backlight modulation) fixes - DC cursor and plane fixes - DC watermark fixes - DC clock handling fixes - DC color management fixes - GPU reset fixes - Clean up MMIO access macros - EEPROM access fixes - Misc code cleanups amdkfd: - Misc code cleanups radeon: - Clean up safe reg list generation - Misc code cleanups ---------------------------------------------------------------- Aaron Liu (1): drm/amdgpu: unify fw_write_wait for new gfx9 asics Aaron Ma (1): drm/amdgpu: Fix oops when pp_funcs is unset in ACPI event Alex Deucher (8): drm/amdgpu/psp: dont warn on missing optional TA's drm/amdgpu/display: fix warning when compiling without debugfs drm/amdgpu/ring: add no_scheduler flag drm/amdgpu/kiq: add no_scheduler flag to KIQ drm/amdgpu/ring: simplify scheduler setup logic drm/amdgpu/gfx9: add gfxoff quirk drm/amdgpu/display: fix aux registration (v2) drm/amdgpu/display: give aux i2c buses more meaningful names Alex Sierra (6): drm/amdgpu: infinite retries fix from UTLC1 RB SDMA drm/amdgpu: ih doorbell size of range changed for nbio v7.4 drm/amdgpu: enable IH ring 1 and ring 2 for navi drm/amdgpu: call psp to program ih cntl in SR-IOV for Navi drm/amdgpu: reroute VMC and UMD to IH ring 1 for oss v5 amdgpu/drm: remove psp access on navi10 for sriov Alvin Lee (1): drm/amd/display: Revert to old formula in set_vtg_params Anthony Koo (5): drm/amd/display: make all backlight calls link based drm/amd/display: move panel power seq to new panel struct drm/amd/display: destroy panel on link destruct drm/amd/display: change from panel to panel cntl drm/amd/display: fix bug in the logic for panel power control Aric Cyr (7): drm/amd/display: 3.2.77 drm/amd/display: 3.2.78 drm/amd/display: 3.2.79 drm/amd/display: 3.2.80 drm/amd/display: Fix HDR visual confirm drm/amd/display: Update MPCC if requested drm/amd/display: 3.2.81 Aurabindo Pillai (5): amdgpu_kms: Remove unnecessary condition check drm/amd/amdgpu: add prefix for pr_* prints drm/amd/amdgpu: add print prefix for dev_* variants drm/amd/amdgpu: remove hardcoded module name in prints drm/amd/display: DispalyPort: Write OUI only if panel supports it Bernard Zhao (2): drm/amdgpu: cleanup coding style in amdkfd a bit drm/amdgpu: shrink critical section in amdgpu_amdkfd_gpuvm_free_memory_of_gpu Bhawanpreet Lakha (4): drm/amd/display: remove mod_hdcp_hdcp2_get_link_encryption_status() drm/amd/display: Guard calls to hdcp_ta and dtm_ta drm/amd/display: query hdcp capability during link detect drm/amd/display: add HDCP caps debugfs Charlene Liu (1): drm/amd/display: initialize get_max_link_cap Chen Zhou (1): drm/amdgpu/uvd7: remove unnecessary conversion to bool Chengming Gui (1): drm/amd/amdgpu: Correct gfx10's CG sequence Christian König (3): drm/amdgpu: stop disable the scheduler during HW fini drm/amdgpu: fix and cleanup amdgpu_gem_object_close v4 drm/amdgpu: change how we update mmRLC_SPM_MC_CNTL Colin Ian King (2): drm/amdgpu/vcn: fix spelling mistake "fimware" -> "firmware" drm/amd/display: remove redundant assignment to variable dp_ref_clk_khz Dale Zhao (1): drm/amd/display: Correct updating logic of dcn21's pipe VM flags Dennis Li (2): drm/amdgpu: replace DRM prefix with PCI device info for gfx/mmhub drm/amdgpu: set error query ready after all IPs late init Dmytro Laktyushkin (3): drm/amd/display: fix dml pipe merge logic drm/amd/display: fix stream setting for diags on silicon drm/amd/display: fix virtual signal dsc setup Emily Deng (4): drm/amdgpu: Virtual display need to support multiple ctrcs drm/amdgpu: Add 4k resolution for virtual display drm/amdgpu: Ignore the not supported error from psp drm/amdgpu: No need support vcn decode Eric Yang (1): drm/amd/display: change default pipe_split policy for DCN1 Evan Quan (22): drm/amdgpu: fix non-pointer dereference for non-RAS supported drm/amd/powerplay: avoid calling CI specific SMU message implemention drm/amd/powerplay: avoid calling SMU7 specific SMU message implemention drm/amd/powerpaly: drop unused APIs drm/amd/powerplay: avoid calling SMU8 specific SMU message implemention drm/amd/powerplay: avoid calling SMU9 specific SMU message implemention drm/amd/powerplay: avoid calling SMU10 specific SMU message implemention drm/amd/powerplay: avoid calling Vega20 specific SMU message implemention drm/amd/powerplay: unified interfaces for message issuing and response checking drm/amd/powerplay: added mutex protection on msg issuing drm/amd/powerplay: error out on forcing clock setting not supported drm/amd/powerplay: unload mp1 for Arcturus RAS baco reset drm/amdgpu: fix wrong vram lost counter increment V2 drm/amd/powerplay: revise the way to retrieve the board parameters drm/amd/powerplay: bump the NAVI10 smu-driver if version drm/amd/powerplay: correct i2c eeprom init/fini sequence drm/amd/powerplay: properly set the dpm_enabled state drm/amd/powerplay: update Arcturus smu-driver if header drm/amdgpu: correct fbdev suspend on gpu reset drm/amdgpu: correct cancel_delayed_work_sync on gpu reset drm/amdgpu: optimize the gpu reset for XGMI setup V2 drm/amdgpu: code cleanup around gpu reset Guchun Chen (4): drm/amdgpu: add uncorrectable error count print in UMC ecc irq cb drm/amdgpu: refine ras related message print drm/amdgpu: replace DRM prefix with PCI device info for GFX RAS drm/amdgpu: fix kernel page fault issue by ras recovery on sGPU Haiyi Zhou (1): drm/amd/display: Change infopacket type programming Hawking Zhang (14): drm/amdgpu: remove inproper workaround for vega10 drm/amdgpu: replace indirect mmio access in non-dc code path drm/amdgpu: retire indirect mmio reg support from cgs drm/amdgpu: retire RREG32_IDX/WREG32_IDX drm/amdgpu: retire AMDGPU_REGS_KIQ flag drm/amdgpu: support access regs outside of mmio bar drm/amdgpu: retire support_vmr_ring interface drm/amdgpu: remove unnecessary tOS version check drm/amdgpu: retire unused check_fw_loading status drm/amdgpu: add helper function to init asd ucode drm/amdgpu: switch to helper function to init asd ucode drm/amdgpu: add helper function to init sos ucode drm/amdgpu: switch to helper function to init sos ucode drm/amdgpu: retire legacy vega10 sos version check Isabel Zhang (2): drm/amd/display: Remove hdcp display state with mst fix drm/amd/display: Update stream adjust in dc_stream_adjust_vmin_vmax Jack Zhang (3): drm/amdgpu/sriov add amdgpu_amdkfd_pre_reset in gpu reset drm/amdkfd Avoid destroy hqd when GPU is on reset drm/amdgpu/sriov add amdgpu_amdkfd_pre_reset in gpu reset Jaehyun Chung (2): drm/amd/display: Update DRAM watermark before checking to update TTU drm/amd/display: Add HW rotation cursor changes to dcn10 James Zhu (10): drm/amdgpu/vcn: fix race condition issue for vcn start drm/amdgpu/vcn: fix race condition issue for dpg unpause mode switch drm/amdgpu/vcn2.0: stall DPG when WPTR/RPTR reset drm/amdgpu/vcn2.5: stall DPG when WPTR/RPTR reset drm/amdgpu/vcn: Add firmware share memory support drm/amdgpu/vcn2.0: Add firmware w/r ptr reset sync drm/amdgpu/vcn2.5: Add firmware w/r ptr reset sync drm/amdgpu: enable VCN2.5 DPG mode for Arcturus drm/amdgpu/vcn: add shared memory restore after wake up from sleep. Revert "drm/amdgpu: Disable gfx off if VCN is busy" Jason Yan (5): drm/amd/display: code clean up in dce80_hw_sequencer.c drm/amdgpu: remove dead code in si_dpm.c drm/radeon: remove defined but not used 'dte_data_tahiti_le' drm/radeon: remove defined but not used variables in ci_dpm.c drm/amd/powerplay: remove defined but not used variables Jerry (Fangzhi) Zuo (1): drm/amd/display: Avoid create MST prop after registration Jiansong Chen (1): drm/amd/powerplay: limit smu support to Arcturus for onevf Jiawei (2): drm/amdgpu: extend compute job timeout drm/amdgpu: disble vblank when unloading sriov driver Jinze Xu (1): drm/amd/display: Workaround to disable YCbCr John Clements (9): drm/amdgpu: disabled fru eeprom access drm/amdgpu: added xgmi ras error reset sequence drm/amdgpu: disable ras query and iject during gpu reset drm/amdgpu: resolve mGPU RAS query instability drm/amdgpu: update RAS related dmesg print drm/amdgpu: increased atom cmd timeout drm/amdgpu: update psp fw loading sequence drm/amdgpu: set mp1 state before reload drm/amdgpu: cache smu fw version info Jonathan Kim (1): drm/amdgpu: fix race between pstate and remote buffer map Joseph Gravenor (1): drm/amd/display: fix typo Joshua Aberback (2): drm/amd/display: Acknowledge wm_optimized_required drm/amd/display: Force watermark value propagation Josip Pavic (1): drm/amd/display: prevent loop from occuring in pipe list Kent Russell (9): drm/amdgpu: Enable reading FRU chip via I2C v3 drm/amdgpu: Add documentation for memory info drm/amdgpu: Add documentation for PCIe accounting drm/amdgpu: Add documentation for unique_id drm/amdgpu: Expose TA FW version in fw_version file drm/amdgpu: Fix FRU data checking drm/amdgpu: Re-enable FRU check for most models v5 Revert "drm/amdgpu: use the BAR if possible in amdgpu_device_vram_access v2" drm/amdgpu: Disable FRU read on Arcturus Kevin Wang (1): drm/amdgpu: clean up unused variable about ring lru Likun Gao (1): drm/amdgpu/powerplay: get SMC FW size to a flexible way Lyude Paul (2): drm/amd/amdgpu_dm/mst: Remove useless sideband tracing drm/amd/dc: Kill dc_conn_log_hex_linux() Masahiro Yamada (4): drm/radeon: remove unneeded header include path drm/radeon: fix build rules of *_reg_safe.h drm/radeon: use pattern rule to avoid code duplication in Makefile drm/radeon: align short build log Melissa Wen (4): drm/amd/display: cleanup codestyle type BLOCK_COMMENT_STYLE on dc_link drm/amd/display: codestyle cleanup on dc_link file until detect_dp func drm/amd/display: code cleanup on dc_link from is_same_edid to get_ddc_line drm/amd/display: code cleanup of dc_link file on func dc_link_construct Michael Strauss (1): drm/amd/display: Check for null fclk voltage when parsing clock table Monk Liu (10): drm/amdgpu: purge ip_discovery headers drm/amdgpu: amends feature bits for MM bandwidth mgr drm/amdgpu: cleanup all virtualization detection routine drm/amdgpu: cleanup idh event/req for NV headers drm/amdgpu: introduce new idh_request/event enum drm/amdgpu: introduce new request and its function drm/amdgpu: use static mmio offset for NV mailbox drm/amdgpu: equip new req_init_data handshake drm/amdgpu: adjust sequence of ip_discovery init and timeout_setting drm/amdgpu: postpone entering fullaccess mode Nicholas Kazlauskas (11): drm/amd/display: Don't change mpcc tree for medium updates on DCN20 hwseq drm/amd/display: Translate cursor position by source rect drm/amd/display: Fix incorrect cursor pos on scaled primary plane drm/amd/display: Program viewport when source pos changes for DCN20 hw seq drm/amd/display: Calculate scaling ratios on every medium/full update drm/amd/display: Make cursor source translation adjustment optional drm/amd/display: Make DMCUB bss/data firmware blob optional drm/amd/display: Check ramp != NULL before applying lut1d for degamma drm/amd/display: Avoid NULL pointer in set_backlight when ABM is NULL drm/amd/display: Use the correct input TF for video formats drm/amd/display: Factor in immediate flip support into DLG calculations Nikola Cornij (1): drm/amd/display: Program DSC before enabling link Nirmoy Das (3): drm/amdgpu: sync ring type and drm hw_ip type drm/amdgpu: rework sched_list generation drm/amd/powerplay: fix a typo Oak Zeng (1): drm/amdgpu: Print UTCL2 client ID on a gpuvm fault Paul Hsieh (1): drm/amd/display: dmcu wait loop calculation is incorrect in RV Prike Liang (5): drm/amd/powerplay: implement the is_dpm_running() drm/amdgpu: fix gfx hang during suspend with video playback (v2) drm/amdgpu: fix the hw hang during perform system reboot and reset drm/amd/powerplay: fix resume failed as smu table initialize early exit drm/amd/powerplay: update smu12_driver_if.h to align with pmfw Rajneesh Bhardwaj (1): drm/amdgpu/gmc: Fix spelling mistake. Randy Dunlap (2): drm: amd/display: fix Kconfig help text drm: amdgpu: fix kernel-doc struct warning Rodrigo Siqueira (1): drm/amd/display: Fix green screen issue after suspend Sandeep Raghuraman (1): drm/amdgpu: Correctly initialize thermal controller for GPUs with Powerplay table v0 (e.g Hawaii) Sergei Lopatin (1): drm/amd/powerplay: force the trim of the mclk dpm_levels if OD is enabled Shirish S (1): drm/amd/display: re-order asic declarations Stylon Wang (3): drm/amd/display: Refactor color management to take dm plane state drm/amd/display: Support plane-level gamut remap in DM drm/amd/display: Adjust refactored dm for color management only Sung Lee (5): drm/amd/display: Power down hw blocks on boot drm/amd/display: Check power_down functions exist before calling drm/amd/display: Set meta_chunk_value to 0 in DML if DCC disabled in DCN2.1 drm/amd/display: Cast int to float before division drm/amd/display: Cap certain DML values for Low Pix Clk on DCN2.1 Tianci.Yin (3): drm/amdgpu: add SPM golden settings for Navi10(v2) drm/amdgpu: add SPM golden settings for Navi14 drm/amdgpu: add SPM golden settings for Navi12 Tiecheng Zhou (1): drm/amd/powerplay: avoid using pm_en before it is initialized Tom St Denis (5): drm/amd/amdgpu: Add GFX9.1 PWR_MISC_CNTL_STATUS register to headers drm/amd/amdgpu: Add missing SMUIO v12 register to headers drm/amd/amdgpu: Move PWR_MISC_CNTL_STATUS to its own header drm/amd/amdgpu: Fix SMUIO/PWR Confusion (v2) drm/amd/amdgpu: Include headers for PWR and SMUIO registers Wenjing Liu (2): drm/amd/display: determine USB C DP2 mode only when USB DP Alt is enabled drm/amd/display: add optc get crc support for timings with ODM/DSC Wyatt Wood (13): drm/amd/display: Add ABM driver implementation drm/amd/display: Move backlight pwm enable function call drm/amd/display: Implement abm config table copy to dmcub drm/amd/display: Use config flag to disable dmcu obj creation drm/amd/display: Fix ABM config copy for dmcub drm/amd/display: Remove unused defines drm/amd/display: Add user backlight level reg write drm/amd/display: Move enable fractional pwm call drm/amd/display: Remove byte swapping for dmcub abm config table drm/amd/display: Add SetBacklight call to abm on dmcub drm/amd/display: Unify psr feature flags drm/amd/display: Various fixes for PSR on DMCUB drm/amd/display: Convert memory from cpu to fw endianness correctly Xiaodong Yan (3): drm/amd/display: blank dp stream before power off receiver drm/amd/display: only blank dp stream which will be powered off drm/amd/display: blank dp stream before re-train the link Yifan Zhang (1): drm/amd/display: fix the broken logic in dc_link.c Yintian Tao (4): drm/amdgpu: skip access sdma_v5_0 registers under SRIOV (v2) drm/amdgpu: restrict debugfs register access under SR-IOV drm/amdgpu: resume kiq access debugfs drm/amdgpu: request reg_val_offs each kiq read reg Yong Zhao (3): drm/amdkfd: Adjust three kfd dmesg printings during initialization drm/amdgpu: Adjust the SDMA doorbell info printing drm/amdgpu: Print CU information by default during initialization Yongqiang Sun (1): drm/amd/display: access ABM from stream resource. YueHaibing (2): drm/amd/dc: remove unused variable 'video_optimized_pixel_rates' drm/amdgpu: remove set but not used variable 'priority' Yuxian Dai (2): drm/amdgpu/powerplay: using the FCLK DPM table to set the MCLK drm/amdgpu/powerplay:avoid to show invalid DPM table info Zhan Liu (2): drm/amd/display: Change "error" to "dc_log" at amdgpu_dm dpcd reading stage drm/amd/display: Remove aconnector condition check for dpcd read limingyu (1): drm/amdgpu: Init data to avoid oops while reading pp_num_states. xinhui pan (1): drm/amdgpu: implement more ib pools (v2) Documentation/gpu/amdgpu.rst | 88 + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 67 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 40 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 160 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 73 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 370 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 185 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h | 29 + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 43 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 23 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 6 - drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 42 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 279 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 90 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 40 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 103 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 32 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 79 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 20 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 - drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 98 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 10 +- drivers/gpu/drm/amd/amdgpu/atom.c | 7 +- drivers/gpu/drm/amd/amdgpu/cik.c | 10 - drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 14 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 14 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 13 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2814 +++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 15 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 35 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 42 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 129 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 41 +- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 3 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 12 +- drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 13 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 3 +- drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 97 +- drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 44 +- drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 3 +- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 302 ++- drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 18 - drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 18 - drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 7 - drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 36 +- drivers/gpu/drm/amd/amdgpu/nv.c | 21 +- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 141 +- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 235 +- drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 172 +- drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 262 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 35 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 123 +- drivers/gpu/drm/amd/amdgpu/si.c | 8 - drivers/gpu/drm/amd/amdgpu/si_dma.c | 7 +- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 20 - drivers/gpu/drm/amd/amdgpu/soc15.c | 7 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 16 +- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 23 +- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 7 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 77 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 90 +- drivers/gpu/drm/amd/amdgpu/vi.c | 26 - drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 - drivers/gpu/drm/amd/display/Kconfig | 8 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 112 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 22 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 71 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 66 +- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 3 +- drivers/gpu/drm/amd/display/dc/basics/Makefile | 3 +- drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 2 +- .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 2 +- .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 3 - .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 48 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 579 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 44 +- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 8 +- drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 1 + drivers/gpu/drm/amd/display/dc/dc.h | 52 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 6 + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 2 + drivers/gpu/drm/amd/display/dc/dc_link.h | 31 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 - drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 5 +- .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 33 - drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 65 +- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 20 +- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 3 + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 105 + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.h | 117 + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 438 +++ .../dc/{basics/log_helpers.c => dce/dmub_abm.h} | 25 +- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 61 +- .../drm/amd/display/dc/dce100/dce100_resource.c | 31 + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 60 +- .../amd/display/dc/dce110/dce110_hw_sequencer.h | 4 - .../drm/amd/display/dc/dce110/dce110_resource.c | 31 + .../drm/amd/display/dc/dce112/dce112_resource.c | 31 + .../drm/amd/display/dc/dce120/dce120_resource.c | 31 + .../drm/amd/display/dc/dce80/dce80_hw_sequencer.c | 28 - .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 31 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 18 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 125 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 2 - .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 20 +- .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 3 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 6 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 7 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 33 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 13 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 2 - .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 40 + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 4 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 14 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 7 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 45 +- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 3 +- .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 27 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 81 +- .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 3 +- .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 4 +- .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 17 +- drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 89 + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 3 + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 5 +- drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 2 + drivers/gpu/drm/amd/display/dc/inc/hw/panel_cntl.h | 53 + .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 2 + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 - .../amd/display/dc/virtual/virtual_link_encoder.c | 9 + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 17 + .../gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h | 15 +- drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h | 11 + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 24 +- drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 25 +- drivers/gpu/drm/amd/display/include/dal_asic_id.h | 6 +- drivers/gpu/drm/amd/display/include/hdcp_types.h | 7 + .../gpu/drm/amd/display/include/logger_interface.h | 4 - .../drm/amd/display/modules/color/color_gamma.c | 2 +- .../drm/amd/display/modules/freesync/freesync.c | 101 +- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 5 +- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 30 +- .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 2 +- .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 2 +- .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 8 +- .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 482 ++-- .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 3 + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 5 +- .../gpu/drm/amd/display/modules/inc/mod_shared.h | 5 +- .../amd/display/modules/info_packet/info_packet.c | 3 +- .../drm/amd/display/modules/power/power_helpers.c | 103 +- .../drm/amd/display/modules/power/power_helpers.h | 3 + .../amd/include/asic_reg/nbif/nbif_6_1_offset.h | 2 + .../amd/include/asic_reg/nbio/nbio_7_0_offset.h | 2 + .../amd/include/asic_reg/nbio/nbio_7_4_offset.h | 2 + .../drm/amd/include/asic_reg/pwr/pwr_10_0_offset.h | 27 + .../amd/include/asic_reg/pwr/pwr_10_0_sh_mask.h | 30 + .../include/asic_reg/smuio/smuio_12_0_0_offset.h | 30 + .../include/asic_reg/smuio/smuio_12_0_0_sh_mask.h | 33 + drivers/gpu/drm/amd/include/atomfirmware.h | 102 + drivers/gpu/drm/amd/include/cgs_common.h | 1 - drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 6 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 288 +- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 57 +- .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 26 + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 174 +- .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 61 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 140 +- .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 40 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 17 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 157 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 141 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 32 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 6 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 149 +- .../gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 7 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 8 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 181 +- .../gpu/drm/amd/powerplay/hwmgr/vega20_powertune.c | 6 +- .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 7 +- drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 9 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 15 +- .../gpu/drm/amd/powerplay/inc/smu12_driver_if.h | 40 +- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 5 +- drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 7 +- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 99 +- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 29 +- drivers/gpu/drm/amd/powerplay/renoir_ppt.h | 2 +- drivers/gpu/drm/amd/powerplay/smu_internal.h | 5 + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 40 +- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 16 +- drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 18 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 35 +- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 1 + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 31 +- .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 39 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 48 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 4 +- drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 69 +- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 56 +- .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 15 +- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 56 +- .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 68 +- .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 106 +- .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 18 +- drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 4 +- drivers/gpu/drm/radeon/Makefile | 35 +- drivers/gpu/drm/radeon/ci_dpm.c | 14 - drivers/gpu/drm/radeon/si_dpm.c | 18 - 265 files changed, 9537 insertions(+), 3923 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h mode change 100644 => 100755 drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c mode change 100644 => 100755 drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.c create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.h create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c rename drivers/gpu/drm/amd/display/dc/{basics/log_helpers.c => dce/dmub_abm.h} (75%) create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/panel_cntl.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/pwr/pwr_10_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/pwr/pwr_10_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_sh_mask.h