From f9c7818c9d653e40dbd3c7e9c857e5b00dfca622 Mon Sep 17 00:00:00 2001 From: Revalla Hari Krishna Date: Thu, 18 Apr 2024 18:16:40 +0530 Subject: [PATCH 0072/1625] 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 Acked-by: Wayne Lin Signed-off-by: Revalla Hari Krishna Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- .../gpu/drm/amd/display/dc/{ => hubbub}/dcn10/dcn10_hubbub.c | 2 +- .../gpu/drm/amd/display/dc/{ => hubbub}/dcn10/dcn10_hubbub.h | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn20/dcn20_hubbub.c | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn20/dcn20_hubbub.h | 2 +- .../gpu/drm/amd/display/dc/{ => hubbub}/dcn201/dcn201_hubbub.c | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn201/dcn201_hubbub.h | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn21/dcn21_hubbub.c | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn21/dcn21_hubbub.h | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn30/dcn30_hubbub.c | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn30/dcn30_hubbub.h | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn301/dcn301_hubbub.c | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn301/dcn301_hubbub.h | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn31/dcn31_hubbub.c | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn31/dcn31_hubbub.h | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn32/dcn32_hubbub.c | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn32/dcn32_hubbub.h | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn35/dcn35_hubbub.c | 0 .../gpu/drm/amd/display/dc/{ => hubbub}/dcn35/dcn35_hubbub.h | 0 19 files changed, 3 insertions(+), 3 deletions(-) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn10/dcn10_hubbub.c (99%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn10/dcn10_hubbub.h (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn20/dcn20_hubbub.c (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn20/dcn20_hubbub.h (99%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn201/dcn201_hubbub.c (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn201/dcn201_hubbub.h (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn21/dcn21_hubbub.c (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn21/dcn21_hubbub.h (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn30/dcn30_hubbub.c (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn30/dcn30_hubbub.h (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn301/dcn301_hubbub.c (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn301/dcn301_hubbub.h (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn31/dcn31_hubbub.c (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn31/dcn31_hubbub.h (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn32/dcn32_hubbub.c (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn32/dcn32_hubbub.h (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn35/dcn35_hubbub.c (100%) rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn35/dcn35_hubbub.h (100%) diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.c index c51b717e5622..3adef474ed26 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.c @@ -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" diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c similarity index 99% rename from drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c index 6dd355a03033..d738a36f2132 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c @@ -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" diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h b/drivers/gpu/drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.c similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.c diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h b/drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.h similarity index 99% rename from drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.h index 24a9c45988ed..036bb3e6c957 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.h @@ -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) diff --git a/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn201/dcn201_hubbub.c similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.c rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn201/dcn201_hubbub.c diff --git a/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.h b/drivers/gpu/drm/amd/display/dc/hubbub/dcn201/dcn201_hubbub.h similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.h rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn201/dcn201_hubbub.h diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.c similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.c diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h b/drivers/gpu/drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.h similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.h diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h b/drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.h similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.h diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn301/dcn301_hubbub.c similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn301/dcn301_hubbub.c diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.h b/drivers/gpu/drm/amd/display/dc/hubbub/dcn301/dcn301_hubbub.h similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.h rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn301/dcn301_hubbub.h diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h b/drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.h similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.h diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h b/drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.h similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.h diff --git a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c diff --git a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.h b/drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.h similarity index 100% rename from drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.h rename to drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.h -- 2.52.0