Commit ee373411 authored by Qingqing Zhuo's avatar Qingqing Zhuo Committed by Alex Deucher

drm/amd/display: Re-arrange FPU code structure for dcn2x

[Why]
Current FPU code for DCN2x is located under dml/dcn2x.
This is not aligned with DC's general source tree
structure.

[How]
Move FPU code for DCN2x to dml/dcn20.
Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Acked-by: default avatarSolomon Chiu <solomon.chiu@amd.com>
Signed-off-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 86adcb0b
...@@ -52,7 +52,7 @@ static DEFINE_PER_CPU(int, fpu_recursion_depth); ...@@ -52,7 +52,7 @@ static DEFINE_PER_CPU(int, fpu_recursion_depth);
* This function tells if the code is already under FPU protection or not. A * This function tells if the code is already under FPU protection or not. A
* function that works as an API for a set of FPU operations can use this * function that works as an API for a set of FPU operations can use this
* function for checking if the caller invoked it after DC_FP_START(). For * function for checking if the caller invoked it after DC_FP_START(). For
* example, take a look at dcn2x.c file. * example, take a look at dcn20_fpu.c file.
*/ */
inline void dc_assert_fp_enabled(void) inline void dc_assert_fp_enabled(void)
{ {
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "include/irq_service_interface.h" #include "include/irq_service_interface.h"
#include "dcn20/dcn20_resource.h" #include "dcn20/dcn20_resource.h"
#include "dml/dcn2x/dcn2x.h" #include "dml/dcn20/dcn20_fpu.h"
#include "dcn10/dcn10_hubp.h" #include "dcn10/dcn10_hubp.h"
#include "dcn10/dcn10_ipp.h" #include "dcn10/dcn10_ipp.h"
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "dc.h" #include "dc.h"
#include "dcn201_init.h" #include "dcn201_init.h"
#include "dml/dcn2x/dcn2x.h" #include "dml/dcn20/dcn20_fpu.h"
#include "resource.h" #include "resource.h"
#include "include/irq_service_interface.h" #include "include/irq_service_interface.h"
#include "dcn201_resource.h" #include "dcn201_resource.h"
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "include/irq_service_interface.h" #include "include/irq_service_interface.h"
#include "dcn20/dcn20_resource.h" #include "dcn20/dcn20_resource.h"
#include "dml/dcn2x/dcn2x.h" #include "dml/dcn20/dcn20_fpu.h"
#include "clk_mgr.h" #include "clk_mgr.h"
#include "dcn10/dcn10_hubp.h" #include "dcn10/dcn10_hubp.h"
......
...@@ -58,7 +58,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags) ...@@ -58,7 +58,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags)
ifdef CONFIG_DRM_AMD_DC_DCN ifdef CONFIG_DRM_AMD_DC_DCN
CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_ccflags)
CFLAGS_$(AMDDALPATH)/dc/dml/dcn2x/dcn2x.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_ccflags)
CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_ccflags)
CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_ccflags)
CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_ccflags)
...@@ -93,8 +93,8 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_rcflags) ...@@ -93,8 +93,8 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_rcflags)
DML = display_mode_lib.o display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o \ DML = display_mode_lib.o display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o \
ifdef CONFIG_DRM_AMD_DC_DCN ifdef CONFIG_DRM_AMD_DC_DCN
DML += dcn20/dcn20_fpu.o
DML += display_mode_vba.o dcn20/display_rq_dlg_calc_20.o dcn20/display_mode_vba_20.o DML += display_mode_vba.o dcn20/display_rq_dlg_calc_20.o dcn20/display_mode_vba_20.o
DML += dcn2x/dcn2x.o
DML += dcn20/display_rq_dlg_calc_20v2.o dcn20/display_mode_vba_20v2.o DML += dcn20/display_rq_dlg_calc_20v2.o dcn20/display_mode_vba_20v2.o
DML += dcn21/display_rq_dlg_calc_21.o dcn21/display_mode_vba_21.o DML += dcn21/display_rq_dlg_calc_21.o dcn21/display_mode_vba_21.o
DML += dcn30/display_mode_vba_30.o dcn30/display_rq_dlg_calc_30.o DML += dcn30/display_mode_vba_30.o dcn30/display_rq_dlg_calc_30.o
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "resource.h" #include "resource.h"
#include "dcn2x.h" #include "dcn20_fpu.h"
/** /**
* DOC: DCN2x FPU manipulation Overview * DOC: DCN2x FPU manipulation Overview
......
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
* *
*/ */
#ifndef __DCN2X_H__ #ifndef __DCN20_FPU_H__
#define __DCN2X_H__ #define __DCN20_FPU_H__
void dcn20_populate_dml_writeback_from_context(struct dc *dc, void dcn20_populate_dml_writeback_from_context(struct dc *dc,
struct resource_context *res_ctx, struct resource_context *res_ctx,
display_e2e_pipe_params_st *pipes); display_e2e_pipe_params_st *pipes);
#endif /* __DCN2X_H__ */ #endif /* __DCN20_FPU_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment