diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2390-drm-amd-powerplay-notify-smu-with-active-display-cou.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2390-drm-amd-powerplay-notify-smu-with-active-display-cou.patch | 114 |
1 files changed, 114 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2390-drm-amd-powerplay-notify-smu-with-active-display-cou.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2390-drm-amd-powerplay-notify-smu-with-active-display-cou.patch new file mode 100644 index 00000000..f4c64fc0 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2390-drm-amd-powerplay-notify-smu-with-active-display-cou.patch @@ -0,0 +1,114 @@ +From e27b4d936e30744b0a0047fa382eb3c92f3ecc74 Mon Sep 17 00:00:00 2001 +From: hersen wu <hersenxs.wu@amd.com> +Date: Wed, 29 May 2019 23:30:32 -0500 +Subject: [PATCH 2390/2940] drm/amd/powerplay: notify smu with active display + count + +when dc update clocks via smu, smu needs to know how many +displays active. this interface is for dc notify number +of active displays to smu. + +Signed-off-by: hersen wu <hersenxs.wu@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 13 ++++++++++++- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 8 +++++--- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 +++--- + 3 files changed, 20 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +index 35578be95da6..9384c1a5c594 100644 +--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c ++++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +@@ -802,7 +802,7 @@ static int smu_smc_table_hw_init(struct smu_context *smu, + return 0; + } + +- ret = smu_init_display(smu); ++ ret = smu_init_display_count(smu, 0); + if (ret) + return ret; + +@@ -1470,6 +1470,17 @@ int smu_force_performance_level(struct smu_context *smu, enum amd_dpm_forced_lev + return ret; + } + ++int smu_set_display_count(struct smu_context *smu, uint32_t count) ++{ ++ int ret = 0; ++ ++ mutex_lock(&smu->mutex); ++ ret = smu_init_display_count(smu, count); ++ mutex_unlock(&smu->mutex); ++ ++ return ret; ++} ++ + const struct amd_ip_funcs smu_ip_funcs = { + .name = "smu", + .early_init = smu_early_init, +diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +index 58861c0340b9..267c4f6eb317 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +@@ -638,7 +638,7 @@ struct smu_funcs + int (*send_smc_msg)(struct smu_context *smu, uint16_t msg); + int (*send_smc_msg_with_param)(struct smu_context *smu, uint16_t msg, uint32_t param); + int (*read_smc_arg)(struct smu_context *smu, uint32_t *arg); +- int (*init_display)(struct smu_context *smu); ++ int (*init_display_count)(struct smu_context *smu, uint32_t count); + int (*set_allowed_mask)(struct smu_context *smu); + int (*get_enabled_mask)(struct smu_context *smu, uint32_t *feature_mask, uint32_t num); + int (*update_feature_enable_state)(struct smu_context *smu, uint32_t feature_id, bool enabled); +@@ -752,8 +752,8 @@ struct smu_funcs + ((smu)->funcs->read_smc_arg? (smu)->funcs->read_smc_arg((smu), (arg)) : 0) + #define smu_alloc_dpm_context(smu) \ + ((smu)->ppt_funcs->alloc_dpm_context ? (smu)->ppt_funcs->alloc_dpm_context((smu)) : 0) +-#define smu_init_display(smu) \ +- ((smu)->funcs->init_display ? (smu)->funcs->init_display((smu)) : 0) ++#define smu_init_display_count(smu, count) \ ++ ((smu)->funcs->init_display_count ? (smu)->funcs->init_display_count((smu), (count)) : 0) + #define smu_feature_set_allowed_mask(smu) \ + ((smu)->funcs->set_allowed_mask? (smu)->funcs->set_allowed_mask((smu)) : 0) + #define smu_feature_get_enabled_mask(smu, mask, num) \ +@@ -947,4 +947,6 @@ int smu_set_hard_freq_range(struct smu_context *smu, enum smu_clk_type clk_type, + uint32_t min, uint32_t max); + enum amd_dpm_forced_level smu_get_performance_level(struct smu_context *smu); + int smu_force_performance_level(struct smu_context *smu, enum amd_dpm_forced_level level); ++int smu_set_display_count(struct smu_context *smu, uint32_t count); ++ + #endif +diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +index 1b5d4084eedc..39b4c160afc4 100644 +--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c ++++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +@@ -765,13 +765,13 @@ static int smu_v11_0_set_tool_table_location(struct smu_context *smu) + return ret; + } + +-static int smu_v11_0_init_display(struct smu_context *smu) ++static int smu_v11_0_init_display_count(struct smu_context *smu, uint32_t count) + { + int ret = 0; + + if (!smu->pm_enabled) + return ret; +- ret = smu_send_smc_msg_with_param(smu, SMU_MSG_NumOfDisplays, 0); ++ ret = smu_send_smc_msg_with_param(smu, SMU_MSG_NumOfDisplays, count); + return ret; + } + +@@ -1685,7 +1685,7 @@ static const struct smu_funcs smu_v11_0_funcs = { + .write_watermarks_table = smu_v11_0_write_watermarks_table, + .set_min_dcef_deep_sleep = smu_v11_0_set_min_dcef_deep_sleep, + .set_tool_table_location = smu_v11_0_set_tool_table_location, +- .init_display = smu_v11_0_init_display, ++ .init_display_count = smu_v11_0_init_display_count, + .set_allowed_mask = smu_v11_0_set_allowed_mask, + .get_enabled_mask = smu_v11_0_get_enabled_mask, + .system_features_control = smu_v11_0_system_features_control, +-- +2.17.1 + |