diff options
| author | Yongqiang Sun <yongqiang.sun@amd.com> | 2017-08-03 22:46:10 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-27 01:16:22 +0300 |
| commit | cbb4d72e290df8fedc764c7abb823cae938a45aa (patch) | |
| tree | 492cdbde389fbcb647353019876866cab6f882c1 | |
| parent | 3e9ad6164b98f82ff4b191980c502f09fee4deef (diff) | |
| download | linux-cbb4d72e290df8fedc764c7abb823cae938a45aa.tar.xz | |
drm/amd/display: Clear water mark change request bit before programing.
Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c index 948aaeb73122..9165dc80cd22 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c @@ -320,6 +320,9 @@ static void program_watermarks( */ uint32_t prog_wm_value; + REG_UPDATE(DCHUBBUB_ARB_WATERMARK_CHANGE_CNTL, + DCHUBBUB_ARB_WATERMARK_CHANGE_REQUEST, 0); + /* Repeat for water mark set A, B, C and D. */ /* clock state A */ prog_wm_value = convert_and_clamp(watermarks->a.urgent_ns, @@ -518,8 +521,7 @@ static void program_watermarks( REG_UPDATE(DCHUBBUB_ARB_WATERMARK_CHANGE_CNTL, DCHUBBUB_ARB_WATERMARK_CHANGE_REQUEST, 1); - REG_UPDATE(DCHUBBUB_ARB_WATERMARK_CHANGE_CNTL, - DCHUBBUB_ARB_WATERMARK_CHANGE_REQUEST, 0); + REG_UPDATE(DCHUBBUB_ARB_SAT_LEVEL, DCHUBBUB_ARB_SAT_LEVEL, 60 * refclk_mhz); REG_UPDATE(DCHUBBUB_ARB_DF_REQ_OUTSTAND, |