Commit 37c8f6e6 authored by David Francis's avatar David Francis Committed by Alex Deucher

drm/amd/display: Clean up dp_blank functions

[Why]
Unused variable "refresh" and incorrect comment formatting

[How]
Remove variable, reindent comments
Signed-off-by: default avatarDavid Francis <David.Francis@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4b594b8d
...@@ -908,7 +908,6 @@ static void dce110_stream_encoder_dp_blank( ...@@ -908,7 +908,6 @@ static void dce110_stream_encoder_dp_blank(
struct stream_encoder *enc) struct stream_encoder *enc)
{ {
struct dce110_stream_encoder *enc110 = DCE110STRENC_FROM_STRENC(enc); struct dce110_stream_encoder *enc110 = DCE110STRENC_FROM_STRENC(enc);
uint32_t retries = 0;
uint32_t reg1 = 0; uint32_t reg1 = 0;
uint32_t max_retries = DP_BLANK_MAX_RETRY * 10; uint32_t max_retries = DP_BLANK_MAX_RETRY * 10;
...@@ -926,30 +925,28 @@ static void dce110_stream_encoder_dp_blank( ...@@ -926,30 +925,28 @@ static void dce110_stream_encoder_dp_blank(
* (2 = start of the next vertical blank) */ * (2 = start of the next vertical blank) */
REG_UPDATE(DP_VID_STREAM_CNTL, DP_VID_STREAM_DIS_DEFER, 2); REG_UPDATE(DP_VID_STREAM_CNTL, DP_VID_STREAM_DIS_DEFER, 2);
/* Larger delay to wait until VBLANK - use max retry of /* Larger delay to wait until VBLANK - use max retry of
* 10us*3000=30ms. This covers 16.6ms of typical 60 Hz mode + * 10us*3000=30ms. This covers 16.6ms of typical 60 Hz mode +
* a little more because we may not trust delay accuracy. * a little more because we may not trust delay accuracy.
*/ */
max_retries = DP_BLANK_MAX_RETRY * 150; max_retries = DP_BLANK_MAX_RETRY * 150;
/* disable DP stream */ /* disable DP stream */
REG_UPDATE(DP_VID_STREAM_CNTL, DP_VID_STREAM_ENABLE, 0); REG_UPDATE(DP_VID_STREAM_CNTL, DP_VID_STREAM_ENABLE, 0);
/* the encoder stops sending the video stream /* the encoder stops sending the video stream
* at the start of the vertical blanking. * at the start of the vertical blanking.
* Poll for DP_VID_STREAM_STATUS == 0 * Poll for DP_VID_STREAM_STATUS == 0
*/ */
REG_WAIT(DP_VID_STREAM_CNTL, DP_VID_STREAM_STATUS, REG_WAIT(DP_VID_STREAM_CNTL, DP_VID_STREAM_STATUS,
0, 0,
10, max_retries); 10, max_retries);
ASSERT(retries <= max_retries);
/* Tell the DP encoder to ignore timing from CRTC, must be done after /* Tell the DP encoder to ignore timing from CRTC, must be done after
* the polling. If we set DP_STEER_FIFO_RESET before DP stream blank is * the polling. If we set DP_STEER_FIFO_RESET before DP stream blank is
* complete, stream status will be stuck in video stream enabled state, * complete, stream status will be stuck in video stream enabled state,
* i.e. DP_VID_STREAM_STATUS stuck at 1. * i.e. DP_VID_STREAM_STATUS stuck at 1.
*/ */
REG_UPDATE(DP_STEER_FIFO, DP_STEER_FIFO_RESET, true); REG_UPDATE(DP_STEER_FIFO, DP_STEER_FIFO_RESET, true);
} }
......
...@@ -766,7 +766,6 @@ void enc1_stream_encoder_dp_blank( ...@@ -766,7 +766,6 @@ void enc1_stream_encoder_dp_blank(
struct stream_encoder *enc) struct stream_encoder *enc)
{ {
struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc); struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc);
uint32_t retries = 0;
uint32_t reg1 = 0; uint32_t reg1 = 0;
uint32_t max_retries = DP_BLANK_MAX_RETRY * 10; uint32_t max_retries = DP_BLANK_MAX_RETRY * 10;
...@@ -803,8 +802,6 @@ void enc1_stream_encoder_dp_blank( ...@@ -803,8 +802,6 @@ void enc1_stream_encoder_dp_blank(
0, 0,
10, max_retries); 10, max_retries);
ASSERT(retries <= max_retries);
/* Tell the DP encoder to ignore timing from CRTC, must be done after /* Tell the DP encoder to ignore timing from CRTC, must be done after
* the polling. If we set DP_STEER_FIFO_RESET before DP stream blank is * the polling. If we set DP_STEER_FIFO_RESET before DP stream blank is
* complete, stream status will be stuck in video stream enabled state, * complete, stream status will be stuck in video stream enabled state,
......
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