inside amdgpu and display:
find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" | xargs sed -i 's/DRM_AMD_DAL/DRM_AMD_DC/g'
find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" | xargs sed -i 's/DEBUG_KERNEL_DAL/DEBUG_KERNEL_DC/g'
Signed-off-by: Harry Wentland <harry.wentland at amd.com>
Acked-by: Alex Deucher <alexander.deucher at amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++---
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +-
drivers/gpu/drm/amd/amdgpu/cik.c | 4 ++--
drivers/gpu/drm/amd/amdgpu/vi.c | 10 +++++-----
drivers/gpu/drm/amd/display/Kconfig | 6 +++---
drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 2 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++--
drivers/gpu/drm/amd/display/dc/dce100/Makefile | 2 +-
drivers/gpu/drm/amd/display/dc/dce110/dce110_types.h | 2 +-
drivers/gpu/drm/amd/display/dc/dm_services.h | 2 +-
drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h | 6 +++---
drivers/gpu/drm/amd/display/dc/gpio/gpio_regs.h | 6 +++---
drivers/gpu/drm/amd/display/dc/gpio/hpd_regs.h | 6 +++---
drivers/gpu/drm/amd/display/dc/inc/gamma_calcs.h | 6 +++---
drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 6 +++---
drivers/gpu/drm/amd/display/dc/inc/resource.h | 6 +++---
17 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 4f64bb16a8d3..928d38ebd83b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1774,7 +1774,7 @@ amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,
uint64_t addr, struct amdgpu_bo **bo);
int amdgpu_cs_sysvm_access_required(struct amdgpu_cs_parser *parser);
-#if defined(CONFIG_DRM_AMD_DAL)
+#if defined(CONFIG_DRM_AMD_DC)
int amdgpu_dm_display_resume(struct amdgpu_device *adev );
#else
static inline int amdgpu_dm_display_resume(struct amdgpu_device *adev) { return 0; }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 25ad736b5ca5..e5d6cbf2ed53 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1574,19 +1574,19 @@ static int amdgpu_resume(struct amdgpu_device *adev)
bool amdgpu_device_asic_has_dal_support(enum amd_asic_type asic_type)
{
switch (asic_type) {
-#if defined(CONFIG_DRM_AMD_DAL)
+#if defined(CONFIG_DRM_AMD_DC)
case CHIP_BONAIRE:
case CHIP_HAWAII:
return amdgpu_dal != 0;
#endif
-#if defined(CONFIG_DRM_AMD_DAL)
+#if defined(CONFIG_DRM_AMD_DC)
case CHIP_CARRIZO:
case CHIP_STONEY:
case CHIP_POLARIS11:
case CHIP_POLARIS10:
return amdgpu_dal != 0;
#endif
-#if defined(CONFIG_DRM_AMD_DAL)
+#if defined(CONFIG_DRM_AMD_DC)
case CHIP_TONGA:
case CHIP_FIJI:
return amdgpu_dal != 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index 3cf3a19a5ca1..d4c7fbdac9f3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -36,7 +36,7 @@
#include <linux/pm_runtime.h>
-#ifdef CONFIG_DRM_AMD_DAL
+#ifdef CONFIG_DRM_AMD_DC
#include "amdgpu_dm_irq.h"
#endif
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 130022f8910d..b3bb192008bc 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -1899,7 +1899,7 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
if (adev->enable_virtual_display)
amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
-#if defined(CONFIG_DRM_AMD_DAL)
+#if defined(CONFIG_DRM_AMD_DC)
else if (amdgpu_device_has_dal_support(adev))
amdgpu_ip_block_add(adev, &dm_ip_block);
#endif
@@ -1917,7 +1917,7 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
if (adev->enable_virtual_display)
amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
-#if defined(CONFIG_DRM_AMD_DAL)
+#if defined(CONFIG_DRM_AMD_DC)
else if (amdgpu_device_has_dal_support(adev))
amdgpu_ip_block_add(adev, &dm_ip_block);
#endif
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index aab1c4672c33..31304d544ba9 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -1298,7 +1298,7 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)
amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
if (adev->enable_virtual_display)
amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
-#if defined(CONFIG_DRM_AMD_DAL)
+#if defined(CONFIG_DRM_AMD_DC)
else if (amdgpu_device_has_dal_support(adev))
amdgpu_ip_block_add(adev, &dm_ip_block);
#endif
@@ -1316,7 +1316,7 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)
amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
if (adev->enable_virtual_display)
amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
-#if defined(CONFIG_DRM_AMD_DAL)
+#if defined(CONFIG_DRM_AMD_DC)
else if (amdgpu_device_has_dal_support(adev))
amdgpu_ip_block_add(adev, &dm_ip_block);
#endif
@@ -1335,7 +1335,7 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)
amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
if (adev->enable_virtual_display)
amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
-#if defined(CONFIG_DRM_AMD_DAL)
+#if defined(CONFIG_DRM_AMD_DC)
else if (amdgpu_device_has_dal_support(adev))
amdgpu_ip_block_add(adev, &dm_ip_block);
#endif
@@ -1353,7 +1353,7 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)
amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
if (adev->enable_virtual_display)
amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
-#if defined(CONFIG_DRM_AMD_DAL)
+#if defined(CONFIG_DRM_AMD_DC)
else if (amdgpu_device_has_dal_support(adev))
amdgpu_ip_block_add(adev, &dm_ip_block);
#endif
@@ -1374,7 +1374,7 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)
amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
if (adev->enable_virtual_display)
amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
-#if defined(CONFIG_DRM_AMD_DAL)
+#if defined(CONFIG_DRM_AMD_DC)
else if (amdgpu_device_has_dal_support(adev))
amdgpu_ip_block_add(adev, &dm_ip_block);
#endif
diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig
index e5444234ca78..3426ad38a90d 100644
--- a/drivers/gpu/drm/amd/display/Kconfig
+++ b/drivers/gpu/drm/amd/display/Kconfig
@@ -1,7 +1,7 @@
menu "Display Engine Configuration"
depends on DRM && (DRM_AMDSOC || DRM_AMDGPU)
-config DRM_AMD_DAL
+config DRM_AMD_DC
bool "AMD DAL - Enable new display engine (will be deprecated when the development is done)"
help
Choose this option if you want to use the new display engine
@@ -10,9 +10,9 @@ config DRM_AMD_DAL
Will be deprecated when the DAL component becomes stable and
AMDSOC will fully switch to it.
-config DEBUG_KERNEL_DAL
+config DEBUG_KERNEL_DC
bool "Enable kgdb break in DAL"
- depends on DRM_AMD_DAL
+ depends on DRM_AMD_DC
help
Choose this option
if you want to hit
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/Makefile b/drivers/gpu/drm/amd/display/amdgpu_dm/Makefile
index f5023675860f..2e1f9c4e7839 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/Makefile
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/Makefile
@@ -6,7 +6,7 @@
AMDGPUDM = amdgpu_dm_types.o amdgpu_dm.o amdgpu_dm_irq.o amdgpu_dm_mst_types.o
-ifneq ($(CONFIG_DRM_AMD_DAL),)
+ifneq ($(CONFIG_DRM_AMD_DC),)
AMDGPUDM += amdgpu_dm_services.o amdgpu_dm_helpers.o
endif
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index d54324eca528..a4a6269b9b6b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1469,7 +1469,7 @@ static const struct amdgpu_display_funcs dm_dce_v11_0_display_funcs = {
};
-#if defined(CONFIG_DEBUG_KERNEL_DAL)
+#if defined(CONFIG_DEBUG_KERNEL_DC)
static ssize_t s3_debug_store(
struct device *device,
@@ -1562,7 +1562,7 @@ static int dm_early_init(void *handle)
/* Note: Do NOT change adev->audio_endpt_rreg and
* adev->audio_endpt_wreg because they are initialised in
* amdgpu_device_init() */
-#if defined(CONFIG_DEBUG_KERNEL_DAL)
+#if defined(CONFIG_DEBUG_KERNEL_DC)
device_create_file(
adev->ddev->dev,
&dev_attr_s3_debug);
diff --git a/drivers/gpu/drm/amd/display/dc/dce100/Makefile b/drivers/gpu/drm/amd/display/dc/dce100/Makefile
index 656c38e1b0f5..d9a8270e9861 100644
--- a/drivers/gpu/drm/amd/display/dc/dce100/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dce100/Makefile
@@ -12,7 +12,7 @@ AMD_DAL_FILES += $(AMD_DAL_DCE100)
###############################################################################
# DCE 10x
###############################################################################
-ifdef 0#CONFIG_DRM_AMD_DAL_DCE11_0
+ifdef 0#CONFIG_DRM_AMD_DC_DCE11_0
TG_DCE100 = dce100_resource.o
AMD_DAL_TG_DCE100 = $(addprefix \
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_types.h b/drivers/gpu/drm/amd/display/dc/dce110/dce110_types.h
index f68d51cb78e6..55f52382ddfb 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_types.h
@@ -27,4 +27,4 @@
#define GAMMA_SEGMENTS_NUM 16
-#endif /* DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_DCE110_DCE110_TYPES_H_ */
+#endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_DCE110_DCE110_TYPES_H_ */
diff --git a/drivers/gpu/drm/amd/display/dc/dm_services.h b/drivers/gpu/drm/amd/display/dc/dm_services.h
index 9cb874a03d54..7a3f10354830 100644
--- a/drivers/gpu/drm/amd/display/dc/dm_services.h
+++ b/drivers/gpu/drm/amd/display/dc/dm_services.h
@@ -59,7 +59,7 @@
} while (0)
#endif
-#if defined(CONFIG_DEBUG_KERNEL_DAL)
+#if defined(CONFIG_DEBUG_KERNEL_DC)
#define ASSERT(expr) ASSERT_CRITICAL(expr)
#else
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h b/drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h
index ddd0de0950a6..9c4a56c738c0 100644
--- a/drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h
+++ b/drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h
@@ -23,8 +23,8 @@
*
*/
-#ifndef DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_GPIO_DDC_REGS_H_
-#define DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_GPIO_DDC_REGS_H_
+#ifndef DRIVERS_GPU_DRM_AMD_DC_DEV_DC_GPIO_DDC_REGS_H_
+#define DRIVERS_GPU_DRM_AMD_DC_DEV_DC_GPIO_DDC_REGS_H_
#include "gpio_regs.h"
@@ -147,4 +147,4 @@ struct ddc_sh_mask {
}
-#endif /* DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_GPIO_DDC_REGS_H_ */
+#endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_GPIO_DDC_REGS_H_ */
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/gpio_regs.h b/drivers/gpu/drm/amd/display/dc/gpio/gpio_regs.h
index ffc289730598..5c5925299f8d 100644
--- a/drivers/gpu/drm/amd/display/dc/gpio/gpio_regs.h
+++ b/drivers/gpu/drm/amd/display/dc/gpio/gpio_regs.h
@@ -23,8 +23,8 @@
*
*/
-#ifndef DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_GPIO_GPIO_REGS_H_
-#define DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_GPIO_GPIO_REGS_H_
+#ifndef DRIVERS_GPU_DRM_AMD_DC_DEV_DC_GPIO_GPIO_REGS_H_
+#define DRIVERS_GPU_DRM_AMD_DC_DEV_DC_GPIO_GPIO_REGS_H_
struct gpio_registers {
uint32_t MASK_reg;
@@ -42,4 +42,4 @@ struct gpio_registers {
};
-#endif /* DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_GPIO_GPIO_REGS_H_ */
+#endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_GPIO_GPIO_REGS_H_ */
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hpd_regs.h b/drivers/gpu/drm/amd/display/dc/gpio/hpd_regs.h
index f5cbe9ad00e6..dcfdd71b2304 100644
--- a/drivers/gpu/drm/amd/display/dc/gpio/hpd_regs.h
+++ b/drivers/gpu/drm/amd/display/dc/gpio/hpd_regs.h
@@ -23,8 +23,8 @@
*
*/
-#ifndef DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_GPIO_HPD_REGS_H_
-#define DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_GPIO_HPD_REGS_H_
+#ifndef DRIVERS_GPU_DRM_AMD_DC_DEV_DC_GPIO_HPD_REGS_H_
+#define DRIVERS_GPU_DRM_AMD_DC_DEV_DC_GPIO_HPD_REGS_H_
#include "gpio_regs.h"
@@ -76,4 +76,4 @@ struct hpd_sh_mask {
};
-#endif /* DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_GPIO_HPD_REGS_H_ */
+#endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_GPIO_HPD_REGS_H_ */
diff --git a/drivers/gpu/drm/amd/display/dc/inc/gamma_calcs.h b/drivers/gpu/drm/amd/display/dc/inc/gamma_calcs.h
index 2064f280a90e..e2c63fd4fe92 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/gamma_calcs.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/gamma_calcs.h
@@ -5,8 +5,8 @@
* Author: yonsun
*/
-#ifndef DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_INC_GAMMA_CALCS_H_
-#define DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_INC_GAMMA_CALCS_H_
+#ifndef DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_GAMMA_CALCS_H_
+#define DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_GAMMA_CALCS_H_
#include "opp.h"
#include "core_types.h"
@@ -16,4 +16,4 @@ bool calculate_regamma_params(struct pwl_params *params,
const struct core_gamma *ramp,
const struct core_surface *surface);
-#endif /* DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_INC_GAMMA_CALCS_H_ */
+#endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_GAMMA_CALCS_H_ */
diff --git a/drivers/gpu/drm/amd/display/dc/inc/reg_helper.h b/drivers/gpu/drm/amd/display/dc/inc/reg_helper.h
index 92a699337322..159b2c519f2b 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/reg_helper.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/reg_helper.h
@@ -22,8 +22,8 @@
* Authors: AMD
*/
-#ifndef DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_INC_REG_HELPER_H_
-#define DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_INC_REG_HELPER_H_
+#ifndef DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_REG_HELPER_H_
+#define DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_REG_HELPER_H_
#include "dm_services.h"
@@ -287,4 +287,4 @@ uint32_t generic_reg_get5(const struct dc_context *ctx, uint32_t addr,
uint8_t shift4, uint32_t mask4, uint32_t *field_value4,
uint8_t shift5, uint32_t mask5, uint32_t *field_value5);
-#endif /* DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_INC_REG_HELPER_H_ */
+#endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_REG_HELPER_H_ */
diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h b/drivers/gpu/drm/amd/display/dc/inc/resource.h
index c1a236d54f72..8dd676de6b07 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/resource.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h
@@ -22,8 +22,8 @@
* Authors: AMD
*/
-#ifndef DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_INC_RESOURCE_H_
-#define DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_INC_RESOURCE_H_
+#ifndef DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_RESOURCE_H_
+#define DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_RESOURCE_H_
#include "core_types.h"
#include "core_status.h"
@@ -161,4 +161,4 @@ bool pipe_need_reprogram(
struct pipe_ctx *pipe_ctx);
-#endif /* DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_INC_RESOURCE_H_ */
+#endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_RESOURCE_H_ */
--
2.9.3
