From: Wyatt Wood <[email protected]> [Why] Set version is currently not called.
[How] Add call to set version from copy settings. This should be the only time this is called as the eDP caps should never change. Signed-off-by: Wyatt Wood <[email protected]> Reviewed-by: Nicholas Kazlauskas <[email protected]> Acked-by: Rodrigo Siqueira <[email protected]> --- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 17 ++++++++++++----- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 1 - 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c index 59cdd8ea31fb..cacb46979f31 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c @@ -42,17 +42,19 @@ static void dmub_psr_get_state(uint32_t *psr_state) // Trigger GPINT interrupt from firmware } -static void dmub_psr_set_version(struct dmub_psr *dmub, struct dc_stream_state *stream) +/** + * Set PSR version. + */ +static bool dmub_psr_set_version(struct dmub_psr *dmub, struct dc_stream_state *stream) { - //stream->psr_version; union dmub_rb_cmd cmd; struct dc_context *dc = dmub->ctx; cmd.psr_set_version.header.type = DMUB_CMD__PSR; cmd.psr_set_version.header.sub_type = DMUB_CMD__PSR_SET_VERSION; - if (stream->psr_version == 0x0) - return; + if (stream->psr_version == 0x0) // Unsupported + return false; else if (stream->psr_version == 0x1) cmd.psr_set_version.psr_set_version_data.version = PSR_VERSION_1; else if (stream->psr_version == 0x2) @@ -63,6 +65,8 @@ static void dmub_psr_set_version(struct dmub_psr *dmub, struct dc_stream_state * dc_dmub_srv_cmd_queue(dc->dmub_srv, &cmd.psr_enable.header); dc_dmub_srv_cmd_execute(dc->dmub_srv); dc_dmub_srv_wait_idle(dc->dmub_srv); + + return true; } /** @@ -139,6 +143,10 @@ static bool dmub_psr_copy_settings(struct dmub_psr *dmub, if (!pipe_ctx || !&pipe_ctx->plane_res || !&pipe_ctx->stream_res) return false; + // First, set the psr version + if (!dmub_psr_set_version(dmub, pipe_ctx->stream)) + return false; + // Program DP DPHY fast training registers link->link_enc->funcs->psr_program_dp_dphy_fast_training(link->link_enc, psr_context->psrExitLinkTrainingRequired); @@ -186,7 +194,6 @@ static bool dmub_psr_copy_settings(struct dmub_psr *dmub, } static const struct dmub_psr_funcs psr_funcs = { - .psr_set_version = dmub_psr_set_version, .psr_copy_settings = dmub_psr_copy_settings, .psr_enable = dmub_psr_enable, .psr_get_state = dmub_psr_get_state, diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h index 4fe8b53d9551..5e8553d450c9 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h +++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h @@ -34,7 +34,6 @@ struct dmub_psr { }; struct dmub_psr_funcs { - void (*psr_set_version)(struct dmub_psr *dmub, struct dc_stream_state *stream); bool (*psr_copy_settings)(struct dmub_psr *dmub, struct dc_link *link, struct psr_context *psr_context); void (*psr_enable)(struct dmub_psr *dmub, bool enable); void (*psr_get_state)(uint32_t *psr_state); -- 2.25.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
