diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2992-drm-amd-pp-Move-smu_version-to-common-code.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2992-drm-amd-pp-Move-smu_version-to-common-code.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2992-drm-amd-pp-Move-smu_version-to-common-code.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2992-drm-amd-pp-Move-smu_version-to-common-code.patch new file mode 100644 index 00000000..f165fb2d --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2992-drm-amd-pp-Move-smu_version-to-common-code.patch @@ -0,0 +1,71 @@ +From 752bca4a88e228f9342289778f4a3f44a4ba5fe1 Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Tue, 19 Dec 2017 14:04:24 +0800 +Subject: [PATCH 2992/4131] drm/amd/pp: Move smu_version to common code + +Move the smu_version to struct hwmgr, so it can be shared +by other asics. + +Change-Id: I5c300e406a4e3dd8e17422eccaa2c5cf1a2b1b33 +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> +--- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 8 ++++---- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 1 - + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +index 00e05ac..5f9c3ef 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +@@ -426,9 +426,9 @@ static void vega10_init_dpm_defaults(struct pp_hwmgr *hwmgr) + data->smu_features[GNLD_VR0HOT].supported = true; + + smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetSmuVersion); +- vega10_read_arg_from_smc(hwmgr, &(data->smu_version)); ++ vega10_read_arg_from_smc(hwmgr, &(hwmgr->smu_version)); + /* ACG firmware has major version 5 */ +- if ((data->smu_version & 0xff000000) == 0x5000000) ++ if ((hwmgr->smu_version & 0xff000000) == 0x5000000) + data->smu_features[GNLD_ACG].supported = true; + + if (data->registry_data.didt_support) +@@ -2879,8 +2879,8 @@ static int vega10_enable_dpm_tasks(struct pp_hwmgr *hwmgr) + "DPM is already running right , skipping re-enablement!", + return 0); + +- if ((data->smu_version == 0x001c2c00) || +- (data->smu_version == 0x001c2d00)) { ++ if ((hwmgr->smu_version == 0x001c2c00) || ++ (hwmgr->smu_version == 0x001c2d00)) { + tmp_result = smum_send_msg_to_smc_with_parameter(hwmgr, + PPSMC_MSG_UpdatePkgPwrPidAlpha, 1); + PP_ASSERT_WITH_CODE(!tmp_result, +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h +index 8f7358c..e8507ff 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h +@@ -387,7 +387,6 @@ struct vega10_hwmgr { + struct vega10_smc_state_table smc_state_table; + + uint32_t config_telemetry; +- uint32_t smu_version; + uint32_t acg_loop_state; + uint32_t mem_channels; + }; +diff --git a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +index 39eedbc..565fe08 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +@@ -692,6 +692,7 @@ enum PP_TABLE_VERSION { + struct pp_hwmgr { + uint32_t chip_family; + uint32_t chip_id; ++ uint32_t smu_version; + + uint32_t pp_table_version; + void *device; +-- +2.7.4 + |