drm/amd/pp: Export notify_smu_enable_pwe to display
Subsystems (3)
PATCH 1/5 drm/amd/pp: Export notify_smu_enable_pwe to display
From: Rex Zhu <[email protected]>
Display can notify smu to enable pwe after gpu suspend. It is used in case when display resumes from S3 and wants to start audio driver by enabling pwe
--- drivers/gpu/drm/amd/include/kgd_pp_interface.h | 7 ++++--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/include/kgd_pp_interface.h +4 -3
@@ -241,6 +241,9 @@ struct amd_pm_funcs {int (*set_clockgating_by_smu)(void *handle,uint32_t msg_id);int (*set_power_limit)(void *handle,uint32_t n);int (*get_power_limit)(void *handle,uint32_t *limit,bool default_limit); +int (*get_power_profile_mode)(void *handle,char *buf); +int (*set_power_profile_mode)(void *handle,long *input,uint32_t size); +int (*odn_edit_dpm_table)(void *handle,uint32_t type,long *input,uint32_t size);/* export to DC */ u32 (*get_sclk)(void *handle,bool low);u32 (*get_mclk)(void *handle,bool low);
@@ -265,9 +268,7 @@ struct amd_pm_funcs { struct pp_display_clock_request *clock);int (*get_display_mode_validation_clocks)(void *handle,struct amd_pp_simple_clock_info *clocks); -int (*get_power_profile_mode)(void *handle,char *buf); -int (*set_power_profile_mode)(void *handle,long *input,uint32_t size); - int (*odn_edit_dpm_table)(void *handle, uint32_t type, long *input, uint32_t size); + int (*notify_smu_enable_pwe)(void *handle); };#endif
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +20 -0
@@ -1201,6 +1201,25 @@ static int pp_set_powergating_by_smu(void *handle,return ret; } +static int pp_notify_smu_enable_pwe (void *handle) +{ +struct pp_hwmgr *hwmgr = handle; + +if (!hwmgr || !hwmgr->pm_en) +return -EINVAL ;; + +if (hwmgr->hwmgr_func->smus_notify_pwe ==NULL ) { +pr_info ("%s was not implemented.\n" , __func__); +return -EINVAL ;; + } + +mutex_lock (&hwmgr->smu_lock); + hwmgr->hwmgr_func->smus_notify_pwe (hwmgr); +mutex_unlock (&hwmgr->smu_lock); + +return 0 ; +} +static const struct amd_pm_funcs pp_dpm_funcs = { .load_firmware = pp_dpm_load_fw, .wait_for_fw_loading_complete = pp_dpm_fw_loading_complete,
@@ -1244,4 +1263,5 @@ static int pp_set_powergating_by_smu(void *handle, .set_watermarks_for_clocks_ranges = pp_set_watermarks_for_clocks_ranges, .display_clock_voltage_request = pp_display_clock_voltage_request, .get_display_mode_validation_clocks = pp_get_display_mode_validation_clocks, + .notify_smu_enable_pwe = pp_notify_smu_enable_pwe, };
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1530611177-21162-1-git-send-email-rex.zhu-5C7GfCeVMHo@public.gmane.org
PATCH 2/5 drm/amd/display: Refine the implementation of dm_pp_get_funcs_rv
powerplay/dpm export all interfaces in struct amd_pm_funcs. so call common exported interfaces instand of powerplay inner interfaces
Also not include header file hwmgr.h
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 80 +++++++++++----------- 1 file changed, 40 insertions(+), 40 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +40 -40
@@ -33,7 +33,6 @@#include "amdgpu_dm_irq.h" #include "amdgpu_pm.h" #include "dm_pp_smu.h" -#include "../../powerplay/inc/hwmgr.h" bool dm_pp_apply_display_requirements(
@@ -452,76 +451,77 @@ bool dm_pp_get_static_clocks(void pp_rv_set_display_requirement (struct pp_smu *pp,struct pp_smu_display_requirement_rv *req) { -struct amdgpu_device *adev = pp->ctx->driver_context; -struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle; -int ret =0 ; -if (hwmgr->hwmgr_func->set_deep_sleep_dcefclk) - ret = hwmgr->hwmgr_func->set_deep_sleep_dcefclk (hwmgr, req->hard_min_dcefclk_khz/10 ); -if (hwmgr->hwmgr_func->set_active_display_count) - ret = hwmgr->hwmgr_func->set_active_display_count (hwmgr, req->display_count); +struct dc_context *ctx = pp->ctx; +struct amdgpu_device *adev = ctx->driver_context; +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs || !pp_funcs->display_configuration_changed) +return ; -//store_cc6 is not yet implemented in SMU level +amdgpu_dpm_display_configuration_changed (adev); }void pp_rv_set_wm_ranges (struct pp_smu *pp,struct pp_smu_wm_range_sets *ranges) { -struct amdgpu_device *adev = pp->ctx->driver_context; -struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle; -struct pp_wm_sets_with_clock_ranges_soc15 ranges_soc15 = {0 }; -int i =0 ; - -if (!hwmgr->hwmgr_func->set_watermarks_for_clocks_ranges || - !pp || !ranges) -return ; +struct dc_context *ctx = pp->ctx; +struct amdgpu_device *adev = ctx->driver_context; +void *pp_handle = adev->powerplay.pp_handle; +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +struct dm_pp_wm_sets_with_clock_ranges_soc15 wm_with_clock_ranges; +struct dm_pp_clock_range_for_dmif_wm_set_soc15 *wm_dce_clocks = wm_with_clock_ranges.wm_dmif_clocks_ranges; +struct dm_pp_clock_range_for_mcif_wm_set_soc15 *wm_soc_clocks = wm_with_clock_ranges.wm_mcif_clocks_ranges; +int32_t i; -//not entirely sure if thats a correct assignment - ranges_soc15.num_wm_sets_dmif = ranges->num_reader_wm_sets; - ranges_soc15.num_wm_sets_mcif = ranges->num_writer_wm_sets; + wm_with_clock_ranges.num_wm_dmif_sets = ranges->num_reader_wm_sets; + wm_with_clock_ranges.num_wm_mcif_sets = ranges->num_writer_wm_sets; -for (i =0 ; i < ranges_soc15.num_wm_sets_dmif; i++) { +for (i =0 ; i < wm_with_clock_ranges.num_wm_dmif_sets; i++) {if (ranges->reader_wm_sets[i].wm_inst >3 ) - ranges_soc15.wm_sets_dmif[i].wm_set_id =DC_WM_SET_A ; + wm_dce_clocks[i].wm_set_id =WM_SET_A ;else - ranges_soc15.wm_sets_dmif[i].wm_set_id = + wm_dce_clocks[i].wm_set_id = ranges->reader_wm_sets[i].wm_inst; - ranges_soc15.wm_sets_dmif[i].wm_max_dcefclk_in_khz = + wm_dce_clocks[i].wm_max_dcfclk_clk_in_khz = ranges->reader_wm_sets[i].max_drain_clk_khz; - ranges_soc15.wm_sets_dmif[i].wm_min_dcefclk_in_khz = + wm_dce_clocks[i].wm_min_dcfclk_clk_in_khz = ranges->reader_wm_sets[i].min_drain_clk_khz; - ranges_soc15.wm_sets_dmif[i].wm_max_memclk_in_khz = + wm_dce_clocks[i].wm_max_mem_clk_in_khz = ranges->reader_wm_sets[i].max_fill_clk_khz; - ranges_soc15.wm_sets_dmif[i].wm_min_memclk_in_khz = + wm_dce_clocks[i].wm_min_mem_clk_in_khz = ranges->reader_wm_sets[i].min_fill_clk_khz; } -for (i =0 ; i < ranges_soc15.num_wm_sets_mcif; i++) { +for (i =0 ; i < wm_with_clock_ranges.num_wm_mcif_sets; i++) {if (ranges->writer_wm_sets[i].wm_inst >3 ) - ranges_soc15.wm_sets_dmif[i].wm_set_id =DC_WM_SET_A ; + wm_soc_clocks[i].wm_set_id =WM_SET_A ;else - ranges_soc15.wm_sets_mcif[i].wm_set_id = + wm_soc_clocks[i].wm_set_id = ranges->writer_wm_sets[i].wm_inst; - ranges_soc15.wm_sets_mcif[i].wm_max_socclk_in_khz = + wm_soc_clocks[i].wm_max_socclk_clk_in_khz = ranges->writer_wm_sets[i].max_fill_clk_khz; - ranges_soc15.wm_sets_mcif[i].wm_min_socclk_in_khz = + wm_soc_clocks[i].wm_min_socclk_clk_in_khz = ranges->writer_wm_sets[i].min_fill_clk_khz; - ranges_soc15.wm_sets_mcif[i].wm_max_memclk_in_khz = + wm_soc_clocks[i].wm_max_mem_clk_in_khz = ranges->writer_wm_sets[i].max_fill_clk_khz; - ranges_soc15.wm_sets_mcif[i].wm_min_memclk_in_khz = + wm_soc_clocks[i].wm_min_mem_clk_in_khz = ranges->writer_wm_sets[i].min_fill_clk_khz; } - hwmgr->hwmgr_func->set_watermarks_for_clocks_ranges (hwmgr, &ranges_soc15); - + pp_funcs->set_watermarks_for_clocks_ranges (pp_handle, &wm_with_clock_ranges); }void pp_rv_set_pme_wa_enable (struct pp_smu *pp) { -struct amdgpu_device *adev = pp->ctx->driver_context; -struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle; +struct dc_context *ctx = pp->ctx; +struct amdgpu_device *adev = ctx->driver_context; +void *pp_handle = adev->powerplay.pp_handle; +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs || !pp_funcs->notify_smu_enable_pwe) +return ; -if (hwmgr->hwmgr_func->smus_notify_pwe) - hwmgr->hwmgr_func->smus_notify_pwe (hwmgr); + pp_funcs->notify_smu_enable_pwe (pp_handle); } void dm_pp_get_funcs_rv(
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1530611177-21162-2-git-send-email-rex.zhu-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Acked-byRe: [PATCH 2/5] drm/amd/display: Refine the implementation of dm_pp_get_funcs_rv
Quoted 2 lines · Rex Zhu
powerplay/dpm export all interfaces in struct
amd_pm_funcs. so call common exported interfaces instand of powerplay inner interfaces
typo: instand ->instead
With that fixed:
Quoted 140 lines
Also not include header file
hwmgr.hSigned-off-by Rex Zhu <[email protected]>--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 80 +++++++++++----------- 1 file changed, 40 insertions(+), 40 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +40
-41@@ -33,7 +33,6 @@#include "amdgpu_dm_irq.h" #include "amdgpu_pm.h" #include "dm_pp_smu.h" -#include "../../powerplay/inc/hwmgr.h" bool dm_pp_apply_display_requirements(@@ -452,76 +451,77 @@ bool dm_pp_get_static_clocks(void pp_rv_set_display_requirement (struct pp_smu *pp,struct pp_smu_display_requirement_rv *req) { -struct amdgpu_device *adev = pp->ctx->driver_context; -struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle; -int ret =0 ; -if (hwmgr->hwmgr_func->set_deep_sleep_dcefclk) - ret = hwmgr->hwmgr_func->set_deep_sleep_dcefclk (hwmgr, req->hard_min_dcefclk_khz/10 ); -if (hwmgr->hwmgr_func->set_active_display_count) - ret = hwmgr->hwmgr_func->set_active_display_count (hwmgr, req->display_count); +struct dc_context *ctx = pp->ctx; +struct amdgpu_device *adev = ctx->driver_context; +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs || !pp_funcs->display_configuration_changed) +return ; -//store_cc6 is not yet implemented in SMU level +amdgpu_dpm_display_configuration_changed (adev); }void pp_rv_set_wm_ranges (struct pp_smu *pp,struct pp_smu_wm_range_sets *ranges) { -struct amdgpu_device *adev = pp->ctx->driver_context; -struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle; -struct pp_wm_sets_with_clock_ranges_soc15 ranges_soc15 = {0 }; -int i =0 ; - -if (!hwmgr->hwmgr_func->set_watermarks_for_clocks_ranges || - !pp || !ranges) -return ; +struct dc_context *ctx = pp->ctx; +struct amdgpu_device *adev = ctx->driver_context; +void *pp_handle = adev->powerplay.pp_handle; +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +struct dm_pp_wm_sets_with_clock_ranges_soc15 wm_with_clock_ranges; +struct dm_pp_clock_range_for_dmif_wm_set_soc15 *wm_dce_clocks = wm_with_clock_ranges.wm_dmif_clocks_ranges; +struct dm_pp_clock_range_for_mcif_wm_set_soc15 *wm_soc_clocks = wm_with_clock_ranges.wm_mcif_clocks_ranges; +int32_t i; -//not entirely sure if thats a correct assignment - ranges_soc15.num_wm_sets_dmif = ranges->num_reader_wm_sets; - ranges_soc15.num_wm_sets_mcif = ranges->num_writer_wm_sets; + wm_with_clock_ranges.num_wm_dmif_sets = ranges->num_reader_wm_sets; + wm_with_clock_ranges.num_wm_mcif_sets = ranges->num_writer_wm_sets; -for (i =0 ; i < ranges_soc15.num_wm_sets_dmif; i++) { +for (i =0 ; i < wm_with_clock_ranges.num_wm_dmif_sets; i++) {if (ranges->reader_wm_sets[i].wm_inst >3 ) - ranges_soc15.wm_sets_dmif[i].wm_set_id =DC_WM_SET_A ; + wm_dce_clocks[i].wm_set_id =WM_SET_A ;else - ranges_soc15.wm_sets_dmif[i].wm_set_id = + wm_dce_clocks[i].wm_set_id = ranges->reader_wm_sets[i].wm_inst; - ranges_soc15.wm_sets_dmif[i].wm_max_dcefclk_in_khz = + wm_dce_clocks[i].wm_max_dcfclk_clk_in_khz = ranges->reader_wm_sets[i].max_drain_clk_khz; - ranges_soc15.wm_sets_dmif[i].wm_min_dcefclk_in_khz = + wm_dce_clocks[i].wm_min_dcfclk_clk_in_khz = ranges->reader_wm_sets[i].min_drain_clk_khz; - ranges_soc15.wm_sets_dmif[i].wm_max_memclk_in_khz = + wm_dce_clocks[i].wm_max_mem_clk_in_khz = ranges->reader_wm_sets[i].max_fill_clk_khz; - ranges_soc15.wm_sets_dmif[i].wm_min_memclk_in_khz = + wm_dce_clocks[i].wm_min_mem_clk_in_khz = ranges->reader_wm_sets[i].min_fill_clk_khz; } -for (i =0 ; i < ranges_soc15.num_wm_sets_mcif; i++) { +for (i =0 ; i < wm_with_clock_ranges.num_wm_mcif_sets; i++) {if (ranges->writer_wm_sets[i].wm_inst >3 ) - ranges_soc15.wm_sets_dmif[i].wm_set_id =DC_WM_SET_A ; + wm_soc_clocks[i].wm_set_id =WM_SET_A ;else - ranges_soc15.wm_sets_mcif[i].wm_set_id = + wm_soc_clocks[i].wm_set_id = ranges->writer_wm_sets[i].wm_inst; - ranges_soc15.wm_sets_mcif[i].wm_max_socclk_in_khz = + wm_soc_clocks[i].wm_max_socclk_clk_in_khz = ranges->writer_wm_sets[i].max_fill_clk_khz; - ranges_soc15.wm_sets_mcif[i].wm_min_socclk_in_khz = + wm_soc_clocks[i].wm_min_socclk_clk_in_khz = ranges->writer_wm_sets[i].min_fill_clk_khz; - ranges_soc15.wm_sets_mcif[i].wm_max_memclk_in_khz = + wm_soc_clocks[i].wm_max_mem_clk_in_khz = ranges->writer_wm_sets[i].max_fill_clk_khz; - ranges_soc15.wm_sets_mcif[i].wm_min_memclk_in_khz = + wm_soc_clocks[i].wm_min_mem_clk_in_khz = ranges->writer_wm_sets[i].min_fill_clk_khz; } - hwmgr->hwmgr_func->set_watermarks_for_clocks_ranges (hwmgr, &ranges_soc15); - + pp_funcs->set_watermarks_for_clocks_ranges (pp_handle, &wm_with_clock_ranges); }void pp_rv_set_pme_wa_enable (struct pp_smu *pp) { -struct amdgpu_device *adev = pp->ctx->driver_context; -struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle; +struct dc_context *ctx = pp->ctx; +struct amdgpu_device *adev = ctx->driver_context; +void *pp_handle = adev->powerplay.pp_handle; +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs || !pp_funcs->notify_smu_enable_pwe) +return ; -if (hwmgr->hwmgr_func->smus_notify_pwe) - hwmgr->hwmgr_func->smus_notify_pwe (hwmgr); + pp_funcs->notify_smu_enable_pwe (pp_handle); } void dm_pp_get_funcs_rv( --1.9.1
Quoted 4 lines
_______________________________________________
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
PATCH 3/5 drm/amd/display: Fix copy error when set memory clocks
In reply to a message not in the archiveSet memory clocks same as soc clocks
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +2 -2
@@ -503,9 +503,9 @@ void pp_rv_set_wm_ranges(struct pp_smu *pp, wm_soc_clocks[i].wm_min_socclk_clk_in_khz = ranges->writer_wm_sets[i].min_fill_clk_khz; wm_soc_clocks[i].wm_max_mem_clk_in_khz = - ranges->writer_wm_sets[i].max_fill_clk_khz; + ranges->writer_wm_sets[i].max_drain_clk_khz; wm_soc_clocks[i].wm_min_mem_clk_in_khz = - ranges->writer_wm_sets[i].min_fill_clk_khz; + ranges->writer_wm_sets[i].min_drain_clk_khz; } pp_funcs->set_watermarks_for_clocks_ranges (pp_handle, &wm_with_clock_ranges);
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1530611177-21162-3-git-send-email-rex.zhu-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Acked-byRe: [PATCH 3/5] drm/amd/display: Fix copy error when set memory clocks
Quoted 3 lines · Rex Zhu
Set memory clocks same as soc clocks
Signed-off-by Rex Zhu <[email protected]>
Quoted 23 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +2
-3@@ -503,9 +503,9 @@ void pp_rv_set_wm_ranges(struct pp_smu *pp, wm_soc_clocks[i].wm_min_socclk_clk_in_khz = ranges->writer_wm_sets[i].min_fill_clk_khz; wm_soc_clocks[i].wm_max_mem_clk_in_khz = - ranges->writer_wm_sets[i].max_fill_clk_khz; + ranges->writer_wm_sets[i].max_drain_clk_khz; wm_soc_clocks[i].wm_min_mem_clk_in_khz = - ranges->writer_wm_sets[i].min_fill_clk_khz; + ranges->writer_wm_sets[i].min_drain_clk_khz; } pp_funcs->set_watermarks_for_clocks_ranges (pp_handle, &wm_with_clock_ranges); --1.9.1
Quoted 4 lines
_______________________________________________
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
PATCH 4/5 drm/amd/display: Set min dcfclk/fclk to powerplay for RV
In reply to a message not in the archivepowerplay can notify smu to recalculates the maximum deep-sleep divider that display allowed.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +12 -1
@@ -454,10 +454,21 @@ void pp_rv_set_display_requirement(struct pp_smu *pp,struct dc_context *ctx = pp->ctx;struct amdgpu_device *adev = ctx->driver_context;const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +void *pp_handle = adev->powerplay.pp_handle; +struct pp_display_clock_request request; -if (!pp_funcs || !pp_funcs->display_configuration_changed) +if (!pp_funcs || !pp_funcs->display_configuration_changed + || !pp_funcs->display_clock_voltage_request)return ; + request.clock_type =dc_to_pp_clock_type (DM_PP_CLOCK_TYPE_DCFCLK ); + request.clock_freq_in_khz = req->hard_min_dcefclk_khz; + pp_funcs->display_clock_voltage_request (pp_handle, &request); + + request.clock_type =dc_to_pp_clock_type (DM_PP_CLOCK_TYPE_FCLK ); + request.clock_freq_in_khz = req->hard_min_fclk_khz; + pp_funcs->display_clock_voltage_request (pp_handle, &request); +amdgpu_dpm_display_configuration_changed (adev); }
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1530611177-21162-4-git-send-email-rex.zhu-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Acked-byRe: [PATCH 4/5] drm/amd/display: Set min dcfclk/fclk to powerplay for RV
Quoted 4 lines · Rex Zhu
powerplay can notify smu to recalculates the maximum deep-sleep divider that display allowed.
Signed-off-by Rex Zhu <[email protected]>
Quoted 34 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +12
-2@@ -454,10 +454,21 @@ void pp_rv_set_display_requirement(struct pp_smu *pp,struct dc_context *ctx = pp->ctx;struct amdgpu_device *adev = ctx->driver_context;const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +void *pp_handle = adev->powerplay.pp_handle; +struct pp_display_clock_request request; -if (!pp_funcs || !pp_funcs->display_configuration_changed) +if (!pp_funcs || !pp_funcs->display_configuration_changed + || !pp_funcs->display_clock_voltage_request)return ; + request.clock_type =dc_to_pp_clock_type (DM_PP_CLOCK_TYPE_DCFCLK ); + request.clock_freq_in_khz = req->hard_min_dcefclk_khz; + pp_funcs->display_clock_voltage_request (pp_handle, &request); + + request.clock_type =dc_to_pp_clock_type (DM_PP_CLOCK_TYPE_FCLK ); + request.clock_freq_in_khz = req->hard_min_fclk_khz; + pp_funcs->display_clock_voltage_request (pp_handle, &request); +amdgpu_dpm_display_configuration_changed (adev); } --1.9.1
Quoted 4 lines
_______________________________________________
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
PATCH 5/5 drm/amd/pp: Remove the same struct define in powerplay
In reply to a message not in the archiveFrom: Rex Zhu <[email protected]>
delete the same struct define in powerplay, share the struct with display.
--- drivers/gpu/drm/amd/include/dm_pp_interface.h | 37 ++----------------- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 42 +++++++++++----------- drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 2 +- 6 files changed, 27 insertions(+), 60 deletions(-)
drivers/gpu/drm/amd/include/dm_pp_interface.h +2 -35
@@ -23,6 +23,8 @@#ifndef _DM_PP_INTERFACE_#define _DM_PP_INTERFACE_ +#include "dm_services_types.h" +#define PP_MAX_CLOCK_LEVELS 16 enum amd_pp_display_config_type{
@@ -189,39 +191,4 @@ struct pp_display_clock_request { uint32_t clock_freq_in_khz; }; -#define PP_MAX_WM_SETS 4 - -enum pp_wm_set_id { -DC_WM_SET_A =0 , -DC_WM_SET_B , -DC_WM_SET_C , -DC_WM_SET_D , -DC_WM_SET_INVALID =0xffff , -}; - -struct pp_wm_set_with_dmif_clock_range_soc15 { -enum pp_wm_set_id wm_set_id; -uint32_t wm_min_dcefclk_in_khz; -uint32_t wm_max_dcefclk_in_khz; -uint32_t wm_min_memclk_in_khz; -uint32_t wm_max_memclk_in_khz; -}; - -struct pp_wm_set_with_mcif_clock_range_soc15 { -enum pp_wm_set_id wm_set_id; -uint32_t wm_min_socclk_in_khz; -uint32_t wm_max_socclk_in_khz; -uint32_t wm_min_memclk_in_khz; -uint32_t wm_max_memclk_in_khz; -}; - -struct pp_wm_sets_with_clock_ranges_soc15 { -uint32_t num_wm_sets_dmif; -uint32_t num_wm_sets_mcif; -struct pp_wm_set_with_dmif_clock_range_soc15 - wm_sets_dmif[PP_MAX_WM_SETS ]; -struct pp_wm_set_with_mcif_clock_range_soc15 - wm_sets_mcif[PP_MAX_WM_SETS ]; -}; -#endif /* _DM_PP_INTERFACE_ */
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +1 -1
@@ -1111,7 +1111,7 @@ static int smu10_set_watermarks_for_clocks_ranges(struct pp_hwmgr *hwmgr, void *clock_ranges) {struct smu10_hwmgr *data = hwmgr->backend; -struct pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges = clock_ranges; +struct dm_pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges = clock_ranges;Watermarks_t *table = &(data->water_marks_table);int result =0 ;
drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c +21 -21
77 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h +1 -1
@@ -107,7 +107,7 @@ int smu_get_voltage_dependency_table_ppt_v1( struct phm_ppt_v1_clock_voltage_dependency_table *dep_table);int smu_set_watermarks_for_clocks_ranges (void *wt_table, -struct pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges); +struct dm_pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges);#define PHM_FIELD_SHIFT (reg, field) reg##__##field##__SHIFT#define PHM_FIELD_MASK (reg, field) reg##__##field##_MASK
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1 -1
@@ -4197,7 +4197,7 @@ static int vega10_set_watermarks_for_clocks_ranges(struct pp_hwmgr *hwmgr, void *clock_range) {struct vega10_hwmgr *data = hwmgr->backend; -struct pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges = clock_range; +struct dm_pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges = clock_range;Watermarks_t *table = &(data->smc_state_table.water_marks_table);int result =0 ;
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c +1 -1
@@ -1785,7 +1785,7 @@ static int vega12_set_watermarks_for_clocks_ranges(struct pp_hwmgr *hwmgr, {struct vega12_hwmgr *data = (struct vega12_hwmgr *)(hwmgr->backend);Watermarks_t *table = &(data->smc_state_table.water_marks_table); -struct pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges = clock_ranges; +struct dm_pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges = clock_ranges; if (!data->registry_data.disable_water_mark && data->smu_features[GNLD_DPM_DCEFCLK].supported &&
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
Acked-byQuoted 7 lines · Rex Zhu
From: Rex Zhu <[email protected]>
Display can notify smu to enable pwe after gpu suspend. It is used in case when display resumes from S3 and wants to start audio driver by enabling pwe
Signed-off-by Rex Zhu <[email protected]>
Quoted 69 lines
--- drivers/gpu/drm/amd/include/kgd_pp_interface.h | 7 ++++--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/include/kgd_pp_interface.h +4
-3@@ -241,6 +241,9 @@ struct amd_pm_funcs {int (*set_clockgating_by_smu)(void *handle,uint32_t msg_id);int (*set_power_limit)(void *handle,uint32_t n);int (*get_power_limit)(void *handle,uint32_t *limit,bool default_limit); +int (*get_power_profile_mode)(void *handle,char *buf); +int (*set_power_profile_mode)(void *handle,long *input,uint32_t size); +int (*odn_edit_dpm_table)(void *handle,uint32_t type,long *input,uint32_t size);/* export to DC */ u32 (*get_sclk)(void *handle,bool low);u32 (*get_mclk)(void *handle,bool low);@@ -265,9 +268,7 @@ struct amd_pm_funcs { struct pp_display_clock_request *clock);int (*get_display_mode_validation_clocks)(void *handle,struct amd_pp_simple_clock_info *clocks); -int (*get_power_profile_mode)(void *handle,char *buf); -int (*set_power_profile_mode)(void *handle,long *input,uint32_t size); - int (*odn_edit_dpm_table)(void *handle, uint32_t type, long *input, uint32_t size); + int (*notify_smu_enable_pwe)(void *handle); };#endif drivers/gpu/drm/amd/powerplay/amd_powerplay.c +20
-1@@ -1201,6 +1201,25 @@ static int pp_set_powergating_by_smu(void *handle,return ret; } +static int pp_notify_smu_enable_pwe (void *handle) +{ +struct pp_hwmgr *hwmgr = handle; + +if (!hwmgr || !hwmgr->pm_en) +return -EINVAL ;; + +if (hwmgr->hwmgr_func->smus_notify_pwe ==NULL ) { +pr_info ("%s was not implemented.\n" , __func__); +return -EINVAL ;; + } + +mutex_lock (&hwmgr->smu_lock); + hwmgr->hwmgr_func->smus_notify_pwe (hwmgr); +mutex_unlock (&hwmgr->smu_lock); + +return 0 ; +} +static const struct amd_pm_funcs pp_dpm_funcs = { .load_firmware = pp_dpm_load_fw, .wait_for_fw_loading_complete = pp_dpm_fw_loading_complete,@@ -1244,4 +1263,5 @@ static int pp_set_powergating_by_smu(void *handle, .set_watermarks_for_clocks_ranges = pp_set_watermarks_for_clocks_ranges, .display_clock_voltage_request = pp_display_clock_voltage_request, .get_display_mode_validation_clocks = pp_get_display_mode_validation_clocks, + .notify_smu_enable_pwe = pp_notify_smu_enable_pwe, }; --1.9.1
Quoted 4 lines
_______________________________________________
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