diff options
| author | Tom St Denis <tom.stdenis@amd.com> | 2017-05-16 10:22:05 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:07:24 -0400 |
| commit | 0b3454b7c49bfc6aa7a1096d1aa9d059201a73a7 (patch) | |
| tree | 9272ac9a866ac064bb40f87541cd04a317774a7d /drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | |
| parent | 76fd8eb8e2282c695c43683802772caa187bf41b (diff) | |
| download | linux-stable-0b3454b7c49bfc6aa7a1096d1aa9d059201a73a7.tar.gz linux-stable-0b3454b7c49bfc6aa7a1096d1aa9d059201a73a7.tar.bz2 linux-stable-0b3454b7c49bfc6aa7a1096d1aa9d059201a73a7.zip | |
drm/amd/display: Tidy up mem_input_program_surface_flip_and_addr()
Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c index 718688c41f7b..673371e5f9f0 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c @@ -625,18 +625,12 @@ static bool dce_mi_program_surface_flip_and_addr( * non-XDMA Mode: GRPH_SURFACE_UPDATE_IMMEDIATE_EN = 1 * XDMA Mode: GRPH_SURFACE_UPDATE_H_RETRACE_EN = 1 */ - REG_UPDATE(GRPH_UPDATE, - GRPH_UPDATE_LOCK, 1); - - if (flip_immediate) { - REG_UPDATE_2(GRPH_FLIP_CONTROL, - GRPH_SURFACE_UPDATE_IMMEDIATE_EN, 0, - GRPH_SURFACE_UPDATE_H_RETRACE_EN, 1); - } else { - REG_UPDATE_2(GRPH_FLIP_CONTROL, - GRPH_SURFACE_UPDATE_IMMEDIATE_EN, 0, - GRPH_SURFACE_UPDATE_H_RETRACE_EN, 0); - } + REG_UPDATE(GRPH_UPDATE, GRPH_UPDATE_LOCK, 1); + + REG_UPDATE_2( + GRPH_FLIP_CONTROL, + GRPH_SURFACE_UPDATE_IMMEDIATE_EN, 0, + GRPH_SURFACE_UPDATE_H_RETRACE_EN, flip_immediate ? 1 : 0); switch (address->type) { case PLN_ADDR_TYPE_GRAPHICS: @@ -645,8 +639,8 @@ static bool dce_mi_program_surface_flip_and_addr( program_pri_addr(dce_mi, address->grph.addr); break; case PLN_ADDR_TYPE_GRPH_STEREO: - if (address->grph_stereo.left_addr.quad_part == 0 - || address->grph_stereo.right_addr.quad_part == 0) + if (address->grph_stereo.left_addr.quad_part == 0 || + address->grph_stereo.right_addr.quad_part == 0) break; program_pri_addr(dce_mi, address->grph_stereo.left_addr); program_sec_addr(dce_mi, address->grph_stereo.right_addr); @@ -662,8 +656,7 @@ static bool dce_mi_program_surface_flip_and_addr( if (flip_immediate) mem_input->current_address = *address; - REG_UPDATE(GRPH_UPDATE, - GRPH_UPDATE_LOCK, 0); + REG_UPDATE(GRPH_UPDATE, GRPH_UPDATE_LOCK, 0); return true; } |