drm/amd/display: Refactor HUBP into component folder.
[why] cleaning up the code refactor requires hubp to be in its own component. [how] move all files under newly created hubp folder and fixing the makefiles. Reviewed-by: Martin Leung <martin.leung@amd.com> Acked-by: Tom Chung <chiahsuan.chung@amd.com> Signed-off-by: Bhuvana Chandra Pinninti <bhuvanachandra.pinninti@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Bhuvana Chandra Pinninti
committed by
Alex Deucher
Alex Deucher
parent
d1ae412d74
commit
0cfdfebedc
@@ -36,6 +36,7 @@ subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/optc
|
||||
subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/dpp
|
||||
subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/hubbub
|
||||
subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/dccg
|
||||
subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/hubp
|
||||
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 optc dpp hubbub dccg
|
||||
DC_LIBS = basics bios dml clk_mgr dce gpio hwss irq link virtual dsc resource optc dpp hubbub dccg hubp
|
||||
|
||||
ifdef CONFIG_DRM_AMD_DC_FP
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
DCN10 = dcn10_ipp.o \
|
||||
dcn10_hw_sequencer_debug.o \
|
||||
dcn10_opp.o \
|
||||
dcn10_hubp.o dcn10_mpc.o \
|
||||
dcn10_mpc.o \
|
||||
dcn10_cm_common.o \
|
||||
dcn10_stream_encoder.o dcn10_link_encoder.o
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
#include "ipp.h"
|
||||
#include "mpc.h"
|
||||
#include "reg_helper.h"
|
||||
#include "dcn10_hubp.h"
|
||||
#include "dcn10/dcn10_hubp.h"
|
||||
#include "dcn10/dcn10_hubbub.h"
|
||||
#include "dcn10_cm_common.h"
|
||||
#include "clk_mgr.h"
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
# SPDX-License-Identifier: MIT
|
||||
# Copyright © 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
|
||||
|
||||
DCN20 = dcn20_hubp.o \
|
||||
dcn20_mpc.o dcn20_opp.o dcn20_mmhubbub.o \
|
||||
DCN20 = dcn20_mpc.o dcn20_opp.o dcn20_mmhubbub.o \
|
||||
dcn20_stream_encoder.o dcn20_link_encoder.o \
|
||||
dcn20_vmid.o dcn20_dwb.o dcn20_dwb_scl.o
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: MIT
|
||||
# Copyright © 2021-2024 Advanced Micro Devices, Inc. All rights reserved.
|
||||
|
||||
DCN201 = dcn201_mpc.o dcn201_hubp.o dcn201_opp.o \
|
||||
DCN201 = dcn201_mpc.o dcn201_opp.o \
|
||||
dcn201_link_encoder.o
|
||||
|
||||
AMD_DAL_DCN201 = $(addprefix $(AMDDALPATH)/dc/dcn201/,$(DCN201))
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
# SPDX-License-Identifier: MIT
|
||||
# Copyright © 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
|
||||
|
||||
DCN21 = dcn21_hubp.o \
|
||||
dcn21_link_encoder.o
|
||||
DCN21 = dcn21_link_encoder.o
|
||||
|
||||
AMD_DAL_DCN21 = $(addprefix $(AMDDALPATH)/dc/dcn21/,$(DCN21))
|
||||
|
||||
|
||||
@@ -23,8 +23,7 @@
|
||||
#
|
||||
#
|
||||
|
||||
DCN30 := dcn30_hubp.o \
|
||||
dcn30_mpc.o dcn30_vpg.o \
|
||||
DCN30 := dcn30_mpc.o dcn30_vpg.o \
|
||||
dcn30_afmt.o \
|
||||
dcn30_dio_stream_encoder.o \
|
||||
dcn30_dwb.o \
|
||||
|
||||
@@ -10,8 +10,7 @@
|
||||
#
|
||||
# Makefile for dcn31.
|
||||
|
||||
DCN31 = dcn31_hubp.o \
|
||||
dcn31_dio_link_encoder.o dcn31_panel_cntl.o \
|
||||
DCN31 = 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
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#
|
||||
# Makefile for dcn32.
|
||||
|
||||
DCN32 = dcn32_mmhubbub.o dcn32_hubp.o dcn32_mpc.o \
|
||||
DCN32 = dcn32_mmhubbub.o dcn32_mpc.o \
|
||||
dcn32_dio_stream_encoder.o dcn32_dio_link_encoder.o dcn32_resource_helpers.o \
|
||||
dcn32_hpo_dp_link_encoder.o
|
||||
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
|
||||
DCN35 = dcn35_dio_stream_encoder.o \
|
||||
dcn35_dio_link_encoder.o \
|
||||
dcn35_hubp.o \
|
||||
dcn35_mmhubbub.o dcn35_opp.o dcn35_pg_cntl.o dcn35_dwb.o
|
||||
|
||||
AMD_DAL_DCN35 = $(addprefix $(AMDDALPATH)/dc/dcn35/,$(DCN35))
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
|
||||
# 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 'hubp' sub-component of DAL.
|
||||
#
|
||||
ifdef CONFIG_DRM_AMD_DC_FP
|
||||
###############################################################################
|
||||
# DCN
|
||||
###############################################################################
|
||||
|
||||
HUBP_DCN10 = dcn10_hubp.o
|
||||
|
||||
AMD_DAL_HUBP_DCN10 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn10/,$(HUBP_DCN10))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN10)
|
||||
###############################################################################
|
||||
|
||||
HUBP_DCN20 = dcn20_hubp.o
|
||||
|
||||
AMD_DAL_HUBP_DCN20 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn20/,$(HUBP_DCN20))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN20)
|
||||
|
||||
###############################################################################
|
||||
|
||||
HUBP_DCN201 = dcn201_hubp.o
|
||||
|
||||
AMD_DAL_HUBP_DCN201 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn201/,$(HUBP_DCN201))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN201)
|
||||
|
||||
###############################################################################
|
||||
|
||||
HUBP_DCN21 = dcn21_hubp.o
|
||||
|
||||
AMD_DAL_HUBP_DCN21 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn21/,$(HUBP_DCN21))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN21)
|
||||
|
||||
###############################################################################
|
||||
HUBP_DCN30 = dcn30_hubp.o
|
||||
|
||||
AMD_DAL_HUBP_DCN30 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn30/,$(HUBP_DCN30))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN30)
|
||||
|
||||
###############################################################################
|
||||
|
||||
HUBP_DCN31 = dcn31_hubp.o
|
||||
|
||||
AMD_DAL_HUBP_DCN31 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn31/,$(HUBP_DCN31))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN31)
|
||||
|
||||
###############################################################################
|
||||
|
||||
HUBP_DCN32 = dcn32_hubp.o
|
||||
|
||||
AMD_DAL_HUBP_DCN32 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn32/,$(HUBP_DCN32))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN32)
|
||||
|
||||
###############################################################################
|
||||
|
||||
HUBP_DCN35 = dcn35_hubp.o
|
||||
|
||||
AMD_DAL_HUBP_DCN35 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn35/,$(HUBP_DCN35))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN35)
|
||||
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
endif
|
||||
Reference in New Issue
Block a user