Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 585715ef authored by Harry Wentland's avatar Harry Wentland Committed by Greg Kroah-Hartman
Browse files

drm/amd/display: don't call dm_pp_ function from an fpu block 



commit 59d3191f14dc18881fec1172c7096b7863622803 upstream.

Powerplay functions called from dm_pp_* functions tend to do a
mutex_lock which isn't safe to do inside a kernel_fpu_begin/end block as
those will disable/enable preemption.

Rearrange the dm_pp_get_clock_levels_by_type_with_voltage calls to make
sure they happen outside of kernel_fpu_begin/end.

Cc: stable@vger.kernel.org
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17982c6a

drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c

+6 −2
Original line number Diff line number Diff line
@@ -1347,12 +1347,12 @@ void dcn_bw_update_from_pplib(struct dc *dc) 
	struct dm_pp_clock_levels_with_voltage fclks = {0}, dcfclks = {0};

	bool res;



	kernel_fpu_begin();



	/* TODO: This is not the proper way to obtain fabric_and_dram_bandwidth, should be min(fclk, memclk) */

	res = dm_pp_get_clock_levels_by_type_with_voltage(

			ctx, DM_PP_CLOCK_TYPE_FCLK, &fclks);



	kernel_fpu_begin();



	if (res)

		res = verify_clock_values(&fclks);
@@ -1371,9 +1371,13 @@ void dcn_bw_update_from_pplib(struct dc *dc) 
	} else

		BREAK_TO_DEBUGGER();



	kernel_fpu_end();



	res = dm_pp_get_clock_levels_by_type_with_voltage(

			ctx, DM_PP_CLOCK_TYPE_DCFCLK, &dcfclks);



	kernel_fpu_begin();



	if (res)

		res = verify_clock_values(&dcfclks);