From patchwork Fri Jan 17 01:16:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11338123 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 0091192A for ; Fri, 17 Jan 2020 01:16:55 +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 D24C120728 for ; Fri, 17 Jan 2020 01:16:54 +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="bxG9xbzk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D24C120728 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 537246EF39; Fri, 17 Jan 2020 01:16:50 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3EF7D6EF37; Fri, 17 Jan 2020 01:16:49 +0000 (UTC) Received: by mail-qv1-xf2e.google.com with SMTP id dc14so10008811qvb.9; Thu, 16 Jan 2020 17:16:48 -0800 (PST) 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=HkjWt1WDjwO4gY8KsIisDMMC7WLqlA7t1ZZRKPo04MM=; b=bxG9xbzkIPp68u7gZIJoHnroEmf61KnbiZCEHdOyhvkT1r4DWN3kUP1lOlWOnl3rt+ Ofr7s2WQjwmTBV+VEhvThCWEooojGQft0ykrCFE/66Sjh/mmOHqzst0yPInnZGC0wkx8 u6QO9pmoAO4j3wFX5/3MXdhdOhdCA9dXRuY8LU9DoFF38raFbiV8IimDqMIAZY7XTk3U Y/j5N2T3Gi/mqQd7K9onsNP8svOL9DJOoO434/gzia5NTsKZQshclKFGKF0s99svX3WF h5CekOllVB9YmIlSvteLxRrPvcIPdDTORT0DMAJIHJegfaqniuWrlpmZJHVYepTvDXlc /n6w== 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=HkjWt1WDjwO4gY8KsIisDMMC7WLqlA7t1ZZRKPo04MM=; b=RgAs3ehZw5XKHmUU6CPiriooquq2MlpUTwpaWxjrN8JxBRP9DcbG8F9Im3Boo7vWcZ H1TaCDbl6RrSwVNZtEDl37G+Xsg3pqROT+VQ2Rx+KTmRXcQBj1dbQt2D6DycPDoU0E5k PFuHGj/p5lUE744xod0DLUgL68Cm2vP7d/4CB2oUMjd0DeorM9q+qiCF4Yk/C0TAeONJ Amz+3KM7h5HLrU6G1FF8a+eI6BiHWz3M57QStHyPYKx/H261ctqVsbWfLToQVswKfLgn DgzCA3HumFtycTsAhRAePMsangubpYA8kVggBSBtdv24KdXoN+kxonMLEI3c7IOVz/uq H07g== X-Gm-Message-State: APjAAAVLxcx0vjkoTT6zjEsiKhjOhg2mvzKPzhRgO1vQRWJxPBL9Fxe5 02VFqfGNDkce3b5d0FUqo+VLl+bp X-Google-Smtp-Source: APXvYqyaG3rsyBy6xA1n81fHXElpuzipoBwdcSOifY2vAE/FspY2p9QzE3j8ec1VCdah8bbJNhnJgA== X-Received: by 2002:a05:6214:965:: with SMTP id do5mr5499505qvb.202.1579223807400; Thu, 16 Jan 2020 17:16:47 -0800 (PST) Received: from localhost.localdomain ([71.219.59.120]) by smtp.gmail.com with ESMTPSA id n19sm10854489qkn.52.2020.01.16.17.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2020 17:16:46 -0800 (PST) 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, scheduler drm-next-5.6 Date: Thu, 16 Jan 2020 20:16:38 -0500 Message-Id: <20200117011638.6112-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.24.1 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 pull for 5.6. Mostly bug fixes. The following changes since commit 688486a49cf500a193dfe15be9eb5aa468887769: Merge tag 'amd-drm-next-5.6-2020-01-10-dp-mst-dsc' of git://people.freedesktop.org/~agd5f/linux into drm-next (2020-01-13 17:14:34 +1000) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux tags/amd-drm-next-5.6-2020-01-16 for you to fetch changes up to 31635887cb8d899584484620b597e401b2350a79: drm/amd/display: skip opp blank or unblank if test pattern enabled (2020-01-16 14:17:08 -0500) ---------------------------------------------------------------- amd-drm-next-5.6-2020-01-16: amdgpu: - Fix 32 bit harder - Powerplay cleanups - VCN fixes for Arcturus - RAS fixes - eDP/DP fixes - SR-IOV fixes - Re-enable S/G display for PCO/RV2 - Free stolen memory after init on gmc10 - DF hashing optimizations for Arcturus - Properly handle runtime pm in sysfs and debugfs - Unify more GC programming between amdgpu and amdkfd - Golden settings updates for gfx10 - GDDR6 training fixes - Freesync fixes - DSC fixes - TMDS fixes - Renoir USB-C fixes - DC dml updates from hw team - Pollock support amdkfd: - Unify more GC programming between amdgpu and amdkfd - Use KIQ to setup HIQ rather than using MMIO scheduler: - Documentation fixes - Improve job distribution with load sharing ---------------------------------------------------------------- Aaron Liu (3): drm/amd/powerplay: update SMU12_DRIVER_IF_VERSION to 11 drm/amdgpu: update goldensetting for renoir drm/amdkfd: use kiq to load the mqd of hiq queue for gfx v9 (v6) Alex Deucher (11): drm/amdgpu/powerplay: fix warning in smu_v11_0.c drm/amdgpu/gfx9: remove unused sdma headers drm/amdgpu/display: set gpu vm flag for all asics which support it drm/amdgpu: enable S/G display on PCO and RV2 (v2) drm/amdgpu/display: set gpu vm flag for renoir drm/amdgpu/gmc10: remove dead code drm/amdgpu/gmc10: free stolen memory in late_init drm/amdgpu/psp: declare navi1x ta firmware drm/amdgpu/pm: properly handle runtime pm drm/amdgpu/debugfs: properly handle runtime pm drm/amdgpu/pm: clean up return types Alex Sierra (7): drm/amdgpu: Avoid reclaim fs while eviction lock drm/amdgpu: kiq pm4 function implementation for gfx_v9 drm/amdgpu: implement tlbs invalidate on gfx9 gfx10 drm/amdgpu: replace kcq enable/disable functions on gfx_v9 drm/amdgpu: export function to flush TLB via pasid drm/amdgpu: GPU TLB flush API moved to amdgpu_amdkfd drm/amdgpu: flush TLB functions removal from kfd2kgd interface Alvin Lee (3): drm/amd/display: Fix 300Hz Freesync bug drm/amd/display: Don't always set pstate true if dummy latency = 0 drm/amd/display: Enable double buffer for OTG_BLANK Amanda Liu (1): drm/amd/display: Clear state after exiting fixed active VRR state Anthony Koo (1): drm/amd/display: make PSR static screen entry within 30 ms Aric Cyr (4): drm/amd/display: 3.2.65 drm/amd/display: 3.2.66 drm/amd/display: 3.2.67 drm/amd/display: 3.2.68 Charlene Liu (1): drm/amd/display: rename _lvp to l_vp Chen Zhou (1): drm/amd/display: remove unnecessary conversion to bool Chris Park (1): drm/amd/display: Add default switch case for DCC Christian König (1): drm/amdgpu: drop amdgpu_job.owner Dmytro Laktyushkin (1): drm/amd/display: expand dml structs Eric Yang (1): drm/amd/display: fix chroma vp wa corner case Evan Quan (2): drm/amd/powerplay: cover the powerplay implementation details V3 drm/amd/powerplay: a quick fix for the deadlock issue below Flora Cui (1): drm/amdgpu: add header file for macro SZ_1M George Shen (1): drm/amd/display: Add w/a to reset PHY before link training in verify_link_cap Guchun Chen (2): drm/amdgpu: add MCUMC_ADDRT0 offset to ip header file drm/amdgpu: calculate MCUMC_ADDRT0 per asic's UMC offset Hawking Zhang (7): drm/amdgpu: add query_ras_error_count function for sdma v4 drm/amdgpu: support error reporting for sdma ip block drm/amdgpu: add ras_late_init and ras_fini for sdma v4 drm/amdgpu: read sdma edc counter to clear the counters drm/amdgpu: check sdma ras funcs pointer before accessing drm/amdgpu: check if driver should try recovery in ras recovery path drm/amdgpu: add arcturus to gpu recovery check code path Huang Rui (2): drm/amdkfd: use map_queues for hiq on gfx v10 as well drm/amdgpu: only set cp active field for kiq queue Jack Zhang (1): drm/amdgpu/sriov skip the update of SMU_TABLE_ACTIVITY_MONITOR_COEFF James Zhu (6): drm/amdgpu/vcn: support multiple-instance dpg pause mode drm/amdgpu/vcn: support multiple instance direct SRAM read and write (v2) drm/amdgpu/vcn: move macro from vcn2.0 to share amdgpu_vcn (v2) drm/amdgpu/vcn2.5: add DPG mode start and stop drm/amdgpu/vcn2.5: add dpg pause mode drm/amdgpu/vcn2.5: implement indirect DPG SRAM mode John Clements (2): drm/amdgpu: disable XGMI TA unload for arcturus drm/amdgpu: preserve RSMU UMC index mode state Joseph Gravenor (1): drm/amd/display: stop doing unnecessary detection when going to D3 Joseph Greathouse (3): drm/amdgpu: Create generic DF struct in adev drm/amdgpu: add defines for DF and TCP Hashing drm/amdgpu: Match TC hash settings to DF settings (v2) Josip Pavic (1): drm/amd/display: implement fw-driver interface for abm 2.4 Jun Lei (1): drm/amd/display: fixup DML dependencies Kenneth Feng (1): drm/amd/powerplay: sw ctf for arcturus Leo Liu (2): drm/amdgpu/vcn2.5: fix PSP FW loading for the second instance drm/amdgpu: enable VCN2.5 IP block for Arcturus Lewis Huang (2): drm/amd/display: remove psr state condition when psr exit case drm/amd/display: Add monitor patch for AUO dpcd issue Mario Kleiner (1): drm/amd/display: Reorder detect_edp_sink_caps before link settings read. Martin Leung (1): drm/amd/display: Adding forgotten hubbub func Martin Tsai (1): drm/amd/display: Use mdelay to avoid context switch Michael Strauss (2): drm/amd/display: add Pollock IDs, fix Pollock & Dali clk mgr construct drm/amd/display: Update HDMI hang w/a to apply to all TMDS signals Mikita Lipski (1): drm/amdgpu/display: Use u64 divide macro for round up division Nicholas Kazlauskas (3): drm/amd/display: Flush framebuffer data before passing to DMCUB drm/amd/display: Read inst_fb data back during DMUB loading drm/amd/display: Soft reset DMUIF during DMUB reset Nikola Cornij (1): drm/amd/display: Disable secondary link for certain monitors Nirmoy Das (4): drm/amdgpu: catch amdgpu_irq_add_id failure drm/amdgpu: error out on entity with no run queue drm/scheduler: improve job distribution with multiple queues drm/scheduler: fix documentation by replacing rq_list with sched_list Noah Abradjian (4): drm/amd/display: Add double buffering to dcn20 OCSC drm/amd/display: Fix double buffering in dcn2 ICSC drm/amd/display: Double buffer dcn2 Gamut Remap drm/amd/display: Indirect reg read macro with shift and mask Paul Hsieh (1): drm/amd/display: reallocate MST payload when link loss Rodrigo Siqueira (1): drm/amd/include: Add OCSC registers Sung Lee (1): drm/amd/display: Use SMU ClockTable Values for DML Calculations Tianci.Yin (3): drm/amdgpu/gfx10: update gfx golden settings drm/amdgpu/gfx10: update gfx golden settings for navi14 drm/amdgpu: fix modprobe failure of the secondary GPU when GDDR6 training enabled(V5) Tiecheng Zhou (1): drm/amdgpu/sriov: workaround on rev_id for Navi12 under sriov Tom St Denis (1): drm/amd/amdgpu: add missing umc_6_1_2_sh_mask.h header file (v2) Wenjing Liu (3): drm/amd/display: wait for update when setting dpg test pattern drm/amd/display: wait for test pattern after when all pipes are programmed drm/amd/display: skip opp blank or unblank if test pattern enabled Wyatt Wood (3): drm/amd/display: Driverside changes to support PSR in DMCUB drm/amd/display: DMCUB FW Changes to support PSR drm/amd/display: Fix DMUB PSR command IDs Yong Zhao (2): drm/amdkfd: Improve function get_sdma_rlc_reg_offset() (v2) drm/amdkfd: Add a message when SW scheduler is used Yongqiang Sun (3): drm/amd/display: programing surface flip by dmcub. drm/amd/display: Refactor surface flip programming drm/amd/display: Only program surface flip for video plane via dmcub Zhan Liu (1): drm/amd/display: Don't disable DP PHY when link loss happens abdoulaye berthe (1): drm/amd/display: store lttpr mode with dpcd shaoyunl (1): drm/amdgpu: check rlc_g firmware pointer is valid before using it drivers/gpu/drm/amd/amdgpu/amdgpu.h | 29 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 44 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 71 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 149 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 41 - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 41 - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 175 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 133 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 +- drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 62 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 218 +++++- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 24 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 8 + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 6 - drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 11 + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 851 +++++++++++++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 9 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 34 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 53 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 40 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 14 +- drivers/gpu/drm/amd/amdgpu/cik.c | 12 +- drivers/gpu/drm/amd/amdgpu/cik.h | 2 - drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 9 +- drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 34 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 35 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 277 ++++--- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 114 ++- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 33 + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 34 + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 82 +- drivers/gpu/drm/amd/amdgpu/nv.c | 14 +- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 3 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 182 ++++- drivers/gpu/drm/amd/amdgpu/soc15.c | 100 +-- drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 51 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 22 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 103 ++- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 393 +++++++++- drivers/gpu/drm/amd/amdgpu/vi.c | 48 +- drivers/gpu/drm/amd/amdgpu/vi.h | 2 - .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 10 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 10 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 8 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 47 +- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 4 +- drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 6 +- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 10 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 13 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 66 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 102 ++- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 10 +- drivers/gpu/drm/amd/display/dc/dc.h | 20 +- drivers/gpu/drm/amd/display/dc/dc_helper.c | 30 + drivers/gpu/drm/amd/display/dc/dc_link.h | 4 + drivers/gpu/drm/amd/display/dc/dc_stream.h | 4 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 3 - drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 220 ++++++ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 47 ++ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 35 +- .../display/dc/dce110/dce110_timing_generator.c | 11 +- .../display/dc/dce110/dce110_timing_generator.h | 3 +- .../display/dc/dce120/dce120_timing_generator.c | 11 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 20 - .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 3 + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 31 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 2 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 15 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 3 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 26 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h | 64 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 155 +++- .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 6 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 13 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 47 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.h | 22 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 53 +- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 300 ++++---- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 28 +- .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 169 ++-- .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 171 ++--- .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 161 ++-- .../drm/amd/display/dc/dml/display_mode_enums.h | 18 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 7 +- .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 22 +- .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 128 +++- .../gpu/drm/amd/display/dc/dml/dml_common_defs.c | 2 +- .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 2 + .../amd/display/dc/{calcs => inc}/dcn_calc_math.h | 0 drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 20 + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 20 + .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 +- .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 13 + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 78 +- .../gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h | 15 +- drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h | 29 +- drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h | 19 - drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 2 + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 6 +- drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 57 +- drivers/gpu/drm/amd/display/include/dal_asic_id.h | 10 + .../drm/amd/display/modules/freesync/freesync.c | 3 + .../drm/amd/display/modules/power/power_helpers.c | 7 +- .../amd/include/asic_reg/dcn/dcn_2_0_0_offset.h | 4 + .../amd/include/asic_reg/dcn/dcn_2_0_0_sh_mask.h | 9 +- .../amd/include/asic_reg/dcn/dcn_2_1_0_offset.h | 5 +- .../amd/include/asic_reg/dcn/dcn_2_1_0_sh_mask.h | 8 + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 3 + .../drm/amd/include/asic_reg/df/df_3_6_sh_mask.h | 8 + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 6 + .../amd/include/asic_reg/umc/umc_6_1_1_offset.h | 2 + .../amd/include/asic_reg/umc/umc_6_1_2_offset.h | 2 + .../amd/include/asic_reg/umc/umc_6_1_2_sh_mask.h | 91 +++ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 6 +- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 7 +- .../gpu/drm/amd/powerplay/inc/smu12_driver_if.h | 7 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 5 +- drivers/gpu/drm/scheduler/sched_entity.c | 12 +- drivers/gpu/drm/scheduler/sched_main.c | 6 +- include/drm/gpu_scheduler.h | 16 +- 140 files changed, 4555 insertions(+), 1781 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_df.h create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h rename drivers/gpu/drm/amd/display/dc/{calcs => inc}/dcn_calc_math.h (100%) create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_1_2_sh_mask.h