Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Bhuvana Chandra Pinninti and committed by
Alex Deucher
0cfdfebe d1ae412d

+102 -14
+1
drivers/gpu/drm/amd/display/Makefile
··· 36 36 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/dpp 37 37 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/hubbub 38 38 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/dccg 39 + subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/hubp 39 40 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/inc 40 41 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/freesync 41 42 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/color
+1 -1
drivers/gpu/drm/amd/display/dc/Makefile
··· 22 22 # 23 23 # Makefile for Display Core (dc) component. 24 24 25 - DC_LIBS = basics bios dml clk_mgr dce gpio hwss irq link virtual dsc resource optc dpp hubbub dccg 25 + DC_LIBS = basics bios dml clk_mgr dce gpio hwss irq link virtual dsc resource optc dpp hubbub dccg hubp 26 26 27 27 ifdef CONFIG_DRM_AMD_DC_FP 28 28
+1 -1
drivers/gpu/drm/amd/display/dc/dcn10/Makefile
··· 25 25 DCN10 = dcn10_ipp.o \ 26 26 dcn10_hw_sequencer_debug.o \ 27 27 dcn10_opp.o \ 28 - dcn10_hubp.o dcn10_mpc.o \ 28 + dcn10_mpc.o \ 29 29 dcn10_cm_common.o \ 30 30 dcn10_stream_encoder.o dcn10_link_encoder.o 31 31
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c drivers/gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.c
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h drivers/gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.h
+1 -1
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.c
··· 40 40 #include "ipp.h" 41 41 #include "mpc.h" 42 42 #include "reg_helper.h" 43 - #include "dcn10_hubp.h" 43 + #include "dcn10/dcn10_hubp.h" 44 44 #include "dcn10/dcn10_hubbub.h" 45 45 #include "dcn10_cm_common.h" 46 46 #include "clk_mgr.h"
+1 -2
drivers/gpu/drm/amd/display/dc/dcn20/Makefile
··· 1 1 # SPDX-License-Identifier: MIT 2 2 # Copyright © 2019-2024 Advanced Micro Devices, Inc. All rights reserved. 3 3 4 - DCN20 = dcn20_hubp.o \ 5 - dcn20_mpc.o dcn20_opp.o dcn20_mmhubbub.o \ 4 + DCN20 = dcn20_mpc.o dcn20_opp.o dcn20_mmhubbub.o \ 6 5 dcn20_stream_encoder.o dcn20_link_encoder.o \ 7 6 dcn20_vmid.o dcn20_dwb.o dcn20_dwb_scl.o 8 7
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c drivers/gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h drivers/gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h
+1 -1
drivers/gpu/drm/amd/display/dc/dcn201/Makefile
··· 1 1 # SPDX-License-Identifier: MIT 2 2 # Copyright © 2021-2024 Advanced Micro Devices, Inc. All rights reserved. 3 3 4 - DCN201 = dcn201_mpc.o dcn201_hubp.o dcn201_opp.o \ 4 + DCN201 = dcn201_mpc.o dcn201_opp.o \ 5 5 dcn201_link_encoder.o 6 6 7 7 AMD_DAL_DCN201 = $(addprefix $(AMDDALPATH)/dc/dcn201/,$(DCN201))
drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubp.c drivers/gpu/drm/amd/display/dc/hubp/dcn201/dcn201_hubp.c
drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubp.h drivers/gpu/drm/amd/display/dc/hubp/dcn201/dcn201_hubp.h
+1 -2
drivers/gpu/drm/amd/display/dc/dcn21/Makefile
··· 1 1 # SPDX-License-Identifier: MIT 2 2 # Copyright © 2019-2024 Advanced Micro Devices, Inc. All rights reserved. 3 3 4 - DCN21 = dcn21_hubp.o \ 5 - dcn21_link_encoder.o 4 + DCN21 = dcn21_link_encoder.o 6 5 7 6 AMD_DAL_DCN21 = $(addprefix $(AMDDALPATH)/dc/dcn21/,$(DCN21)) 8 7
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c drivers/gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.c
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.h drivers/gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.h
+1 -2
drivers/gpu/drm/amd/display/dc/dcn30/Makefile
··· 23 23 # 24 24 # 25 25 26 - DCN30 := dcn30_hubp.o \ 27 - dcn30_mpc.o dcn30_vpg.o \ 26 + DCN30 := dcn30_mpc.o dcn30_vpg.o \ 28 27 dcn30_afmt.o \ 29 28 dcn30_dio_stream_encoder.o \ 30 29 dcn30_dwb.o \
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c drivers/gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h drivers/gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.h
+1 -2
drivers/gpu/drm/amd/display/dc/dcn31/Makefile
··· 10 10 # 11 11 # Makefile for dcn31. 12 12 13 - DCN31 = dcn31_hubp.o \ 14 - dcn31_dio_link_encoder.o dcn31_panel_cntl.o \ 13 + DCN31 = dcn31_dio_link_encoder.o dcn31_panel_cntl.o \ 15 14 dcn31_apg.o dcn31_hpo_dp_stream_encoder.o dcn31_hpo_dp_link_encoder.o \ 16 15 dcn31_afmt.o dcn31_vpg.o 17 16
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c drivers/gpu/drm/amd/display/dc/hubp/dcn31/dcn31_hubp.c
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h drivers/gpu/drm/amd/display/dc/hubp/dcn31/dcn31_hubp.h
+1 -1
drivers/gpu/drm/amd/display/dc/dcn32/Makefile
··· 10 10 # 11 11 # Makefile for dcn32. 12 12 13 - DCN32 = dcn32_mmhubbub.o dcn32_hubp.o dcn32_mpc.o \ 13 + DCN32 = dcn32_mmhubbub.o dcn32_mpc.o \ 14 14 dcn32_dio_stream_encoder.o dcn32_dio_link_encoder.o dcn32_resource_helpers.o \ 15 15 dcn32_hpo_dp_link_encoder.o 16 16
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c drivers/gpu/drm/amd/display/dc/hubp/dcn32/dcn32_hubp.c
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h drivers/gpu/drm/amd/display/dc/hubp/dcn32/dcn32_hubp.h
-1
drivers/gpu/drm/amd/display/dc/dcn35/Makefile
··· 12 12 13 13 DCN35 = dcn35_dio_stream_encoder.o \ 14 14 dcn35_dio_link_encoder.o \ 15 - dcn35_hubp.o \ 16 15 dcn35_mmhubbub.o dcn35_opp.o dcn35_pg_cntl.o dcn35_dwb.o 17 16 18 17 AMD_DAL_DCN35 = $(addprefix $(AMDDALPATH)/dc/dcn35/,$(DCN35))
drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.c drivers/gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.c
drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.h drivers/gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.h
+92
drivers/gpu/drm/amd/display/dc/hubp/Makefile
··· 1 + 2 + # Copyright 2022 Advanced Micro Devices, Inc. 3 + # 4 + # Permission is hereby granted, free of charge, to any person obtaining a 5 + # copy of this software and associated documentation files (the "Software"), 6 + # to deal in the Software without restriction, including without limitation 7 + # the rights to use, copy, modify, merge, publish, distribute, sublicense, 8 + # and/or sell copies of the Software, and to permit persons to whom the 9 + # Software is furnished to do so, subject to the following conditions: 10 + # 11 + # The above copyright notice and this permission notice shall be included in 12 + # all copies or substantial portions of the Software. 13 + # 14 + # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 15 + # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 16 + # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 17 + # THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR 18 + # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 19 + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 20 + # OTHER DEALINGS IN THE SOFTWARE. 21 + # 22 + # Makefile for the 'hubp' sub-component of DAL. 23 + # 24 + ifdef CONFIG_DRM_AMD_DC_FP 25 + ############################################################################### 26 + # DCN 27 + ############################################################################### 28 + 29 + HUBP_DCN10 = dcn10_hubp.o 30 + 31 + AMD_DAL_HUBP_DCN10 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn10/,$(HUBP_DCN10)) 32 + 33 + AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN10) 34 + ############################################################################### 35 + 36 + HUBP_DCN20 = dcn20_hubp.o 37 + 38 + AMD_DAL_HUBP_DCN20 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn20/,$(HUBP_DCN20)) 39 + 40 + AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN20) 41 + 42 + ############################################################################### 43 + 44 + HUBP_DCN201 = dcn201_hubp.o 45 + 46 + AMD_DAL_HUBP_DCN201 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn201/,$(HUBP_DCN201)) 47 + 48 + AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN201) 49 + 50 + ############################################################################### 51 + 52 + HUBP_DCN21 = dcn21_hubp.o 53 + 54 + AMD_DAL_HUBP_DCN21 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn21/,$(HUBP_DCN21)) 55 + 56 + AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN21) 57 + 58 + ############################################################################### 59 + HUBP_DCN30 = dcn30_hubp.o 60 + 61 + AMD_DAL_HUBP_DCN30 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn30/,$(HUBP_DCN30)) 62 + 63 + AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN30) 64 + 65 + ############################################################################### 66 + 67 + HUBP_DCN31 = dcn31_hubp.o 68 + 69 + AMD_DAL_HUBP_DCN31 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn31/,$(HUBP_DCN31)) 70 + 71 + AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN31) 72 + 73 + ############################################################################### 74 + 75 + HUBP_DCN32 = dcn32_hubp.o 76 + 77 + AMD_DAL_HUBP_DCN32 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn32/,$(HUBP_DCN32)) 78 + 79 + AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN32) 80 + 81 + ############################################################################### 82 + 83 + HUBP_DCN35 = dcn35_hubp.o 84 + 85 + AMD_DAL_HUBP_DCN35 = $(addprefix $(AMDDALPATH)/dc/hubp/dcn35/,$(HUBP_DCN35)) 86 + 87 + AMD_DISPLAY_FILES += $(AMD_DAL_HUBP_DCN35) 88 + 89 + ############################################################################### 90 + 91 + ############################################################################### 92 + endif