drm/amd/display: Fix FP start/end for dcn30_internal_validate_bw.
authorjsg <jsg@openbsd.org>
Wed, 2 Feb 2022 02:56:36 +0000 (02:56 +0000)
committerjsg <jsg@openbsd.org>
Wed, 2 Feb 2022 02:56:36 +0000 (02:56 +0000)
From Bas Nieuwenhuizen
548f20b39ec91fdd97194a84a0d9b2f68715762a in linux 5.15.y/5.15.19
72a8d87b87270bff0c0b2fed4d59c48d0dd840d7 in mainline linux

sys/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.c

index 89a237b..0294d0c 100644 (file)
@@ -1879,7 +1879,6 @@ static noinline bool dcn30_internal_validate_bw(
        dc->res_pool->funcs->update_soc_for_wm_a(dc, context);
        pipe_cnt = dc->res_pool->funcs->populate_dml_pipes(dc, context, pipes, fast_validate);
 
-       DC_FP_START();
        if (!pipe_cnt) {
                out = true;
                goto validate_out;
@@ -2103,7 +2102,6 @@ validate_fail:
        out = false;
 
 validate_out:
-       DC_FP_END();
        return out;
 }
 
@@ -2304,7 +2302,9 @@ bool dcn30_validate_bandwidth(struct dc *dc,
 
        BW_VAL_TRACE_COUNT();
 
+       DC_FP_START();
        out = dcn30_internal_validate_bw(dc, context, pipes, &pipe_cnt, &vlevel, fast_validate);
+       DC_FP_END();
 
        if (pipe_cnt == 0)
                goto validate_out;