drm/amdgpu/pp: remove dead vega12 code
Subsystems (2)
PATCH 1/3 drm/amdgpu/pp: remove dead vega12 code
Commented out.
--- .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 29 ---------------------- 1 file changed, 29 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c +0 -29
@@ -343,29 +343,6 @@ static int vega12_set_tools_address(struct pp_hwmgr *hwmgr)return 0 ; } -#if 0 /* tentatively remove */ -static int vega12_verify_smc_interface (struct pp_hwmgr *hwmgr) -{ -uint32_t smc_driver_if_version; - -PP_ASSERT_WITH_CODE (!vega12_send_msg_to_smc (hwmgr, - PPSMC_MSG_GetDriverIfVersion), -"Attempt to get SMC IF Version Number Failed!" , - return -EINVAL ); -vega12_read_arg_from_smc (hwmgr, &smc_driver_if_version); - -if (smc_driver_if_version !=SMU9_DRIVER_IF_VERSION ) { -pr_err ("Your firmware(0x%x) doesn't match \ -SMU9_DRIVER_IF_VERSION(0x%x). \ -Please update your firmware!\n" , - smc_driver_if_version,SMU9_DRIVER_IF_VERSION ); -return -EINVAL ; - } - -return 0 ; -} -#endif -static int vega12_smu_init (struct pp_hwmgr *hwmgr) {struct vega12_smumgr *priv;
@@ -517,12 +494,6 @@ static int vega12_start_smu(struct pp_hwmgr *hwmgr)"SMC is not running!" , return -EINVAL); -#if 0 /* tentatively remove */ -PP_ASSERT_WITH_CODE (!vega12_verify_smc_interface (hwmgr), -"Failed to verify SMC interface!" , - return -EINVAL ); -#endif -vega12_set_tools_address (hwmgr);return 0 ;
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20180712202306.26762-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/3 drm/amdgpu/pp: split out common smumgr smu9 code
Split out the shared smumgr code for vega10 and 12 so we don't have duplicate code for both.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 44 ++--- .../gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 8 +- drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.c | 150 ++++++++++++++++ drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.h | 32 ++++ .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 168 ++---------------- .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 191 +++------------------ .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.h | 1 - 8 files changed, 242 insertions(+), 354 deletions(-) create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.c create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.h
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c +15 -29
@@ -472,7 +472,7 @@ static int vega12_get_number_of_dpm_level(struct pp_hwmgr *hwmgr,"[GetNumOfDpmLevel] failed to get dpm levels!" , return ret); -vega12_read_arg_from_smc (hwmgr, num_of_levels); + *num_of_levels =smum_get_argument (hwmgr);PP_ASSERT_WITH_CODE (*num_of_levels >0 ,"[GetNumOfDpmLevel] number of clk levels is invalid!" , return -EINVAL );
@@ -494,11 +494,7 @@ static int vega12_get_dpm_frequency_by_index(struct pp_hwmgr *hwmgr,"[GetDpmFrequencyByIndex] Failed to get dpm frequency from SMU!" , return -EINVAL); - result =vega12_read_arg_from_smc (hwmgr, clock); - -PP_ASSERT_WITH_CODE (*clock !=0 , -"[GetDPMFrequencyByIndex] Failed to get dpm frequency by index.!" , - return -EINVAL ); + *clock =smum_get_argument (hwmgr);return result; }
@@ -879,21 +875,21 @@ static int vega12_get_all_clock_ranges_helper(struct pp_hwmgr *hwmgr,smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetMaxDpmFreq, (clkid <<16 )) ==0 ,"[GetClockRanges] Failed to get max ac clock from SMC!" , return -EINVAL); -vega12_read_arg_from_smc (hwmgr, &(clock->ACMax)); + clock->ACMax =smum_get_argument (hwmgr);/* AC Min */ PP_ASSERT_WITH_CODE (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetMinDpmFreq, (clkid <<16 )) ==0 ,"[GetClockRanges] Failed to get min ac clock from SMC!" , return -EINVAL ); -vega12_read_arg_from_smc (hwmgr, &(clock->ACMin)); + clock->ACMin =smum_get_argument (hwmgr);/* DC Max */ PP_ASSERT_WITH_CODE (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetDcModeMaxDpmFreq, (clkid <<16 )) ==0 ,"[GetClockRanges] Failed to get max dc clock from SMC!" , return -EINVAL ); -vega12_read_arg_from_smc (hwmgr, &(clock->DCMax)); + clock->DCMax =smum_get_argument (hwmgr);return 0 ; }
@@ -1214,7 +1210,7 @@ static int vega12_get_gpu_power(struct pp_hwmgr *hwmgr, uint32_t *query)"Failed to get current package power!" , return -EINVAL); -vega12_read_arg_from_smc (hwmgr, &value); + value =smum_get_argument (hwmgr);/* power value is an integer */ *query = value <<8 ;#endif
@@ -1230,11 +1226,8 @@ static int vega12_get_current_gfx_clk_freq(struct pp_hwmgr *hwmgr, uint32_t *gfxPP_ASSERT_WITH_CODE (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetDpmClockFreq, (PPCLK_GFXCLK <<16 )) ==0 ,"[GetCurrentGfxClkFreq] Attempt to get Current GFXCLK Frequency Failed!" , - return -1 ); -PP_ASSERT_WITH_CODE ( -vega12_read_arg_from_smc (hwmgr, &gfx_clk) ==0 , -"[GetCurrentGfxClkFreq] Attempt to read arg from SMC Failed" , - return -1 ); + return -EINVAL ); + gfx_clk =smum_get_argument (hwmgr); *gfx_freq = gfx_clk *100 ;
@@ -1250,11 +1243,8 @@ static int vega12_get_current_mclk_freq(struct pp_hwmgr *hwmgr, uint32_t *mclk_fPP_ASSERT_WITH_CODE (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetDpmClockFreq, (PPCLK_UCLK <<16 )) ==0 ,"[GetCurrentMClkFreq] Attempt to get Current MCLK Frequency Failed!" , - return -1 ); -PP_ASSERT_WITH_CODE ( -vega12_read_arg_from_smc (hwmgr, &mem_clk) ==0 , -"[GetCurrentMClkFreq] Attempt to read arg from SMC Failed" , - return -1 ); + return -EINVAL ); + mem_clk =smum_get_argument (hwmgr); *mclk_freq = mem_clk *100 ;
@@ -1271,16 +1261,12 @@ static int vega12_get_current_activity_percent(#if 0 ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetAverageGfxActivity,0 );if (!ret) { - ret =vega12_read_arg_from_smc (hwmgr, ¤t_activity); -if (!ret) { -if (current_activity >100 ) { -PP_ASSERT (false, -"[GetCurrentActivityPercent] Activity Percentage Exceeds 100!" ); - current_activity =100 ; - } - }else + current_activity =smum_get_argument (hwmgr); +if (current_activity >100 ) {PP_ASSERT (false, -"[GetCurrentActivityPercent] Attempt To Read Average Graphics Activity from SMU Failed!" ); +"[GetCurrentActivityPercent] Activity Percentage Exceeds 100!" ); + current_activity =100 ; + } }else PP_ASSERT (false,"[GetCurrentActivityPercent] Attempt To Send Get Average Graphics Activity to SMU Failed!" );
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c +3 -5
@@ -34,11 +34,9 @@ static int vega12_get_current_rpm(struct pp_hwmgr *hwmgr, uint32_t *current_rpm)PP_ASSERT_WITH_CODE (!smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentRpm),"Attempt to get current RPM from SMC Failed!" , - return -1 ); -PP_ASSERT_WITH_CODE (!vega12_read_arg_from_smc (hwmgr, - current_rpm), -"Attempt to read current RPM from SMC Failed!" , - return -1 ); + return -EINVAL ); + *current_rpm =smum_get_argument (hwmgr); +return 0 ; }
drivers/gpu/drm/amd/powerplay/smumgr/Makefile +1 -1
@@ -26,7 +26,7 @@ SMU_MGR = smumgr.o smu8_smumgr.o tonga_smumgr.o fiji_smumgr.o \ polaris10_smumgr.o iceland_smumgr.o \ smu7_smumgr.o vega10_smumgr.o smu10_smumgr.o ci_smumgr.o \ - vega12_smumgr.o vegam_smumgr.o + vega12_smumgr.o vegam_smumgr.o smu9_smumgr.o AMD_PP_SMUMGR = $(addprefix $(AMD_PP_PATH)/smumgr/,$(SMU_MGR))
drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.c new file +150 -0
150 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.h new file +32 -0
@@ -0,0 +1,32 @@ +/* +* Copyright 2018 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ +#ifndef _SMU9_SMUMANAGER_H_ +#define _SMU9_SMUMANAGER_H_ + +bool smu9_is_smc_ram_running (struct pp_hwmgr *hwmgr); +int smu9_send_msg_to_smc (struct pp_hwmgr *hwmgr,uint16_t msg); +int smu9_send_msg_to_smc_with_parameter (struct pp_hwmgr *hwmgr, +uint16_t msg,uint32_t parameter); +int smu9_get_argument (struct pp_hwmgr *hwmgr); + +#endif
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +19 -149
241 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c +22 -169
280 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.h +0 -1
@@ -48,7 +48,6 @@ struct vega12_smumgr {#define SMU_FEATURES_HIGH_MASK 0xFFFFFFFF00000000#define SMU_FEATURES_HIGH_SHIFT 32 -int vega12_read_arg_from_smc (struct pp_hwmgr *hwmgr,uint32_t *arg);int vega12_copy_table_from_smc (struct pp_hwmgr *hwmgr,uint8_t *table,int16_t table_id); int vega12_copy_table_to_smc(struct pp_hwmgr *hwmgr,
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdgpu/pp: switch smu callback type for get_argument()
In reply to a message not in the archivereturn a uint32_t rather than an int to properly reflect what the function does.
--- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 2 +- drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 4 ++-- drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.h | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +1 -1
@@ -194,7 +194,7 @@ struct pp_smumgr_func {int (*request_smu_load_fw)(struct pp_hwmgr *hwmgr);int (*request_smu_load_specific_fw)(struct pp_hwmgr *hwmgr,uint32_t firmware); -int (*get_argument)(struct pp_hwmgr *hwmgr); +uint32_t (*get_argument)(struct pp_hwmgr *hwmgr);int (*send_msg_to_smc)(struct pp_hwmgr *hwmgr,uint16_t msg);int (*send_msg_to_smc_with_parameter)(struct pp_hwmgr *hwmgr,uint16_t msg,uint32_t parameter);
drivers/gpu/drm/amd/powerplay/inc/smumgr.h +1 -1
@@ -80,7 +80,7 @@ enum SMU10_TABLE_ID { SMU10_CLOCKTABLE, }; -extern int smum_get_argument (struct pp_hwmgr *hwmgr); +extern uint32_t smum_get_argument (struct pp_hwmgr *hwmgr);extern int smum_download_powerplay_table (struct pp_hwmgr *hwmgr,void **table);
drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c +1 -1
@@ -68,7 +68,7 @@ static int smu10_send_msg_to_smc_without_waiting(struct pp_hwmgr *hwmgr,return 0 ; } -static int smu10_read_arg_from_smc (struct pp_hwmgr *hwmgr) +static uint32_t smu10_read_arg_from_smc (struct pp_hwmgr *hwmgr) {struct amdgpu_device *adev = hwmgr->adev;
drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +2 -2
@@ -52,10 +52,10 @@ static const enum smu8_scratch_entry firmware_list[] = { SMU8_SCRATCH_ENTRY_UCODE_ID_RLC_G, }; -static int smu8_get_argument (struct pp_hwmgr *hwmgr) +static uint32_t smu8_get_argument (struct pp_hwmgr *hwmgr) {if (hwmgr ==NULL || hwmgr->device ==NULL ) -return -EINVAL ; +return 0 ;return cgs_read_register (hwmgr->device, mmSMU_MP1_SRBM2P_ARG_0);
drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.c +1 -1
@@ -142,7 +142,7 @@ int smu9_send_msg_to_smc_with_parameter(struct pp_hwmgr *hwmgr,return 0 ; } -int smu9_get_argument (struct pp_hwmgr *hwmgr) +uint32_t smu9_get_argument (struct pp_hwmgr *hwmgr) {struct amdgpu_device *adev = hwmgr->adev;
drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.h +1 -1
@@ -27,6 +27,6 @@ bool smu9_is_smc_ram_running(struct pp_hwmgr *hwmgr);int smu9_send_msg_to_smc (struct pp_hwmgr *hwmgr,uint16_t msg);int smu9_send_msg_to_smc_with_parameter (struct pp_hwmgr *hwmgr,uint16_t msg,uint32_t parameter); -int smu9_get_argument (struct pp_hwmgr *hwmgr); +uint32_t smu9_get_argument (struct pp_hwmgr *hwmgr);#endif
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +1 -1
@@ -96,7 +96,7 @@ int smum_process_firmware_header(struct pp_hwmgr *hwmgr)return 0 ; } -int smum_get_argument (struct pp_hwmgr *hwmgr) +uint32_t smum_get_argument (struct pp_hwmgr *hwmgr) {if (NULL != hwmgr->smumgr_funcs->get_argument)return hwmgr->smumgr_funcs->get_argument (hwmgr);
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20180712202306.26762-3-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Zhu, Rex
Reviewed-by Rex ZhuRe: [PATCH 3/3] drm/amdgpu/pp: switch smu callback type for get_argument()
Series is:
Best Regards
Rex
?? Outlook for Android<https://aka.ms/ghei36>
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Alex Deucher <[email protected]>
Sent: Friday, July 13, 2018 4:23:06 AM
To: [email protected]
Cc: Deucher, Alexander
Subject: [PATCH 3/3] drm/amdgpu/pp: switch smu callback type for get_argument()
return a uint32_t rather than an int to properly reflect what the function does.
--- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 2 +- drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 4 ++-- drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.h | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +1 -1
@@ -194,7 +194,7 @@ struct pp_smumgr_func {int (*request_smu_load_fw)(struct pp_hwmgr *hwmgr);int (*request_smu_load_specific_fw)(struct pp_hwmgr *hwmgr,uint32_t firmware); -int (*get_argument)(struct pp_hwmgr *hwmgr); +uint32_t (*get_argument)(struct pp_hwmgr *hwmgr);int (*send_msg_to_smc)(struct pp_hwmgr *hwmgr,uint16_t msg);int (*send_msg_to_smc_with_parameter)(struct pp_hwmgr *hwmgr,uint16_t msg,uint32_t parameter);
drivers/gpu/drm/amd/powerplay/inc/smumgr.h +1 -1
@@ -80,7 +80,7 @@ enum SMU10_TABLE_ID { SMU10_CLOCKTABLE, }; -extern int smum_get_argument (struct pp_hwmgr *hwmgr); +extern uint32_t smum_get_argument (struct pp_hwmgr *hwmgr);extern int smum_download_powerplay_table (struct pp_hwmgr *hwmgr,void **table);
drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c +1 -1
@@ -68,7 +68,7 @@ static int smu10_send_msg_to_smc_without_waiting(struct pp_hwmgr *hwmgr,return 0 ; } -static int smu10_read_arg_from_smc (struct pp_hwmgr *hwmgr) +static uint32_t smu10_read_arg_from_smc (struct pp_hwmgr *hwmgr) {struct amdgpu_device *adev = hwmgr->adev;
drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +2 -2
@@ -52,10 +52,10 @@ static const enum smu8_scratch_entry firmware_list[] = { SMU8_SCRATCH_ENTRY_UCODE_ID_RLC_G, }; -static int smu8_get_argument (struct pp_hwmgr *hwmgr) +static uint32_t smu8_get_argument (struct pp_hwmgr *hwmgr) {if (hwmgr ==NULL || hwmgr->device ==NULL ) -return -EINVAL ; +return 0 ;return cgs_read_register (hwmgr->device, mmSMU_MP1_SRBM2P_ARG_0);
drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.c +1 -1
@@ -142,7 +142,7 @@ int smu9_send_msg_to_smc_with_parameter(struct pp_hwmgr *hwmgr,return 0 ; } -int smu9_get_argument (struct pp_hwmgr *hwmgr) +uint32_t smu9_get_argument (struct pp_hwmgr *hwmgr) {struct amdgpu_device *adev = hwmgr->adev;
drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.h +1 -1
@@ -27,6 +27,6 @@ bool smu9_is_smc_ram_running(struct pp_hwmgr *hwmgr);int smu9_send_msg_to_smc (struct pp_hwmgr *hwmgr,uint16_t msg);int smu9_send_msg_to_smc_with_parameter (struct pp_hwmgr *hwmgr,uint16_t msg,uint32_t parameter); -int smu9_get_argument (struct pp_hwmgr *hwmgr); +uint32_t smu9_get_argument (struct pp_hwmgr *hwmgr);#endif
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +1 -1
@@ -96,7 +96,7 @@ int smum_process_firmware_header(struct pp_hwmgr *hwmgr)return 0 ; } -int smum_get_argument (struct pp_hwmgr *hwmgr) +uint32_t smum_get_argument (struct pp_hwmgr *hwmgr) {if (NULL != hwmgr->smumgr_funcs->get_argument)return hwmgr->smumgr_funcs->get_argument (hwmgr);
--
2.13.6
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Acked-byAm 12.07.2018 um 22:23 schrieb Alex Deucher:
Quoted 3 lines
Commented out.
Signed-off-by Alex Deucher <[email protected]>
Quoted 41 lines
--- .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 29 ---------------------- 1 file changed, 29 deletions(-)drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c +0
-23@@ -343,29 +343,6 @@ static int vega12_set_tools_address(struct pp_hwmgr *hwmgr)return 0 ; } -#if 0 /* tentatively remove */ -static int vega12_verify_smc_interface (struct pp_hwmgr *hwmgr) -{ -uint32_t smc_driver_if_version; - -PP_ASSERT_WITH_CODE (!vega12_send_msg_to_smc (hwmgr, - PPSMC_MSG_GetDriverIfVersion), -"Attempt to get SMC IF Version Number Failed!" , - return -EINVAL ); -vega12_read_arg_from_smc (hwmgr, &smc_driver_if_version); - -if (smc_driver_if_version !=SMU9_DRIVER_IF_VERSION ) { -pr_err ("Your firmware(0x%x) doesn't match \ -SMU9_DRIVER_IF_VERSION(0x%x). \ -Please update your firmware!\n" , - smc_driver_if_version,SMU9_DRIVER_IF_VERSION ); -return -EINVAL ; - } - -return 0 ; -} -#endif -static int vega12_smu_init (struct pp_hwmgr *hwmgr) {struct vega12_smumgr *priv;@@ -517,12 +494,6 @@ static int vega12_start_smu(struct pp_hwmgr *hwmgr)"SMC is not running!" , return -EINVAL);
drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c static int vega12_start_smu(struct pp_hwmgr *hwmgr) · line 499
Quoted 10 lines
drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c +0
-6-#if 0 /* tentatively remove */ -PP_ASSERT_WITH_CODE (!vega12_verify_smc_interface (hwmgr), -"Failed to verify SMC interface!" , - return -EINVAL ); -#endif -vega12_set_tools_address (hwmgr);return 0 ;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx