drm/amd/display: add fast_validate parameter to dcn20_validate_bandwidth

To deal with changes from rebasing.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 522b85a5db330df4c1b32286bb30e45a658626fa..16be22a2091dd92b7d60c29130fc7f199efb8a2c 100644 (file)
--- 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 ab9db16f516511334f71396f01df639aed172d4b..c5f176fb654a34b2656cfceada4acd63fbd7c70a 100644 (file)
--- 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);