From: Tom St Denis Date: Tue, 16 May 2017 10:22:05 -0400 Subject: drm/amd/display: Tidy up mem_input_program_surface_flip_and_addr() Git-commit: 0b3454b7c49bfc6aa7a1096d1aa9d059201a73a7 Patch-mainline: v4.15-rc1 References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166 Signed-off-by: Tom St Denis Reviewed-by: Harry Wentland Reviewed-by: Tony Cheng Signed-off-by: Alex Deucher Acked-by: Petr Tesarik --- drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 23 +++++++-------------- 1 file changed, 8 insertions(+), 15 deletions(-) --- 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_ * 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); + 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_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_ 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_ 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; }