Commit 8b8eed05 authored by Mounika Adhuri's avatar Mounika Adhuri Committed by Alex Deucher
Browse files

drm/amd/display: Refactor resource into component directory 



[WHY]
Move all resource files to unique folder resource.

[HOW]
Created resource folder in dc, moved the
dcnxx_resource.c and dcnxx_resource.h files into
corresponding new folders inside the resource and
made appropriate changes for compilation in Makefiles.

Reviewed-by: default avatarMartin Leung <martin.leung@amd.com>
Acked-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarMounika Adhuri <moadhuri@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c41028a2

drivers/gpu/drm/amd/display/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/inc/ 
subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/inc/hw

subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/clk_mgr

subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/hwss

subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/resource

subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/inc

subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/freesync

subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/color

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include "amdgpu_dm_debugfs.h"

#endif



#include "dc/dcn20/dcn20_resource.h"

#include "dc/resource/dcn20/dcn20_resource.h"



#define PEAK_FACTOR_X1000 1006

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

+1 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#

# Makefile for Display Core (dc) component.



DC_LIBS = basics bios dml clk_mgr dce gpio hwss irq link virtual dsc

DC_LIBS = basics bios dml clk_mgr dce gpio hwss irq link virtual dsc resource



ifdef CONFIG_DRM_AMD_DC_FP
@@ -38,8 +38,6 @@ DC_LIBS += dcn302 
DC_LIBS += dcn303

DC_LIBS += dcn31

DC_LIBS += dcn314

DC_LIBS += dcn315

DC_LIBS += dcn316

DC_LIBS += dcn32

DC_LIBS += dcn321

DC_LIBS += dcn35
@@ -51,7 +49,6 @@ DC_LIBS += dce120 


DC_LIBS += dce112

DC_LIBS += dce110

DC_LIBS += dce100

DC_LIBS += dce80



ifdef CONFIG_DRM_AMD_DC_SI

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+2 −2
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ 
#include "dcn314/dcn314_resource.h"

#include "dcn315/dcn315_resource.h"

#include "dcn316/dcn316_resource.h"

#include "../dcn32/dcn32_resource.h"

#include "../dcn321/dcn321_resource.h"

#include "dcn32/dcn32_resource.h"

#include "dcn321/dcn321_resource.h"

#include "dcn35/dcn35_resource.h"



#define VISUAL_CONFIRM_BASE_DEFAULT 3

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

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
#

# Copyright 2017 Advanced Micro Devices, Inc.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the "Software"),

# to deal in the Software without restriction, including without limitation

# the rights to use, copy, modify, merge, publish, distribute, sublicense,

# and/or sell copies of the Software, and to permit persons to whom the

# Software is furnished to do so, subject to the following conditions:

#

# The above copyright notice and this permission notice shall be included in

# all copies or substantial portions of the Software.

#

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

# THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

# OTHER DEALINGS IN THE SOFTWARE.

#

#

# Makefile for the 'controller' sub-component of DAL.

# It provides the control and status of HW CRTC block.



CFLAGS_$(AMDDALPATH)/dc/dce100/dce100_resource.o = $(call cc-disable-warning, override-init)



DCE100 = dce100_resource.o



AMD_DAL_DCE100 = $(addprefix $(AMDDALPATH)/dc/dce100/,$(DCE100))



AMD_DISPLAY_FILES += $(AMD_DAL_DCE100)





###############################################################################

# DCE 10x

###############################################################################

ifdef 0#CONFIG_DRM_AMD_DC_DCE11_0

TG_DCE100 = dce100_resource.o



AMD_DAL_TG_DCE100 = $(addprefix \

	$(AMDDALPATH)/dc/dce100/,$(TG_DCE100))



AMD_DISPLAY_FILES += $(AMD_DAL_TG_DCE100)

endif