drm/amd/display: Refactor HUBBUB into component folder
[why] cleaning up the code refactor requires hubbub to be in its own component. [how] Move all files under newly created hubbub folder and fix the makefiles. Reviewed-by: Martin Leung <martin.leung@amd.com> Acked-by: Wayne Lin <wayne.lin@amd.com> Signed-off-by: Revalla Hari Krishna <harikrishna.revalla@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Revalla Hari Krishna
committed by
Alex Deucher
Alex Deucher
parent
3351c608f3
commit
f9c7818c9d
@@ -34,6 +34,7 @@ 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)/dc/dpp
|
||||
subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/hubbub
|
||||
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
|
||||
DC_LIBS = basics bios dml clk_mgr dce gpio hwss irq link virtual dsc resource optc dpp hubbub
|
||||
|
||||
ifdef CONFIG_DRM_AMD_DC_FP
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ DCN10 = dcn10_ipp.o \
|
||||
dcn10_opp.o \
|
||||
dcn10_hubp.o dcn10_mpc.o \
|
||||
dcn10_cm_common.o \
|
||||
dcn10_hubbub.o dcn10_stream_encoder.o dcn10_link_encoder.o
|
||||
dcn10_stream_encoder.o dcn10_link_encoder.o
|
||||
|
||||
AMD_DAL_DCN10 = $(addprefix $(AMDDALPATH)/dc/dcn10/,$(DCN10))
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "mpc.h"
|
||||
#include "reg_helper.h"
|
||||
#include "dcn10_hubp.h"
|
||||
#include "dcn10_hubbub.h"
|
||||
#include "dcn10/dcn10_hubbub.h"
|
||||
#include "dcn10_cm_common.h"
|
||||
#include "clk_mgr.h"
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
# Makefile for DCN.
|
||||
|
||||
DCN20 = dcn20_hubp.o \
|
||||
dcn20_mpc.o dcn20_opp.o dcn20_hubbub.o dcn20_mmhubbub.o \
|
||||
dcn20_mpc.o dcn20_opp.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
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
# SPDX-License-Identifier: MIT
|
||||
#
|
||||
# Makefile for DCN.
|
||||
DCN201 = dcn201_hubbub.o\
|
||||
dcn201_mpc.o dcn201_hubp.o dcn201_opp.o \
|
||||
DCN201 = dcn201_mpc.o dcn201_hubp.o dcn201_opp.o \
|
||||
dcn201_dccg.o dcn201_link_encoder.o
|
||||
|
||||
AMD_DAL_DCN201 = $(addprefix $(AMDDALPATH)/dc/dcn201/,$(DCN201))
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#
|
||||
# Makefile for DCN21.
|
||||
|
||||
DCN21 = dcn21_hubp.o dcn21_hubbub.o \
|
||||
DCN21 = dcn21_hubp.o \
|
||||
dcn21_link_encoder.o dcn21_dccg.o
|
||||
|
||||
AMD_DAL_DCN21 = $(addprefix $(AMDDALPATH)/dc/dcn21/,$(DCN21))
|
||||
|
||||
@@ -23,8 +23,7 @@
|
||||
#
|
||||
#
|
||||
|
||||
DCN30 := dcn30_hubbub.o \
|
||||
dcn30_hubp.o \
|
||||
DCN30 := dcn30_hubp.o \
|
||||
dcn30_dccg.o \
|
||||
dcn30_mpc.o dcn30_vpg.o \
|
||||
dcn30_afmt.o \
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
# Makefile for dcn30.
|
||||
|
||||
DCN301 = dcn301_dccg.o \
|
||||
dcn301_dio_link_encoder.o dcn301_panel_cntl.o dcn301_hubbub.o
|
||||
dcn301_dio_link_encoder.o dcn301_panel_cntl.o
|
||||
|
||||
AMD_DAL_DCN301 = $(addprefix $(AMDDALPATH)/dc/dcn301/,$(DCN301))
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#
|
||||
# Makefile for dcn31.
|
||||
|
||||
DCN31 = dcn31_hubbub.o dcn31_hubp.o \
|
||||
DCN31 = dcn31_hubp.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
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#
|
||||
# Makefile for dcn32.
|
||||
|
||||
DCN32 = dcn32_hubbub.o dcn32_dccg.o \
|
||||
DCN32 = dcn32_dccg.o \
|
||||
dcn32_mmhubbub.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
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
DCN35 = dcn35_dio_stream_encoder.o \
|
||||
dcn35_dio_link_encoder.o dcn35_dccg.o \
|
||||
dcn35_hubp.o dcn35_hubbub.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,100 @@
|
||||
|
||||
# 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 'hubbub' sub-component of DAL.
|
||||
#
|
||||
ifdef CONFIG_DRM_AMD_DC_FP
|
||||
###############################################################################
|
||||
# DCN
|
||||
###############################################################################
|
||||
|
||||
HUBBUB_DCN10 = dcn10_hubbub.o
|
||||
|
||||
AMD_DAL_HUBBUB_DCN10 = $(addprefix $(AMDDALPATH)/dc/hubbub/dcn10/,$(HUBBUB_DCN10))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBBUB_DCN10)
|
||||
|
||||
###############################################################################
|
||||
|
||||
HUBBUB_DCN20 = dcn20_hubbub.o
|
||||
|
||||
AMD_DAL_HUBBUB_DCN20 = $(addprefix $(AMDDALPATH)/dc/hubbub/dcn20/,$(HUBBUB_DCN20))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBBUB_DCN20)
|
||||
|
||||
###############################################################################
|
||||
|
||||
HUBBUB_DCN201 = dcn201_hubbub.o
|
||||
|
||||
AMD_DAL_HUBBUB_DCN201 = $(addprefix $(AMDDALPATH)/dc/hubbub/dcn201/,$(HUBBUB_DCN201))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBBUB_DCN201)
|
||||
|
||||
###############################################################################
|
||||
|
||||
HUBBUB_DCN21 = dcn21_hubbub.o
|
||||
|
||||
AMD_DAL_HUBBUB_DCN21 = $(addprefix $(AMDDALPATH)/dc/hubbub/dcn21/,$(HUBBUB_DCN21))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBBUB_DCN21)
|
||||
|
||||
###############################################################################
|
||||
HUBBUB_DCN30 = dcn30_hubbub.o
|
||||
|
||||
AMD_DAL_HUBBUB_DCN30 = $(addprefix $(AMDDALPATH)/dc/hubbub/dcn30/,$(HUBBUB_DCN30))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBBUB_DCN30)
|
||||
|
||||
###############################################################################
|
||||
HUBBUB_DCN301 = dcn301_hubbub.o
|
||||
|
||||
AMD_DAL_HUBBUB_DCN301 = $(addprefix $(AMDDALPATH)/dc/hubbub/dcn301/,$(HUBBUB_DCN301))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBBUB_DCN301)
|
||||
|
||||
###############################################################################
|
||||
|
||||
HUBBUB_DCN31 = dcn31_hubbub.o
|
||||
|
||||
AMD_DAL_HUBBUB_DCN31 = $(addprefix $(AMDDALPATH)/dc/hubbub/dcn31/,$(HUBBUB_DCN31))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBBUB_DCN31)
|
||||
|
||||
###############################################################################
|
||||
HUBBUB_DCN32 = dcn32_hubbub.o
|
||||
|
||||
AMD_DAL_HUBBUB_DCN32 = $(addprefix $(AMDDALPATH)/dc/hubbub/dcn32/,$(HUBBUB_DCN32))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBBUB_DCN32)
|
||||
|
||||
###############################################################################
|
||||
|
||||
HUBBUB_DCN35 = dcn35_hubbub.o
|
||||
|
||||
AMD_DAL_HUBBUB_DCN35 = $(addprefix $(AMDDALPATH)/dc/hubbub/dcn35/,$(HUBBUB_DCN35))
|
||||
|
||||
AMD_DISPLAY_FILES += $(AMD_DAL_HUBBUB_DCN35)
|
||||
|
||||
###############################################################################
|
||||
|
||||
|
||||
###############################################################################
|
||||
endif
|
||||
+1
-1
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
#include "dm_services.h"
|
||||
#include "dcn10_hubp.h"
|
||||
#include "dcn10/dcn10_hubp.h"
|
||||
#include "dcn10_hubbub.h"
|
||||
#include "reg_helper.h"
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@
|
||||
#define __DC_HUBBUB_DCN20_H__
|
||||
|
||||
#include "dcn10/dcn10_hubbub.h"
|
||||
#include "dcn20_vmid.h"
|
||||
#include "dcn20/dcn20_vmid.h"
|
||||
|
||||
#define TO_DCN20_HUBBUB(hubbub)\
|
||||
container_of(hubbub, struct dcn20_hubbub, base)
|
||||
Reference in New Issue
Block a user