diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2122-Revert-drm-amd-display-make-clk_mgr-call-enable_pme_.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2122-Revert-drm-amd-display-make-clk_mgr-call-enable_pme_.patch | 109 |
1 files changed, 109 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2122-Revert-drm-amd-display-make-clk_mgr-call-enable_pme_.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2122-Revert-drm-amd-display-make-clk_mgr-call-enable_pme_.patch new file mode 100644 index 00000000..3ddad294 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2122-Revert-drm-amd-display-make-clk_mgr-call-enable_pme_.patch @@ -0,0 +1,109 @@ +From c7fb4c1496a4c8b33ac50ca8c34d519c81348a22 Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Mon, 17 Jun 2019 13:04:43 -0500 +Subject: [PATCH 2122/2940] Revert "drm/amd/display: make clk_mgr call + enable_pme_wa" + +This reverts commit 52c52e46e91305682cf023e268f8903272de2e13. + +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + .../display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 14 ----------- + .../display/dc/dce110/dce110_hw_sequencer.c | 25 ++++++++++++++----- + 2 files changed, 19 insertions(+), 20 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c +index ed53b483f838..a8e175cb0fe2 100644 +--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c ++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c +@@ -220,23 +220,9 @@ static void rv1_update_clocks(struct clk_mgr *clk_mgr_base, + } + } + +-static void rv1_enable_pme_wa(struct clk_mgr *clk_mgr_base) +-{ +- struct clk_mgr_internal *clk_mgr = TO_CLK_MGR_INTERNAL(clk_mgr_base); +- struct pp_smu_funcs_rv *pp_smu = NULL; +- +- if (clk_mgr->pp_smu) { +- pp_smu = &clk_mgr->pp_smu->rv_funcs; +- +- if (pp_smu->set_pme_wa_enable) +- pp_smu->set_pme_wa_enable(&pp_smu->pp_smu); +- } +-} +- + static struct clk_mgr_funcs rv1_clk_funcs = { + .get_dp_ref_clk_frequency = dce12_get_dp_ref_freq_khz, + .update_clocks = rv1_update_clocks, +- .enable_pme_wa = rv1_enable_pme_wa, + }; + + static struct clk_mgr_internal_funcs rv1_clk_internal_funcs = { +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +index 5a831410bc55..2a7ac452d458 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +@@ -939,12 +939,26 @@ void hwss_edp_backlight_control( + edp_receiver_ready_T9(link); + } + ++// Static helper function which calls the correct function ++// based on pp_smu version ++static void set_pme_wa_enable_by_version(struct dc *dc) ++{ ++ struct pp_smu_funcs *pp_smu = NULL; ++ ++ if (dc->res_pool->pp_smu) ++ pp_smu = dc->res_pool->pp_smu; ++ ++ if (pp_smu) { ++ if (pp_smu->ctx.ver == PP_SMU_VER_RV && pp_smu->rv_funcs.set_pme_wa_enable) ++ pp_smu->rv_funcs.set_pme_wa_enable(&(pp_smu->ctx)); ++ } ++} ++ + void dce110_enable_audio_stream(struct pipe_ctx *pipe_ctx) + { + /* notify audio driver for audio modes of monitor */ + struct dc *core_dc = pipe_ctx->stream->ctx->dc; + struct pp_smu_funcs *pp_smu = NULL; +- struct clk_mgr *clk_mgr = core_dc->clk_mgr; + unsigned int i, num_audio = 1; + + if (pipe_ctx->stream_res.audio && pipe_ctx->stream_res.audio->enabled == true) +@@ -962,9 +976,9 @@ void dce110_enable_audio_stream(struct pipe_ctx *pipe_ctx) + + pipe_ctx->stream_res.audio->funcs->az_enable(pipe_ctx->stream_res.audio); + +- if (num_audio >= 1 && clk_mgr->funcs->enable_pme_wa) ++ if (num_audio >= 1 && pp_smu != NULL) + /*this is the first audio. apply the PME w/a in order to wake AZ from D3*/ +- clk_mgr->funcs->enable_pme_wa(clk_mgr); ++ set_pme_wa_enable_by_version(core_dc); + /* un-mute audio */ + /* TODO: audio should be per stream rather than per link */ + pipe_ctx->stream_res.stream_enc->funcs->audio_mute_control( +@@ -978,7 +992,6 @@ void dce110_disable_audio_stream(struct pipe_ctx *pipe_ctx, int option) + { + struct dc *dc = pipe_ctx->stream->ctx->dc; + struct pp_smu_funcs *pp_smu = NULL; +- struct clk_mgr *clk_mgr = dc->clk_mgr; + + if (pipe_ctx->stream_res.audio && pipe_ctx->stream_res.audio->enabled == false) + return; +@@ -1007,9 +1020,9 @@ void dce110_disable_audio_stream(struct pipe_ctx *pipe_ctx, int option) + update_audio_usage(&dc->current_state->res_ctx, dc->res_pool, pipe_ctx->stream_res.audio, false); + pipe_ctx->stream_res.audio = NULL; + } +- if (clk_mgr->funcs->enable_pme_wa) ++ if (pp_smu != NULL) + /*this is the first audio. apply the PME w/a in order to wake AZ from D3*/ +- clk_mgr->funcs->enable_pme_wa(clk_mgr); ++ set_pme_wa_enable_by_version(dc); + + /* TODO: notify audio driver for if audio modes list changed + * add audio mode list change flag */ +-- +2.17.1 + |