Commit 32c1c35b authored by Rafal Ostrowski's avatar Rafal Ostrowski Committed by Alex Deucher
Browse files

drm/amd/display: Move FPU Guards From DML To DC - Part 3 



[Why]
FPU guards (DC_FP_START/DC_FP_END) are required to wrap around code that
can manipulates floats. To do this properly, the FPU guards must be used
in a file that is not compiled as a FPU unit. If the guards are used in
a file that is a FPU unit, other sections in the file that aren't guarded
may be end up being compiled to use FPU operations.

[How]
Added DC_FP_START and DC_FP_END to DC functions that call DML functions
using FPU.

Reviewed-by: default avatarDillon Varone <dillon.varone@amd.com>
Signed-off-by: default avatarRafal Ostrowski <rafal.ostrowski@amd.com>
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4bb2f072

drivers/gpu/drm/amd/display/dc/dml2_0/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ AMD_DAL_DML2 = $(addprefix $(AMDDALPATH)/dc/dml2_0/,$(DML2)) 


AMD_DISPLAY_FILES += $(AMD_DAL_DML2)





DML21 := src/dml2_top/dml2_top_interfaces.o

DML21 += src/dml2_top/dml2_top_soc15.o

DML21 += src/dml2_core/dml2_core_dcn4.o

drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_wrapper.c

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ static bool dml21_allocate_memory(struct dml2_context **dml_ctx) 
	(*dml_ctx)->v21.mode_programming.display_config = (*dml_ctx)->v21.mode_support.display_config;



	DC_RUN_WITH_PREEMPTION_ENABLED((*dml_ctx)->v21.mode_programming.programming = vzalloc(sizeof(struct dml2_display_cfg_programming)));



	if (!((*dml_ctx)->v21.mode_programming.programming))

		return false;

drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_wrapper_fpu.c

+1 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

//

// Copyright 2024 Advanced Micro Devices, Inc.

// Copyright 2026 Advanced Micro Devices, Inc.



#include "dml2_internal_types.h"

#include "dml_top.h"
@@ -377,5 +377,3 @@ void dml21_prepare_mcache_programming(struct dc *in_dc, struct dc_state *context 
		}

	}

}

drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_wrapper_fpu.h

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

//

// Copyright 2024 Advanced Micro Devices, Inc.

// Copyright 2026 Advanced Micro Devices, Inc.



#ifndef _DML21_WRAPPER_FPU_H_

#define _DML21_WRAPPER_FPU_H_

drivers/gpu/drm/amd/display/dc/dml2_0/dml2_wrapper.c

+5 −1
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ 


#include "dc_fpu.h"



#if !defined(DC_RUN_WITH_PREEMPTION_ENABLED)

#define DC_RUN_WITH_PREEMPTION_ENABLED(code) code

#endif // !DC_RUN_WITH_PREEMPTION_ENABLED



struct dml2_context *dml2_allocate_memory(void)

{

	struct dml2_context *dml2;
@@ -20,7 +24,6 @@ struct dml2_context *dml2_allocate_memory(void) 
	DC_RUN_WITH_PREEMPTION_ENABLED(dml2 = vzalloc(sizeof(struct dml2_context)));

	return dml2;

}



bool dml2_validate(const struct dc *in_dc, struct dc_state *context, struct dml2_context *dml2,

	enum dc_validate_mode validate_mode)

{
@@ -84,6 +87,7 @@ static void dml2_init(const struct dc *in_dc, const struct dml2_configuration_op 
	initialize_dml2_soc_bbox(*dml2, in_dc, &(*dml2)->v20.dml_core_ctx.soc);



	initialize_dml2_soc_states(*dml2, in_dc, &(*dml2)->v20.dml_core_ctx.soc, &(*dml2)->v20.dml_core_ctx.states);



}



bool dml2_create(const struct dc *in_dc, const struct dml2_configuration_options *config, struct dml2_context **dml2)