Commit 6ca7415f authored by Wenjing Liu's avatar Wenjing Liu Committed by Alex Deucher
Browse files

drm/amd/display: merge dc_link_dp into dc_link 



[why]
Temporarly merge dc_link_dp functions into dc_link for the
purpose of removing dc_link_dp files. This is a transitional
change for later commits where we will further refactor dc_link
file.

Reviewed-by: default avatarGeorge Shen <George.Shen@amd.com>
Acked-by: default avatarAlan Liu <HaoPing.Liu@amd.com>
Signed-off-by: default avatarWenjing Liu <wenjing.liu@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent de3fb390

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

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


#include "dm_services_types.h"

#include "dc.h"

#include "dc_link_dp.h"

#include "link_enc_cfg.h"

#include "dc/inc/core_types.h"

#include "dal_asic_id.h"

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

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 
#include "dmub/dmub_srv.h"

#include "resource.h"

#include "dsc.h"

#include "dc_link_dp.h"

#include "dc_link.h"

#include "link_hwss.h"

#include "dc/dc_dmub_srv.h"

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

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include "amdgpu_dm_mst_types.h"

#include "dpcd_defs.h"

#include "dc/inc/core_types.h"

#include "dc_link_dp.h"



#include "dm_helpers.h"

#include "ddc_service_types.h"

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

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include "dc.h"

#include "dm_helpers.h"



#include "dc_link_dp.h"

#include "ddc_service_types.h"

#include "dpcd_defs.h"

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

+1 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ AMD_DC = $(addsuffix /Makefile, $(addprefix $(FULL_AMD_DISPLAY_PATH)/dc/,$(DC_LI 
include $(AMD_DC)



DISPLAY_CORE = dc.o dc_stat.o dc_link.o dc_resource.o dc_hw_sequencer.o dc_sink.o \

dc_surface.o dc_link_dp.o dc_debug.o dc_stream.o \

dc_link_enc_cfg.o

dc_surface.o dc_debug.o dc_stream.o dc_link_enc_cfg.o



DISPLAY_CORE += dc_vm_helper.o