From bea4ce2c95fec4741b87696aea270a192912cc7a Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 22 Apr 2019 16:38:24 -0500 Subject: [PATCH 2451/2940] drm/amd/display: add fast_validate parameter to dcn20_validate_bandwidth To deal with changes from rebasing. Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 4 +++- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c index 522b85a5db33..16be22a2091d 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c @@ -1705,7 +1705,9 @@ void dcn20_set_mcif_arb_params( } } -bool dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context) +bool dcn20_validate_bandwidth(struct dc *dc, + struct dc_state *context, + bool fast_validate) { int pipe_cnt, i, pipe_idx, vlevel, vlevel_unsplit; int pipe_split_from[MAX_PIPES]; diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h index ab9db16f5165..c5f176fb654a 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h @@ -115,7 +115,7 @@ void dcn20_set_mcif_arb_params( struct dc_state *context, display_e2e_pipe_params_st *pipes, int pipe_cnt); -bool dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context); +bool dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context, bool fast_validate); enum dc_status dcn20_build_mapped_resource(const struct dc *dc, struct dc_state *context, struct dc_stream_state *stream); enum dc_status dcn20_validate_global(struct dc *dc, struct dc_state *new_ctx); -- 2.17.1