Commit a149f0bd authored by Alexandre Demers's avatar Alexandre Demers Committed by Alex Deucher
Browse files

drm/amd/display/dc: reclassify DCE6 resources and hw sequencer 



Classify DCE6 resource and sequencer as they are for other DCE versions

Put dce60_resource.c and .h under amd/display/dc/resource/dce60
Put and rename dce60_hw_sequencer.c and .h under amd/display/dc/hwss/dce60

v2: fix build when CONFIG_DRM_AMD_DC_SI=n (Alex)

Signed-off-by: default avatarAlexandre Demers <alexandre.f.demers@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6ffc6e05

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

+1 −2
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ 


CFLAGS_$(AMDDALPATH)/dc/dce60/dce60_resource.o = -Wno-override-init



DCE60 = dce60_timing_generator.o dce60_hw_sequencer.o \

	dce60_resource.o

DCE60 = dce60_timing_generator.o



AMD_DAL_DCE60 = $(addprefix $(AMDDALPATH)/dc/dce60/,$(DCE60))

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

+18 −8
Original line number Diff line number Diff line
@@ -27,6 +27,24 @@ 
#  DCE

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



ifdef CONFIG_DRM_AMD_DC_SI

HWSS_DCE60 = dce60_hwseq.o



AMD_DAL_HWSS_DCE60 = $(addprefix $(AMDDALPATH)/dc/hwss/dce60/,$(HWSS_DCE60))



AMD_DISPLAY_FILES += $(AMD_DAL_HWSS_DCE60)

endif



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



HWSS_DCE80 = dce80_hwseq.o



AMD_DAL_HWSS_DCE80 = $(addprefix $(AMDDALPATH)/dc/hwss/dce80/,$(HWSS_DCE80))



AMD_DISPLAY_FILES += $(AMD_DAL_HWSS_DCE80)



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



HWSS_DCE = dce_hwseq.o



AMD_DAL_HWSS_DCE = $(addprefix $(AMDDALPATH)/dc/hwss/dce/,$(HWSS_DCE))
@@ -65,14 +83,6 @@ AMD_DAL_HWSS_DCE120 = $(addprefix $(AMDDALPATH)/dc/hwss/dce120/,$(HWSS_DCE120)) 


AMD_DISPLAY_FILES += $(AMD_DAL_HWSS_DCE120)



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



HWSS_DCE80 = dce80_hwseq.o



AMD_DAL_HWSS_DCE80 = $(addprefix $(AMDDALPATH)/dc/hwss/dce80/,$(HWSS_DCE80))



AMD_DISPLAY_FILES += $(AMD_DAL_HWSS_DCE80)



ifdef CONFIG_DRM_AMD_DC_FP

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

# DCN

drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.c→drivers/gpu/drm/amd/display/dc/hwss/dce60/dce60_hwseq.c

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

#include "dc.h"

#include "core_types.h"

#include "dce60_hw_sequencer.h"

#include "dce60_hwseq.h"



#include "dce/dce_hwseq.h"

#include "dce110/dce110_hwseq.h"

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

+18 −8
Original line number Diff line number Diff line
@@ -27,6 +27,24 @@ 
#  DCE

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



ifdef CONFIG_DRM_AMD_DC_SI

RESOURCE_DCE60 = dce60_resource.o



AMD_DAL_RESOURCE_DCE60 = $(addprefix $(AMDDALPATH)/dc/resource/dce60/,$(RESOURCE_DCE60))



AMD_DISPLAY_FILES += $(AMD_DAL_RESOURCE_DCE60)

endif



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



RESOURCE_DCE80 = dce80_resource.o



AMD_DAL_RESOURCE_DCE80 = $(addprefix $(AMDDALPATH)/dc/resource/dce80/,$(RESOURCE_DCE80))



AMD_DISPLAY_FILES += $(AMD_DAL_RESOURCE_DCE80)



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



RESOURCE_DCE100 = dce100_resource.o



AMD_DAL_RESOURCE_DCE100 = $(addprefix $(AMDDALPATH)/dc/resource/dce100/,$(RESOURCE_DCE100))
@@ -57,14 +75,6 @@ AMD_DAL_RESOURCE_DCE120 = $(addprefix $(AMDDALPATH)/dc/resource/dce120/,$(RESOUR 


AMD_DISPLAY_FILES += $(AMD_DAL_RESOURCE_DCE120)



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



RESOURCE_DCE80 = dce80_resource.o



AMD_DAL_RESOURCE_DCE80 = $(addprefix $(AMDDALPATH)/dc/resource/dce80/,$(RESOURCE_DCE80))



AMD_DISPLAY_FILES += $(AMD_DAL_RESOURCE_DCE80)



ifdef CONFIG_DRM_AMD_DC_FP

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

# DCN