From 5794833128222ca5852c7a7c6d5eb651d6e510aa Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 2 Mar 2022 12:45:40 +0000 Subject: [PATCH] revert rev 1.6, local change to use DC_FP_START()/DC_FP_END() in update_bw_bounding_box() a linux 5.15.26 patch adds this to the callers --- sys/dev/pci/drm/amd/display/dc/dcn21/dcn21_resource.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/dev/pci/drm/amd/display/dc/dcn21/dcn21_resource.c b/sys/dev/pci/drm/amd/display/dc/dcn21/dcn21_resource.c index c8707d89494..dfae4340d14 100644 --- a/sys/dev/pci/drm/amd/display/dc/dcn21/dcn21_resource.c +++ b/sys/dev/pci/drm/amd/display/dc/dcn21/dcn21_resource.c @@ -1597,8 +1597,6 @@ static void update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_param unsigned int i, closest_clk_lvl = 0, k = 0; int j; - DC_FP_START(); - dcn2_1_ip.max_num_otg = pool->base.res_cap->num_timing_generator; dcn2_1_ip.max_num_dpp = pool->base.pipe_count; dcn2_1_soc.num_chans = bw_params->num_channels; @@ -1649,8 +1647,6 @@ static void update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_param dcn2_1_soc.clock_limits[dcn2_1_soc.num_states].state = dcn2_1_soc.num_states; } - DC_FP_END(); - dml_init_instance(&dc->dml, &dcn2_1_soc, &dcn2_1_ip, DML_PROJECT_DCN21); } -- 2.20.1