From 4d6939535daf298bb2b3b3a33a49edc50801b117 Mon Sep 17 00:00:00 2001 From: Dmytro Laktyushkin Date: Wed, 6 May 2020 15:08:59 -0400 Subject: drm/amd/display: fix dml immediate flip input Set the correct value to immediate flip required field. Signed-off-by: Dmytro Laktyushkin Reviewed-by: Samson Tam Acked-by: Rodrigo Siqueira Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/dml/display_mode_enums.h | 2 +- drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/drm/amd') diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_enums.h b/drivers/gpu/drm/amd/display/dc/dml/display_mode_enums.h index 5baaefd29ba6..64f9c735f74d 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_enums.h +++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_enums.h @@ -177,8 +177,8 @@ enum odm_combine_policy { }; enum immediate_flip_requirement { - dm_immediate_flip_required, dm_immediate_flip_not_required, + dm_immediate_flip_required, }; enum unbounded_requesting_policy { diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c index 2d549736f9b8..7fc06ea1f647 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c +++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c @@ -385,6 +385,8 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib) visited[k] = false; mode_lib->vba.NumberOfActivePlanes = 0; + mode_lib->vba.ImmediateFlipSupport = false; + mode_lib->vba.ImmediateFlipRequirement = dm_immediate_flip_not_required; for (j = 0; j < mode_lib->vba.cache_num_pipes; ++j) { display_pipe_source_params_st *src = &pipes[j].pipe.src; display_pipe_dest_params_st *dst = &pipes[j].pipe.dest; @@ -635,8 +637,10 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib) } } - if (pipes[k].pipe.src.immediate_flip) + if (pipes[k].pipe.src.immediate_flip) { mode_lib->vba.ImmediateFlipSupport = true; + mode_lib->vba.ImmediateFlipRequirement = dm_immediate_flip_required; + } mode_lib->vba.NumberOfActivePlanes++; } -- cgit v1.2.3