From: jsg Date: Thu, 10 Feb 2022 01:50:19 +0000 (+0000) Subject: bring back a local change to use DC_FP_START()/DC_FP_END() in X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c21c5e7bbe44e6168f787cfbeae61ee82d81bcd5;p=openbsd bring back a local change to use DC_FP_START()/DC_FP_END() in update_bw_bounding_box() lost in drm 5.15 update should avoid 'SSE FP exception trap' infrequently seen on boot with renoir and cezanne problem reported by beck@ and claudio@ --- 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 dfae4340d14..c8707d89494 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,6 +1597,8 @@ 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; @@ -1647,6 +1649,8 @@ 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); }