| Message ID | 20210114212148.23714-1-alexander.deucher@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [pull] amdgpu drm-next-5.12 | expand |
On Fri, 15 Jan 2021 at 07:22, Alex Deucher <alexdeucher@gmail.com> wrote: > > Hi Dave, Daniel, > > More new stuff for 5.12. > > The following changes since commit 044a48f420b9d3c19a135b821c34de5b2bee4075: > > drm/amdgpu: fix DRM_INFO flood if display core is not supported (bug 210921) (2021-01-08 15:18:57 -0500) > > are available in the Git repository at: > > https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.12-2021-01-14 > > for you to fetch changes up to df1f0560d28f4895e2d61af826728efb61976f9f: > > drm/amd/display: Simplify bool comparison (2021-01-14 13:20:21 -0500) arm 32/64 builds say no. CC [M] drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.o /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function ‘vangogh_get_smu_metrics_data’: /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10: error: ‘boot_cpu_data’ undeclared (first use in this function); did you mean ‘bl_get_data’? boot_cpu_data.x86_max_cores * sizeof(uint16_t)); ^~~~~~~~~~~~~ bl_get_data /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10: note: each undeclared identifier is reported only once for each function it appears in /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function ‘vangogh_read_sensor’: /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1320:11: error: ‘boot_cpu_data’ undeclared (first use in this function); did you mean ‘bl_get_data’? *size = boot_cpu_data.x86_max_cores * sizeof(uint16_t); ^~~~~~~~~~~~~ bl_get_data /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function ‘vangogh_od_edit_dpm_table’: /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1460:19: error: ‘boot_cpu_data’ undeclared (first use in this function); did you mean ‘bl_get_data’? if (input[0] >= boot_cpu_data.x86_max_cores) { ^~~~~~~~~~~~~ bl_get_data make[5]: *** [/home/airlied/devel/kernel/dim/src/scripts/Makefile.build:279: drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.o] Error 1 Not sure using boot_cpu_data in a driver is that good an idea, maybe there is a better interface to get that sort of information, but even so it should build on arm. Dave.
On Fri, Jan 15, 2021 at 2:28 AM Dave Airlie <airlied@gmail.com> wrote: > > On Fri, 15 Jan 2021 at 07:22, Alex Deucher <alexdeucher@gmail.com> wrote: > > > > Hi Dave, Daniel, > > > > More new stuff for 5.12. > > > > The following changes since commit 044a48f420b9d3c19a135b821c34de5b2bee4075: > > > > drm/amdgpu: fix DRM_INFO flood if display core is not supported (bug 210921) (2021-01-08 15:18:57 -0500) > > > > are available in the Git repository at: > > > > https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.12-2021-01-14 > > > > for you to fetch changes up to df1f0560d28f4895e2d61af826728efb61976f9f: > > > > drm/amd/display: Simplify bool comparison (2021-01-14 13:20:21 -0500) > > arm 32/64 builds say no. > > CC [M] drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.o > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: > In function ‘vangogh_get_smu_metrics_data’: > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10: > error: ‘boot_cpu_data’ undeclared (first use in this function); did > you mean ‘bl_get_data’? > boot_cpu_data.x86_max_cores * sizeof(uint16_t)); > ^~~~~~~~~~~~~ > bl_get_data > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10: > note: each undeclared identifier is reported only once for each > function it appears in > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: > In function ‘vangogh_read_sensor’: > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1320:11: > error: ‘boot_cpu_data’ undeclared (first use in this function); did > you mean ‘bl_get_data’? > *size = boot_cpu_data.x86_max_cores * sizeof(uint16_t); > ^~~~~~~~~~~~~ > bl_get_data > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: > In function ‘vangogh_od_edit_dpm_table’: > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1460:19: > error: ‘boot_cpu_data’ undeclared (first use in this function); did > you mean ‘bl_get_data’? > if (input[0] >= boot_cpu_data.x86_max_cores) { > ^~~~~~~~~~~~~ > bl_get_data > make[5]: *** [/home/airlied/devel/kernel/dim/src/scripts/Makefile.build:279: > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.o] Error 1 > > > Not sure using boot_cpu_data in a driver is that good an idea, maybe > there is a better interface to get that sort of information, but even > so it should build on arm. I'm not sure if there is a generic interface for this or not, but this is for SOC power management on an APU, so it's only relevant to x86. I'll send out a patch to fix the build. Alex > > Dave.
On Fri, Jan 15, 2021 at 9:51 AM Alex Deucher <alexdeucher@gmail.com> wrote: > > On Fri, Jan 15, 2021 at 2:28 AM Dave Airlie <airlied@gmail.com> wrote: > > > > On Fri, 15 Jan 2021 at 07:22, Alex Deucher <alexdeucher@gmail.com> wrote: > > > > > > Hi Dave, Daniel, > > > > > > More new stuff for 5.12. > > > > > > The following changes since commit 044a48f420b9d3c19a135b821c34de5b2bee4075: > > > > > > drm/amdgpu: fix DRM_INFO flood if display core is not supported (bug 210921) (2021-01-08 15:18:57 -0500) > > > > > > are available in the Git repository at: > > > > > > https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.12-2021-01-14 > > > > > > for you to fetch changes up to df1f0560d28f4895e2d61af826728efb61976f9f: > > > > > > drm/amd/display: Simplify bool comparison (2021-01-14 13:20:21 -0500) > > > > arm 32/64 builds say no. > > > > CC [M] drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.o > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: > > In function ‘vangogh_get_smu_metrics_data’: > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10: > > error: ‘boot_cpu_data’ undeclared (first use in this function); did > > you mean ‘bl_get_data’? > > boot_cpu_data.x86_max_cores * sizeof(uint16_t)); > > ^~~~~~~~~~~~~ > > bl_get_data > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10: > > note: each undeclared identifier is reported only once for each > > function it appears in > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: > > In function ‘vangogh_read_sensor’: > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1320:11: > > error: ‘boot_cpu_data’ undeclared (first use in this function); did > > you mean ‘bl_get_data’? > > *size = boot_cpu_data.x86_max_cores * sizeof(uint16_t); > > ^~~~~~~~~~~~~ > > bl_get_data > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: > > In function ‘vangogh_od_edit_dpm_table’: > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1460:19: > > error: ‘boot_cpu_data’ undeclared (first use in this function); did > > you mean ‘bl_get_data’? > > if (input[0] >= boot_cpu_data.x86_max_cores) { > > ^~~~~~~~~~~~~ > > bl_get_data > > make[5]: *** [/home/airlied/devel/kernel/dim/src/scripts/Makefile.build:279: > > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.o] Error 1 > > > > > > Not sure using boot_cpu_data in a driver is that good an idea, maybe > > there is a better interface to get that sort of information, but even > > so it should build on arm. > > I'm not sure if there is a generic interface for this or not, but this > is for SOC power management on an APU, so it's only relevant to x86. > I'll send out a patch to fix the build. Looks like Ray already sent out the fix. I'll send a new PR once this is integrated. Thanks, Alex > > Alex > > > > > > Dave.
Hi Dave, Daniel, More new stuff for 5.12. The following changes since commit 044a48f420b9d3c19a135b821c34de5b2bee4075: drm/amdgpu: fix DRM_INFO flood if display core is not supported (bug 210921) (2021-01-08 15:18:57 -0500) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.12-2021-01-14 for you to fetch changes up to df1f0560d28f4895e2d61af826728efb61976f9f: drm/amd/display: Simplify bool comparison (2021-01-14 13:20:21 -0500) ---------------------------------------------------------------- amd-drm-next-5.12-2021-01-14: amdgpu: - W=1 fixes from Lee Jones - Enable GPU reset on Navy Flounder - Kernel doc fixes - SMU workload profile fixes for APUs - Display updates - SR-IOV fixes - Vangogh SMU feature enablment and bug fixes - GPU reset support for Vangogh - Misc cleanups ---------------------------------------------------------------- Alex Deucher (5): MAINTAINERS: update radeon/amdgpu/amdkfd git trees drm/amdgpu: add mode2 reset support for vangogh drm/amdgpu/nv: add mode2 reset handling drm/amdgpu: fix mode2 reset sequence for vangogh drm/amdgpu: Enable GPU reset for vangogh Aric Cyr (2): drm/amd/display: 3.2.117 drm/amd/display: 3.2.118 Bhawanpreet Lakha (2): drm/amd/display: enable HUBP blank behaviour drm/amd/display: Fix deadlock during gpu reset v3 Charlene Liu (1): drm/amd/display: change SMU repsonse timeout to 2s Chiawen Huang (1): drm/amd/display: removed unnecessary check when dpp clock increasing Colin Ian King (1): drm/amdgpu: Add missing BOOTUP_DEFAULT to profile_name[] Emily.Deng (1): drm/amdgpu: Decrease compute timeout to 10 s for sriov multiple VF Huang Rui (10): drm/amd/pm: remove vcn/jpeg powergating feature checking for vangogh drm/amd/pm: enhance the real response for smu message (v2) drm/amd/pm: clean up get_allowed_feature_mask function drm/amd/pm: initial feature_enabled/feature_support bitmap for vangogh drm/amd/pm: don't mark all apu as true on feature mask drm/amdgpu: revise the mode2 reset for vangogh drm/amd/pm: fix the return value of pm message drm/amd/pm: implement the processor clocks which read by metric drm/amd/pm: implement processor fine grain feature for vangogh (v3) drm/amdgpu: fix vram type and bandwidth error for DDR5 and DDR4 Jack Zhang (1): drm/amdgpu/sriov Stop data exchange for wholegpu reset Jacky Liao (1): drm/amd/display: Fix assert being hit with GAMCOR memory shut down Jeremy Cline (1): drm/amdkfd: Fix out-of-bounds read in kdf_create_vcrat_image_cpu() Jiansong Chen (1): drm/amdgpu: enable gpu recovery for navy_flounder Jinzhou Su (4): drm/amd/pm: Add GFXOFF interface for Vangogh drm/amd/pm: Enable GfxOff for Vangogh drm/amdgpu: Add Secure Display TA header file drm/amdgpu: Add secure display TA interface Jun Lei (1): drm/amd/display: implement T12 compliance Lee Jones (90): drm/amd/amdgpu/amdgpu_ih: Update 'amdgpu_ih_decode_iv_helper()'s function header drm/amd/amdgpu/vega20_ih: Add missing descriptions for 'ih' and fix spelling error drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0: Provide description of 'call_back_func' drm/amd/pm/powerplay/hwmgr/ppatomctrl: Fix documentation for 'mpll_param' drm/amd/pm/powerplay/hwmgr/vega12_hwmgr: Fix legacy function header formatting drm/amd/pm/powerplay/hwmgr/vega20_hwmgr: Fix legacy function header formatting drm/amd/pm/powerplay/hwmgr/smu7_hwmgr: Fix formatting and spelling issues drm/amd/pm/powerplay/hwmgr/hwmgr: Move prototype into shared header drm/amd/pm/powerplay/hwmgr/vega10_hwmgr: Fix a bunch of kernel-doc formatting issues drm/amd/display/dc/basics/conversion: Demote obvious kernel-doc abuse drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs: Demote non-kernel-doc comment blocks drm/amd/display/dc/bios/command_table_helper: Fix kernel-doc formatting drm/amd/display/dc/bios/command_table_helper2: Fix legacy formatting problems drm/amd/display/dc/bios/bios_parser: Make local functions static drm/amd/display/dc/bios/bios_parser: Fix a whole bunch of legacy doc formatting drm/amd/display/dc/bios/bios_parser2: Fix some formatting issues and missing parameter docs drm/amd/display/dc/dce/dce_audio: Make function invoked by reference static drm/amd/display/dc/dce/dce_stream_encoder: Remove unused variable 'regval' drm/amd/display/dc/dce/dce_link_encoder: Make functions invoked by reference static drm/amd/display/dc/dce/dce_clock_source: Fix formatting/spelling of worthy function headers drm/amd/pm/powerplay/hwmgr/vega10_hwmgr: Fix worthy function headers, demote barely documented one drm/amd/display/dc/dce/dce_transform: Remove 3 unused/legacy variables drm/amd/display/dc/dce/dce_dmcu: Staticify local function call 'dce_dmcu_load_iram' drm/amd/display/dc/dce/dce_dmcu: Move 'abm_gain_stepsize' to only source file it's used in drm/amd/display/dc/dce/dce_opp: Make local functions and ones invoked by reference static drm/amd/display/dc/dce/dce_aux: Remove unused function 'get_engine_type' drm/amd/display/dc/bios/bios_parser: Fix misspelling of function parameter drm/amd/display/dc/dce/dce_i2c_hw: Make functions called by reference static drm/amd/display/dc/dce/dce_i2c_sw: Make a bunch of local functions static drm/amd/display/dc/dce/dce_panel_cntl: Remove unused variables 'bl_pwm_cntl' and 'pwm_period_cntl' drm/amd/display/dc/dce/dmub_psr: Demote non-conformant kernel-doc headers drm/amd/display/dc/gpio/hw_factory: Delete unused function 'dal_hw_factory_destroy' drm/amd/display/dc/dce/dce_aux: Mark 'dce_aux_transfer_raw' as __maybe_unused drm/amd/display/dc/dce/dce_link_encoder: Remove unused variable 'value0' drm/amd/display/dc/gpio/hw_ddc: Remove unused variable 'reg2' drm/amd/display/dc/dce/dce_opp: Demote non-compliant kernel-doc headers drm/amd/display/dc/dce/dce_transform: Demote kernel-doc abuse drm/amd/display/dc/gpio/diagnostics/hw_translate_diag: Include our own header containing prototypes drm/amd/display/dc/irq/irq_service: Make local function static drm/amd/display/dc/gpio/diagnostics/hw_factory_diag: Fix struct declared inside parameter list error drm/amd/display/dc/gpio/diagnostics/hw_factory_diag: Include our own header containing prototypes drm/amd/display/dc/dce120/dce120_hw_sequencer: Encompass defines in same clause as their use drm/amd/display/dc/dce120/dce120_timing_generator: drm/amd/display/dc/dce120/Makefile: Ignore -Woverride-init warning drm/amd/display/dc/dce120/dce120_resource: Staticify local functions drm/amd/display/dc/dce120/dce120_timing_generator: Demote non-kerneldoc headers drm/amd/display/dc/dce/dce_aux: Remove duplicate line causing 'field overwritten' issue drm/amd/display/dc/dce112/Makefile: Ignore -Woverride-init warning drm/amd/display/dc/dce/dce_opp: Remove duplicate entries causing 'field overwritten' issues drm/amd/display/dc/dce110/dce110_timing_generator: Remove unused variable 'value_crtc_vtotal' drm/amd/display/dc/dce110/dce110_compressor: Remove unused function 'dce110_get_required_compressed_surfacesize drm/amd/display/dc/dce110/dce110_hw_sequencer: Demote non-conformant kernel-doc header drm/amd/display/dc/dce110/dce110_mem_input_v: Make local functions static drm/amd/display/dc/dce120/dce120_timing_generator: Remove unused function 'dce120_timing_generator_get_position' drm/amd/display/dc/dce110/dce110_timing_generator: Demote kernel-doc abuses to standard function headers drm/amd/display/dc/dce110/dce110_compressor: Strip out unused function 'controller_id_to_index' drm/amd/display/dc/dce112/dce112_resource: Make local functions and ones called by reference static drm/amd/display/dc/dce110/dce110_timing_generator_v: Demote kernel-doc abuse and line up comments drm/amd/display/dc/dce110/dce110_mem_input_v: Include our own header, containing prototypes drm/amd/display/dc/dce110/Makefile: Ignore -Woverride-init warning drm/amd/display/dc/dce110/dce110_resource: Make local functions invoked by reference static drm/amd/display/dc/dce110/dce110_transform_v: Demote kernel-doc abuse drm/amd/display/dc/dce60/dce60_timing_generator: Make 'dce60_configure_crc' invoked by reference static drm/amd/display/dc/dce100/dce100_resource: Make local functions and ones called by reference static drm/amd/display/dc/dce60/dce60_resource: Make local functions static drm/amd/display/dc/core/dc_surface: Demote kernel-doc abuse drm/amd/display/dc/core/dc_stream: Demote non-conformant kernel-doc headers drm/amd/display/dc/calcs/dce_calcs: Remove unused variables 'v_filter_init_mode' and 'sclk_lvl' drm/amd/display/dc/calcs/dce_calcs: Demote non-conformant kernel-doc function headers drm/amd/display/dc/dc_helper: Include our own header, containing prototypes drm/amd/include/renoir_ip_offset: Mark top-level IP_BASE as __maybe_unused drm/amd/display/dmub/src/dmub_dcn30: Include our own header containing prototypes drm/amd/display/modules/power/power_helpers: Staticify local functions drm/amd/display/modules/info_packet/info_packet: Correct kernel-doc formatting drm/amd/display/dc/core/dc_resource: Staticify local functions drm/amd/display/dc/core/dc_link: Remove unused variable 'status' drm/amd/display/dc/core/dc_link_dp: Staticify local function 'linkRateInKHzToLinkRateMultiplier' drm/amd/display/dc/dce112/dce112_resource: Include our own header file containing prototypes drm/amd/display/dc/core/dc: Staticise local function 'apply_ctx_interdependent_lock' drm/amd/display/dc/dce100/Makefile: Ignore -Woverride-init warning drm/amd/display/dc/dce100/dce100_resource: Include our own header containing prototypes drm/amd/display/dc/dce60/Makefile: Ignore -Woverride-init warning drm/amd/display/dc/dce80/Makefile: Ignore -Woverride-init warning drm/amd/display/dc/dce80/dce80_resource: Include our own header containing prototypes drm/amd/display/dc/dce60/dce60_resource: Include our own header containing prototypes drm/amd/display/dc/core/dc_link: Move some local data from the stack to the heap drm/amd/display/dc/core/dc_link_dp: Mark 'result_write_min_hblank' as __maybe_unused drm/amd/display/dc/core/dc: Fix a bunch of documentation misdemeanours drm/amd/display/dc/core/dc_resource: Demote some kernel-doc abuses drm/amd/display/dc/core/dc_link: Fix a couple of function documentation issues Lewis Huang (1): drm/amd/display: Separate fec debug flag and monitor patch Li, Roman (1): drm/amd/display: disable dcn10 pipe split by default Likun Gao (1): drm/amdgpu: set power brake sequence Lukas Bulwahn (1): drm/amd/display: tweak the kerneldoc for active_vblank_irq_count Mike Hsieh (1): drm/amd/display: Remove unused P010 debug flag Nikola Cornij (1): drm/amd/display: Add a missing DCN3.01 API mapping Prike Liang (1): drm/amdgpu: add green_sardine device id (v2) Qingqing Zhuo (1): drm/amd/display: NULL pointer hang Raymond Yang (1): drm/amd/display: fix seamless boot stream adding algorithm Rodrigo Siqueira (4): Revert "drm/amd/display: Fixed Intermittent blue screen on OLED panel" Revert "drm/amd/display: Fix unused variable warning" Revert "drm/amdgpu/disply: fix documentation warnings in display manager" Revert "drm/amd/display: Expose new CRC window property" Souptick Joarder (1): drm: amdgpu: pm: Mark vangogh_clk_dpm_is_enabled() as static Wayne Lin (1): drm/amd/display: Fix to be able to stop crc calculation Wesley Chalmers (5): drm/amd/display: Initialize stack variable drm/amd/display: HUBP_IN_BLANK for DCN30 drm/amd/display: Unblank hubp based on plane visibility drm/amd/display: New path for enabling DPG drm/amd/display: New sequence for HUBP blank Xiaojian Du (5): drm/amd/pm: support the function to change power profile mode for vangogh drm/amd/pm: fix one superfluous error for renoir drm/amd/pm: add the workload map for vangogh drm/amd/pm: modify the fine grain tuning function for Renoir drm/amd/pm: modify the fine grain tuning function for vangogh Yang Li (4): drm/amd/display: Simplify bool comparison drm/amd/display: Simplify bool comparison drm/amd/display: Simplify bool comparison drm/amd/display: Simplify bool comparison Yu-ting Shen (1): drm/amd/display: doesn't reprogram AMD OUI ZhiJie.Zhang (1): drm/amdgpu: Repeat assignment to max_slave_planes chen gong (1): drm/amdgpu/gfx10: add updated GOLDEN_TSC_COUNT_UPPER/LOWER register offsets for VGH mengwang (1): drm/amdgpu: add new device id for Renior MAINTAINERS | 4 +- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 53 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 191 +++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 17 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 176 ++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h | 36 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 48 +++- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 1 + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 1 + drivers/gpu/drm/amd/amdgpu/nv.c | 46 ++- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 12 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h | 154 ++++++++++ drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 11 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 152 ++-------- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 40 +-- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 54 +--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 5 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +- drivers/gpu/drm/amd/display/dc/basics/conversion.c | 9 +- drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 20 +- drivers/gpu/drm/amd/display/dc/basics/dc_common.h | 4 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 119 ++++---- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 29 +- .../drm/amd/display/dc/bios/command_table_helper.c | 20 +- .../amd/display/dc/bios/command_table_helper2.c | 20 +- drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 13 +- .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 3 +- .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 48 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 62 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 53 ++-- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 42 ++- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 5 +- drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 2 +- drivers/gpu/drm/amd/display/dc/dc.h | 3 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 3 + drivers/gpu/drm/amd/display/dc/dc_helper.c | 1 + drivers/gpu/drm/amd/display/dc/dc_link.h | 8 + drivers/gpu/drm/amd/display/dc/dc_stream.h | 11 + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 8 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 1 - .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 57 ++-- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 2 - drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 4 +- drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 9 +- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 9 +- drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 24 +- drivers/gpu/drm/amd/display/dc/dce/dce_opp.h | 2 - .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 8 +- .../drm/amd/display/dc/dce/dce_stream_encoder.c | 3 +- drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 15 +- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 22 +- drivers/gpu/drm/amd/display/dc/dce100/Makefile | 2 + .../drm/amd/display/dc/dce100/dce100_resource.c | 18 +- drivers/gpu/drm/amd/display/dc/dce110/Makefile | 2 + .../drm/amd/display/dc/dce110/dce110_compressor.c | 55 ---- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 33 ++- .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 17 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 17 +- .../display/dc/dce110/dce110_timing_generator.c | 76 +++-- .../display/dc/dce110/dce110_timing_generator_v.c | 19 +- .../drm/amd/display/dc/dce110/dce110_transform_v.c | 19 +- drivers/gpu/drm/amd/display/dc/dce112/Makefile | 2 + .../drm/amd/display/dc/dce112/dce112_resource.c | 20 +- drivers/gpu/drm/amd/display/dc/dce120/Makefile | 2 + .../amd/display/dc/dce120/dce120_hw_sequencer.c | 2 +- .../drm/amd/display/dc/dce120/dce120_resource.c | 6 +- .../display/dc/dce120/dce120_timing_generator.c | 99 ++----- drivers/gpu/drm/amd/display/dc/dce60/Makefile | 2 + .../gpu/drm/amd/display/dc/dce60/dce60_resource.c | 18 +- .../amd/display/dc/dce60/dce60_timing_generator.c | 4 +- drivers/gpu/drm/amd/display/dc/dce80/Makefile | 2 + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 2 + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 2 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 36 ++- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 5 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 11 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 1 + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 7 - drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 1 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 70 ++++- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 4 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 2 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 1 + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 1 + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 2 +- .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 11 +- .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 44 +-- .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6 +- .../display/dc/gpio/diagnostics/hw_factory_diag.c | 1 + .../display/dc/gpio/diagnostics/hw_factory_diag.h | 2 + .../dc/gpio/diagnostics/hw_translate_diag.c | 1 + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 7 +- drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 14 - drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + .../drm/amd/display/dc/inc/hw/timing_generator.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 5 + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 1 + .../amd/display/modules/info_packet/info_packet.c | 13 +- .../drm/amd/display/modules/power/power_helpers.c | 6 +- drivers/gpu/drm/amd/include/kgd_pp_interface.h | 2 + drivers/gpu/drm/amd/include/renoir_ip_offset.h | 2 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 30 +- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 9 +- drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c | 2 +- .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 4 +- .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 1 + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 4 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 137 +++++---- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.h | 1 + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 11 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 11 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 20 +- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 1 + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 314 ++++++++++++++++----- drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 24 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 58 ++-- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 2 + 138 files changed, 1923 insertions(+), 1091 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h create mode 100644 drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h