Commit 5df921d4 authored by Ken Chalmers's avatar Ken Chalmers Committed by Alex Deucher

drm/amd/display: fix ASSERT() caused by missing registers.

Signed-off-by: default avatarKen Chalmers <ken.chalmers@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent dbaed803
...@@ -771,14 +771,16 @@ static void power_on_plane( ...@@ -771,14 +771,16 @@ static void power_on_plane(
struct dce_hwseq *hws, struct dce_hwseq *hws,
int plane_id) int plane_id)
{ {
REG_SET(DC_IP_REQUEST_CNTL, 0, if (REG(DC_IP_REQUEST_CNTL)) {
IP_REQUEST_EN, 1); REG_SET(DC_IP_REQUEST_CNTL, 0,
dpp_pg_control(hws, plane_id, true); IP_REQUEST_EN, 1);
hubp_pg_control(hws, plane_id, true); dpp_pg_control(hws, plane_id, true);
REG_SET(DC_IP_REQUEST_CNTL, 0, hubp_pg_control(hws, plane_id, true);
IP_REQUEST_EN, 0); REG_SET(DC_IP_REQUEST_CNTL, 0,
dm_logger_write(hws->ctx->logger, LOG_DEBUG, IP_REQUEST_EN, 0);
"Un-gated front end for pipe %d\n", plane_id); dm_logger_write(hws->ctx->logger, LOG_DEBUG,
"Un-gated front end for pipe %d\n", plane_id);
}
} }
static void undo_DEGVIDCN10_253_wa(struct dc *dc) static void undo_DEGVIDCN10_253_wa(struct dc *dc)
...@@ -1130,18 +1132,20 @@ static void plane_atomic_power_down(struct dc *dc, int fe_idx) ...@@ -1130,18 +1132,20 @@ static void plane_atomic_power_down(struct dc *dc, int fe_idx)
struct dce_hwseq *hws = dc->hwseq; struct dce_hwseq *hws = dc->hwseq;
struct transform *xfm = dc->res_pool->transforms[fe_idx]; struct transform *xfm = dc->res_pool->transforms[fe_idx];
REG_SET(DC_IP_REQUEST_CNTL, 0, if (REG(DC_IP_REQUEST_CNTL)) {
IP_REQUEST_EN, 1); REG_SET(DC_IP_REQUEST_CNTL, 0,
dpp_pg_control(hws, fe_idx, false); IP_REQUEST_EN, 1);
hubp_pg_control(hws, fe_idx, false); dpp_pg_control(hws, fe_idx, false);
xfm->funcs->transform_reset(xfm); hubp_pg_control(hws, fe_idx, false);
REG_SET(DC_IP_REQUEST_CNTL, 0, xfm->funcs->transform_reset(xfm);
IP_REQUEST_EN, 0); REG_SET(DC_IP_REQUEST_CNTL, 0,
dm_logger_write(dc->ctx->logger, LOG_DEBUG, IP_REQUEST_EN, 0);
"Power gated front end %d\n", fe_idx); dm_logger_write(dc->ctx->logger, LOG_DEBUG,
"Power gated front end %d\n", fe_idx);
if (dc->debug.sanity_checks) if (dc->debug.sanity_checks)
verify_allow_pstate_change_high(dc->hwseq); verify_allow_pstate_change_high(dc->hwseq);
}
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment