diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 9b6532a1622b758905609f65d77477731b9db62e..2bf943f7dd8d458de81b81dd2e41506d32cb9e8c 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -36,7 +36,7 @@
 #include "athub/athub_1_0_offset.h"
 
 #include "soc15_common.h"
-#include "vega10/UMC/umc_6_0_sh_mask.h"
+#include "umc/umc_6_0_sh_mask.h"
 
 #include "nbio_v6_1.h"
 #include "nbio_v7_0.h"
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/UMC/umc_6_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_default.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/UMC/umc_6_0_default.h
rename to drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_default.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/UMC/umc_6_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/UMC/umc_6_0_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_offset.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/UMC/umc_6_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_sh_mask.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/UMC/umc_6_0_sh_mask.h
rename to drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_sh_mask.h