Commit 5aa82e35 authored by Rodrigo Siqueira's avatar Rodrigo Siqueira Committed by Alex Deucher
Browse files

drm/amd/display: Remove dml_common_def file 



During the rework for removing the FPU issues, I found the following
warning:

 [..] dml_common_defs.o: warning: objtool: dml_round()+0x9: FPU
      instruction outside of kernel_fpu_{begin,end}()

This file has a single function that does not need to be in a specific
file. This commit drop dml_common_defs file, and move dml_round function
to dml_inline_defs.

CC: Christian König <christian.koenig@amd.com>
CC: Alexander Deucher <Alexander.Deucher@amd.com>
CC: Peter Zijlstra <peterz@infradead.org>
CC: Tony Cheng <tony.cheng@amd.com>
CC: Harry Wentland <hwentlan@amd.com>
Signed-off-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Reviewed-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b6ef55cc

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -63,10 +63,8 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.o := $(dml_ccflags) 
endif

endif

CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags)

CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags)

CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags)

CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags)

CFLAGS_$(AMDDALPATH)/dc/dml/dml_common_defs.o := $(dml_ccflags)





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 \

	dml_common_defs.o





ifdef CONFIG_DRM_AMD_DC_DCN

ifdef CONFIG_DRM_AMD_DC_DCN

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

drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ 
#ifndef __DML20_DISPLAY_RQ_DLG_CALC_H__

#ifndef __DML20_DISPLAY_RQ_DLG_CALC_H__

#define __DML20_DISPLAY_RQ_DLG_CALC_H__

#define __DML20_DISPLAY_RQ_DLG_CALC_H__





#include "../dml_common_defs.h"

#include "../display_rq_dlg_helpers.h"

#include "../display_rq_dlg_helpers.h"





struct display_mode_lib;

struct display_mode_lib;

drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ 
#ifndef __DML20V2_DISPLAY_RQ_DLG_CALC_H__

#ifndef __DML20V2_DISPLAY_RQ_DLG_CALC_H__

#define __DML20V2_DISPLAY_RQ_DLG_CALC_H__

#define __DML20V2_DISPLAY_RQ_DLG_CALC_H__





#include "../dml_common_defs.h"

#include "../display_rq_dlg_helpers.h"

#include "../display_rq_dlg_helpers.h"





struct display_mode_lib;

struct display_mode_lib;

drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 
#ifndef __DML21_DISPLAY_RQ_DLG_CALC_H__

#ifndef __DML21_DISPLAY_RQ_DLG_CALC_H__

#define __DML21_DISPLAY_RQ_DLG_CALC_H__

#define __DML21_DISPLAY_RQ_DLG_CALC_H__





#include "../dml_common_defs.h"

#include "dm_services.h"

#include "../display_rq_dlg_helpers.h"

#include "../display_rq_dlg_helpers.h"





struct display_mode_lib;

struct display_mode_lib;

drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -25,8 +25,10 @@ 
#ifndef __DISPLAY_MODE_LIB_H__

#ifndef __DISPLAY_MODE_LIB_H__

#define __DISPLAY_MODE_LIB_H__

#define __DISPLAY_MODE_LIB_H__







#include "dm_services.h"

#include "dml_common_defs.h"

#include "dc_features.h"

#include "display_mode_structs.h"

#include "display_mode_enums.h"

#include "display_mode_vba.h"

#include "display_mode_vba.h"





enum dml_project {

enum dml_project {

CRA Git | Maintained and supported by SUSTech CRA and CCSE