drm/amd/pm: add support for WINDOW3D profile mode on SMU13.0.0
Subsystems (3)
PATCH 1/2 drm/amd/pm: add support for WINDOW3D profile mode on SMU13.0.0
Add the support for WINDOW3D profile mode as for other profile modes.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +3 -2
@@ -240,6 +240,7 @@ static struct cmn2asic_mapping smu_v13_0_0_workload_map[PP_SMC_POWER_PROFILE_COUWORKLOAD_MAP (PP_SMC_POWER_PROFILE_VR ,WORKLOAD_PPLIB_VR_BIT ),WORKLOAD_MAP (PP_SMC_POWER_PROFILE_COMPUTE ,WORKLOAD_PPLIB_COMPUTE_BIT ),WORKLOAD_MAP (PP_SMC_POWER_PROFILE_CUSTOM ,WORKLOAD_PPLIB_CUSTOM_BIT ), + WORKLOAD_MAP(PP_SMC_POWER_PROFILE_WINDOW3D, WORKLOAD_PPLIB_WINDOW_3D_BIT), }; static const uint8_t smu_v13_0_0_throttler_map[] = {
@@ -1544,7 +1545,7 @@ static int smu_v13_0_0_get_power_profile_mode(struct smu_context *smu, title[0 ], title[1 ], title[2 ], title[3 ], title[4 ], title[5 ], title[6], title[7], title[8], title[9]); -for (i =0 ; i <=PP_SMC_POWER_PROFILE_CUSTOM ; i++) { +for (i =0 ; i <PP_SMC_POWER_PROFILE_COUNT ; i++) {/* conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT */ workload_type = smu_cmn_to_asic_specific_index(smu, CMN2ASIC_MAPPING_WORKLOAD,
@@ -1606,7 +1607,7 @@ static int smu_v13_0_0_set_power_profile_mode(struct smu_context *smu, smu->power_profile_mode = input[size]; -if (smu->power_profile_mode >PP_SMC_POWER_PROFILE_CUSTOM ) { +if (smu->power_profile_mode >=PP_SMC_POWER_PROFILE_COUNT ) {dev_err (smu->adev->dev,"Invalid power profile mode %d\n" , smu->power_profile_mode);return -EINVAL ; }
Signature · 1 line
2.34.1
PATCH 2/2 drm/amd/pm: bump SMU13.0.0 driver_if header to version 0x34
To fit the latest PMFW and suppress the warning emerged on driver loading.
--- .../gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 2 +- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 1 + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h +1 -1
@@ -522,9 +522,9 @@ typedef enum {TEMP_HOTSPOT_M ,TEMP_MEM ,TEMP_VR_GFX , +TEMP_VR_SOC ,TEMP_VR_MEM0 ,TEMP_VR_MEM1 , -TEMP_VR_SOC ,TEMP_VR_U ,TEMP_LIQUID0 , TEMP_LIQUID1,
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +1 -0
@@ -28,6 +28,7 @@#define SMU13_DRIVER_IF_VERSION_INV 0xFFFFFFFF#define SMU13_DRIVER_IF_VERSION_YELLOW_CARP 0x04#define SMU13_DRIVER_IF_VERSION_ALDE 0x08 +#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_0 0x34#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_4 0x07#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_5 0x04#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_10 0x32
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2 -0
@@ -290,6 +290,8 @@ int smu_v13_0_check_fw_version(struct smu_context *smu) smu->smc_driver_if_version =SMU13_DRIVER_IF_VERSION_ALDE ;break ;case IP_VERSION (13 ,0 ,0 ): + smu->smc_driver_if_version =SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_0 ; +break ;case IP_VERSION (13 ,0 ,10 ): smu->smc_driver_if_version =SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_10 ;break ;
Signature · 1 line
2.34.1
Re: [PATCH 2/2] drm/amd/pm: bump SMU13.0.0 driver_if header to version 0x34
[Public]
Series is:
________________________________
From: Quan, Evan <[email protected]>
Sent: Thursday, December 15, 2022 1:16 AM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 2/2] drm/amd/pm: bump SMU13.0.0 driver_if header to version 0x34
To fit the latest PMFW and suppress the warning emerged on driver loading.
--- .../gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 2 +- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 1 + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h +1 -1
@@ -522,9 +522,9 @@ typedef enum {TEMP_HOTSPOT_M ,TEMP_MEM ,TEMP_VR_GFX , +TEMP_VR_SOC ,TEMP_VR_MEM0 ,TEMP_VR_MEM1 , -TEMP_VR_SOC ,TEMP_VR_U ,TEMP_LIQUID0 , TEMP_LIQUID1,
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +1 -0
@@ -28,6 +28,7 @@#define SMU13_DRIVER_IF_VERSION_INV 0xFFFFFFFF#define SMU13_DRIVER_IF_VERSION_YELLOW_CARP 0x04#define SMU13_DRIVER_IF_VERSION_ALDE 0x08 +#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_0 0x34#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_4 0x07#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_5 0x04#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_10 0x32
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2 -0
@@ -290,6 +290,8 @@ int smu_v13_0_check_fw_version(struct smu_context *smu) smu->smc_driver_if_version =SMU13_DRIVER_IF_VERSION_ALDE ;break ;case IP_VERSION (13 ,0 ,0 ): + smu->smc_driver_if_version =SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_0 ; +break ;case IP_VERSION (13 ,0 ,10 ): smu->smc_driver_if_version =SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_10 ;break ;
--
2.34.1