drm/amd/display: Refactor OPTC into component folder
[why] Move all optc files to unique folder optc. [how] creating optc repo in dc, and moved the dcnxx_optc.c and .h files into corresponding new folders inside the optc and cleared the linkage errors by adding relative paths in the Makefile.template. Reviewed-by: Martin Leung <martin.leung@amd.com> Acked-by: Hamza Mahfooz <hamza.mahfooz@amd.com> Signed-off-by: Parandhaman K <parandhaman.k@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Parandhaman K
committed by
Alex Deucher
Alex Deucher
parent
5a9a2cc8ae
commit
3d0fe49454
@@ -32,6 +32,7 @@ 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)/dc/dsc
|
||||
subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/optc
|
||||
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
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#
|
||||
# Makefile for Display Core (dc) component.
|
||||
|
||||
DC_LIBS = basics bios dml clk_mgr dce gpio hwss irq link virtual dsc resource
|
||||
DC_LIBS = basics bios dml clk_mgr dce gpio hwss irq link virtual dsc resource optc
|
||||
|
||||
ifdef CONFIG_DRM_AMD_DC_FP
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
DCN10 = dcn10_init.o dcn10_ipp.o \
|
||||
dcn10_hw_sequencer_debug.o \
|
||||
dcn10_dpp.o dcn10_opp.o dcn10_optc.o \
|
||||
dcn10_dpp.o dcn10_opp.o \
|
||||
dcn10_hubp.o dcn10_mpc.o \
|
||||
dcn10_dpp_dscl.o dcn10_dpp_cm.o dcn10_cm_common.o \
|
||||
dcn10_hubbub.o dcn10_stream_encoder.o dcn10_link_encoder.o
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "dce/dce_hwseq.h"
|
||||
#include "abm.h"
|
||||
#include "dmcu.h"
|
||||
#include "dcn10_optc.h"
|
||||
#include "dcn10/dcn10_optc.h"
|
||||
#include "dcn10/dcn10_dpp.h"
|
||||
#include "dcn10/dcn10_mpc.h"
|
||||
#include "timing_generator.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
# Makefile for DCN.
|
||||
|
||||
DCN20 = dcn20_init.o dcn20_dpp.o dcn20_dpp_cm.o dcn20_hubp.o \
|
||||
dcn20_mpc.o dcn20_opp.o dcn20_hubbub.o dcn20_optc.o dcn20_mmhubbub.o \
|
||||
dcn20_mpc.o dcn20_opp.o dcn20_hubbub.o dcn20_mmhubbub.o \
|
||||
dcn20_stream_encoder.o dcn20_link_encoder.o dcn20_dccg.o \
|
||||
dcn20_vmid.o dcn20_dwb.o dcn20_dwb_scl.o
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
# Makefile for DCN.
|
||||
DCN201 = dcn201_init.o \
|
||||
dcn201_hubbub.o\
|
||||
dcn201_mpc.o dcn201_hubp.o dcn201_opp.o dcn201_optc.o dcn201_dpp.o \
|
||||
dcn201_mpc.o dcn201_hubp.o dcn201_opp.o dcn201_dpp.o \
|
||||
dcn201_dccg.o dcn201_link_encoder.o
|
||||
|
||||
AMD_DAL_DCN201 = $(addprefix $(AMDDALPATH)/dc/dcn201/,$(DCN201))
|
||||
|
||||
@@ -28,7 +28,6 @@ DCN30 := \
|
||||
dcn30_hubbub.o \
|
||||
dcn30_hubp.o \
|
||||
dcn30_dpp.o \
|
||||
dcn30_optc.o \
|
||||
dcn30_dccg.o \
|
||||
dcn30_mpc.o dcn30_vpg.o \
|
||||
dcn30_afmt.o \
|
||||
|
||||
@@ -11,8 +11,7 @@
|
||||
# Makefile for dcn30.
|
||||
|
||||
DCN301 = dcn301_init.o dcn301_dccg.o \
|
||||
dcn301_dio_link_encoder.o dcn301_panel_cntl.o dcn301_hubbub.o \
|
||||
dcn301_optc.o
|
||||
dcn301_dio_link_encoder.o dcn301_panel_cntl.o dcn301_hubbub.o
|
||||
|
||||
AMD_DAL_DCN301 = $(addprefix $(AMDDALPATH)/dc/dcn301/,$(DCN301))
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
# Makefile for dcn31.
|
||||
|
||||
DCN31 = dcn31_hubbub.o dcn31_init.o dcn31_hubp.o \
|
||||
dcn31_dccg.o dcn31_optc.o dcn31_dio_link_encoder.o dcn31_panel_cntl.o \
|
||||
dcn31_dccg.o dcn31_dio_link_encoder.o dcn31_panel_cntl.o \
|
||||
dcn31_apg.o dcn31_hpo_dp_stream_encoder.o dcn31_hpo_dp_link_encoder.o \
|
||||
dcn31_afmt.o dcn31_vpg.o
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
# Makefile for dcn314.
|
||||
|
||||
DCN314 = dcn314_init.o \
|
||||
dcn314_dio_stream_encoder.o dcn314_dccg.o dcn314_optc.o
|
||||
dcn314_dio_stream_encoder.o dcn314_dccg.o
|
||||
|
||||
AMD_DAL_DCN314 = $(addprefix $(AMDDALPATH)/dc/dcn314/,$(DCN314))
|
||||
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
# Makefile for dcn32.
|
||||
|
||||
DCN32 = dcn32_hubbub.o dcn32_init.o dcn32_dccg.o \
|
||||
dcn32_dccg.o dcn32_optc.o dcn32_mmhubbub.o dcn32_hubp.o dcn32_dpp.o \
|
||||
dcn32_dio_stream_encoder.o dcn32_dio_link_encoder.o dcn32_hpo_dp_link_encoder.o \
|
||||
dcn32_resource_helpers.o dcn32_mpc.o
|
||||
dcn32_mmhubbub.o dcn32_dpp.o dcn32_hubp.o dcn32_mpc.o \
|
||||
dcn32_dio_stream_encoder.o dcn32_dio_link_encoder.o dcn32_resource_helpers.o \
|
||||
dcn32_hpo_dp_link_encoder.o
|
||||
|
||||
AMD_DAL_DCN32 = $(addprefix $(AMDDALPATH)/dc/dcn32/,$(DCN32))
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
# Makefile for DCN35.
|
||||
|
||||
DCN35 = dcn35_init.o dcn35_dio_stream_encoder.o \
|
||||
dcn35_dio_link_encoder.o dcn35_dccg.o dcn35_optc.o \
|
||||
dcn35_dio_link_encoder.o dcn35_dccg.o \
|
||||
dcn35_hubp.o dcn35_hubbub.o \
|
||||
dcn35_mmhubbub.o dcn35_opp.o dcn35_dpp.o dcn35_pg_cntl.o dcn35_dwb.o
|
||||
|
||||
|
||||
@@ -0,0 +1,108 @@
|
||||
|
||||
# Copyright 2022 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 'optc' sub-component of DAL.
|
||||
#
|
||||
|
||||
|
||||
ifdef CONFIG_DRM_AMD_DC_FP
|
||||
###############################################################################
|
||||
# DCN
|
||||
###############################################################################
|
||||
|
||||
OPTC_DCN10 = dcn10_optc.o
|
||||
|
||||
AMD_DAL_OPTC_DCN10 = $(addprefix $(AMDDALPATH)/dc/optc/dcn10/,$(OPTC_DCN10))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_OPTC_DCN10)
|
||||
|
||||
###############################################################################
|
||||
|
||||
OPTC_DCN20 = dcn20_optc.o
|
||||
|
||||
AMD_DAL_OPTC_DCN20 = $(addprefix $(AMDDALPATH)/dc/optc/dcn20/,$(OPTC_DCN20))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_OPTC_DCN20)
|
||||
|
||||
###############################################################################
|
||||
|
||||
OPTC_DCN201 = dcn201_optc.o
|
||||
|
||||
AMD_DAL_OPTC_DCN201 = $(addprefix $(AMDDALPATH)/dc/optc/dcn201/,$(OPTC_DCN201))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_OPTC_DCN201)
|
||||
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
|
||||
OPTC_DCN30 = dcn30_optc.o
|
||||
|
||||
AMD_DAL_OPTC_DCN30 = $(addprefix $(AMDDALPATH)/dc/optc/dcn30/,$(OPTC_DCN30))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_OPTC_DCN30)
|
||||
|
||||
###############################################################################
|
||||
|
||||
OPTC_DCN301 = dcn301_optc.o
|
||||
|
||||
AMD_DAL_OPTC_DCN301 = $(addprefix $(AMDDALPATH)/dc/optc/dcn301/,$(OPTC_DCN301))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_OPTC_DCN301)
|
||||
|
||||
###############################################################################
|
||||
|
||||
OPTC_DCN31 = dcn31_optc.o
|
||||
|
||||
AMD_DAL_OPTC_DCN31 = $(addprefix $(AMDDALPATH)/dc/optc/dcn31/,$(OPTC_DCN31))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_OPTC_DCN31)
|
||||
|
||||
###############################################################################
|
||||
|
||||
OPTC_DCN314 = dcn314_optc.o
|
||||
|
||||
AMD_DAL_OPTC_DCN314 = $(addprefix $(AMDDALPATH)/dc/optc/dcn314/,$(OPTC_DCN314))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_OPTC_DCN314)
|
||||
|
||||
###############################################################################
|
||||
|
||||
OPTC_DCN32 = dcn32_optc.o
|
||||
|
||||
AMD_DAL_OPTC_DCN32 = $(addprefix $(AMDDALPATH)/dc/optc/dcn32/,$(OPTC_DCN32))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_OPTC_DCN32)
|
||||
|
||||
###############################################################################
|
||||
|
||||
OPTC_DCN35 = dcn35_optc.o
|
||||
|
||||
AMD_DAL_OPTC_DCN35 = $(addprefix $(AMDDALPATH)/dc/optc/dcn35/,$(OPTC_DCN35))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_OPTC_DCN35)
|
||||
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
endif
|
||||
+1
-1
@@ -26,7 +26,7 @@
|
||||
#ifndef __DC_OPTC_DCN20_H__
|
||||
#define __DC_OPTC_DCN20_H__
|
||||
|
||||
#include "../dcn10/dcn10_optc.h"
|
||||
#include "dcn10/dcn10_optc.h"
|
||||
|
||||
#define TG_COMMON_REG_LIST_DCN2_0(inst) \
|
||||
TG_COMMON_REG_LIST_DCN(inst),\
|
||||
Reference in New Issue
Block a user