[3/3] drm/amd/amdgpu: Rename all dal references to dc

Submitted by Harry Wentland on Dec. 1, 2016, 7:17 p.m.

Details

Message ID 20161201191709.29654-3-harry.wentland@amd.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Harry Wentland Dec. 1, 2016, 7:17 p.m.
find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" | xargs sed -i 's/dal/dc/g'

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h         |  6 +++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c  | 28 ++++++++++++++--------------
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h     |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c     |  6 +++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c     |  2 +-
 drivers/gpu/drm/amd/amdgpu/cik.c            |  4 ++--
 drivers/gpu/drm/amd/amdgpu/cz_dpm.c         |  6 +++---
 drivers/gpu/drm/amd/amdgpu/vi.c             | 10 +++++-----
 9 files changed, 33 insertions(+), 33 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 928d38ebd83b..676f06924bd9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -90,7 +90,7 @@  extern int amdgpu_vm_size;
 extern int amdgpu_vm_block_size;
 extern int amdgpu_vm_fault_stop;
 extern int amdgpu_vm_debug;
-extern int amdgpu_dal;
+extern int amdgpu_dc;
 extern int amdgpu_sched_jobs;
 extern int amdgpu_sched_hw_submission;
 extern int amdgpu_powerplay;
@@ -1502,8 +1502,8 @@  void amdgpu_io_wreg(struct amdgpu_device *adev, u32 reg, u32 v);
 
 u32 amdgpu_mm_rdoorbell(struct amdgpu_device *adev, u32 index);
 void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32 index, u32 v);
-bool amdgpu_device_asic_has_dal_support(enum amd_asic_type asic_type);
-bool amdgpu_device_has_dal_support(struct amdgpu_device *adev);
+bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type);
+bool amdgpu_device_has_dc_support(struct amdgpu_device *adev);
 /*
  * Registers read & write functions.
  */
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index e5d6cbf2ed53..ee0df0e9c7a9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1571,25 +1571,25 @@  static int amdgpu_resume(struct amdgpu_device *adev)
 	return 0;
 }
 
-bool amdgpu_device_asic_has_dal_support(enum amd_asic_type asic_type)
+bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)
 {
 	switch (asic_type) {
 #if defined(CONFIG_DRM_AMD_DC)
 	case CHIP_BONAIRE:
 	case CHIP_HAWAII:
-		return amdgpu_dal != 0;
+		return amdgpu_dc != 0;
 #endif
 #if defined(CONFIG_DRM_AMD_DC)
 	case CHIP_CARRIZO:
 	case CHIP_STONEY:
 	case CHIP_POLARIS11:
 	case CHIP_POLARIS10:
-		return amdgpu_dal != 0;
+		return amdgpu_dc != 0;
 #endif
 #if defined(CONFIG_DRM_AMD_DC)
 	case CHIP_TONGA:
 	case CHIP_FIJI:
-		return amdgpu_dal != 0;
+		return amdgpu_dc != 0;
 #endif
 	default:
 		return false;
@@ -1597,15 +1597,15 @@  bool amdgpu_device_asic_has_dal_support(enum amd_asic_type asic_type)
 }
 
 /**
- * amdgpu_device_has_dal_support - check if dal is supported
+ * amdgpu_device_has_dc_support - check if dc is supported
  *
  * @adev: amdgpu_device_pointer
  *
  * Returns true for supported, false for not supported
  */
-bool amdgpu_device_has_dal_support(struct amdgpu_device *adev)
+bool amdgpu_device_has_dc_support(struct amdgpu_device *adev)
 {
-	return amdgpu_device_asic_has_dal_support(adev->asic_type);
+	return amdgpu_device_asic_has_dc_support(adev->asic_type);
 }
 
 static void amdgpu_device_detect_sriov_bios(struct amdgpu_device *adev)
@@ -1796,7 +1796,7 @@  int amdgpu_device_init(struct amdgpu_device *adev,
 	}
 
 	/* init i2c buses */
-	if (!amdgpu_device_has_dal_support(adev))
+	if (!amdgpu_device_has_dc_support(adev))
 		amdgpu_atombios_i2c_init(adev);
 
 	/* Fence driver */
@@ -1914,7 +1914,7 @@  void amdgpu_device_fini(struct amdgpu_device *adev)
 	r = amdgpu_fini(adev);
 	adev->accel_working = false;
 	/* free i2c buses */
-	if (!amdgpu_device_has_dal_support(adev))
+	if (!amdgpu_device_has_dc_support(adev))
 		amdgpu_i2c_fini(adev);
 	amdgpu_atombios_fini(adev);
 	kfree(adev->bios);
@@ -1967,7 +1967,7 @@  int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon)
 
 	drm_kms_helper_poll_disable(dev);
 
-	if (!amdgpu_device_has_dal_support(adev)) {
+	if (!amdgpu_device_has_dc_support(adev)) {
 		/* turn off display hw */
 		drm_modeset_lock_all(dev);
 		list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
@@ -2118,7 +2118,7 @@  int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
 
 	/* blat the mode back in */
 	if (fbcon) {
-		if (!amdgpu_device_has_dal_support(adev)) {
+		if (!amdgpu_device_has_dc_support(adev)) {
 			/* pre DCE11 */
 			drm_helper_resume_force_mode(dev);
 
@@ -2153,7 +2153,7 @@  int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
 #ifdef CONFIG_PM
 	dev->dev->power.disable_depth++;
 #endif
-	if (!amdgpu_device_has_dal_support(adev))
+	if (!amdgpu_device_has_dc_support(adev))
 		drm_helper_hpd_irq_event(dev);
 	else
 		drm_kms_helper_hotplug_event(dev);
@@ -2323,7 +2323,7 @@  int amdgpu_gpu_reset(struct amdgpu_device *adev)
 	/* block TTM */
 	resched = ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);
 	/* store modesetting */
-	if (amdgpu_device_has_dal_support(adev))
+	if (amdgpu_device_has_dc_support(adev))
 		state = drm_atomic_helper_suspend(adev->ddev);
 
 	/* block scheduler */
@@ -2434,7 +2434,7 @@  retry:
 		}
 	}
 
-	if (amdgpu_device_has_dal_support(adev)) {
+	if (amdgpu_device_has_dc_support(adev)) {
 		r = drm_atomic_helper_resume(adev->ddev, state);
 		amdgpu_dm_display_resume(adev);
 	} else
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 783e1d892325..eeaac0a10327 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -664,7 +664,7 @@  int amdgpu_modeset_create_props(struct amdgpu_device *adev)
 					 "dither",
 					 amdgpu_dither_enum_list, sz);
 
-	if (amdgpu_device_has_dal_support(adev)) {
+	if (amdgpu_device_has_dc_support(adev)) {
 		adev->mode_info.freesync_property =
 			drm_property_create_bool(adev->ddev, 0, "freesync");
 		if (!adev->mode_info.freesync_property)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
index 955d6f21e2b3..e673f0804ec1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
@@ -467,7 +467,7 @@  struct amdgpu_pm {
 	const struct amdgpu_dpm_funcs *funcs;
 	uint32_t                pcie_gen_mask;
 	uint32_t                pcie_mlw_mask;
-	struct amd_pp_display_configuration pm_display_cfg;/* set by DAL */
+	struct amd_pp_display_configuration pm_display_cfg;/* set by dc */
 };
 
 #define R600_SSTU_DFLT                               0
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index ef6d24f467f6..3aaf99accf2c 100755
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -88,7 +88,7 @@  int amdgpu_vm_fault_stop = 0;
 int amdgpu_vm_debug = 0;
 int amdgpu_vram_page_split = 1024;
 int amdgpu_exp_hw_support = 0;
-int amdgpu_dal = -1;
+int amdgpu_dc = -1;
 int amdgpu_sched_jobs = 32;
 int amdgpu_sched_hw_submission = 2;
 int amdgpu_powerplay = -1;
@@ -174,8 +174,8 @@  module_param_named(vram_page_split, amdgpu_vram_page_split, int, 0444);
 MODULE_PARM_DESC(exp_hw_support, "experimental hw support (1 = enable, 0 = disable (default))");
 module_param_named(exp_hw_support, amdgpu_exp_hw_support, int, 0444);
 
-MODULE_PARM_DESC(dal, "DAL display driver (1 = enable, 0 = disable, -1 = auto (default))");
-module_param_named(dal, amdgpu_dal, int, 0444);
+MODULE_PARM_DESC(dc, "Display Core driver (1 = enable, 0 = disable, -1 = auto (default))");
+module_param_named(dc, amdgpu_dc, int, 0444);
 
 MODULE_PARM_DESC(sched_jobs, "the max number of jobs supported in the sw queue (default 32)");
 module_param_named(sched_jobs, amdgpu_sched_jobs, int, 0444);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index d4c7fbdac9f3..efada9477589 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -231,7 +231,7 @@  int amdgpu_irq_init(struct amdgpu_device *adev)
 		}
 	}
 
-	if (!amdgpu_device_has_dal_support(adev)) {
+	if (!amdgpu_device_has_dc_support(adev)) {
 		r = drm_vblank_init(adev->ddev, adev->mode_info.num_crtc);
 		if (r)
 			return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index b3bb192008bc..ef3b30275867 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -1900,7 +1900,7 @@  int cik_set_ip_blocks(struct amdgpu_device *adev)
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
 #if defined(CONFIG_DRM_AMD_DC)
-		else if (amdgpu_device_has_dal_support(adev))
+		else if (amdgpu_device_has_dc_support(adev))
 			amdgpu_ip_block_add(adev, &dm_ip_block);
 #endif
 		else
@@ -1918,7 +1918,7 @@  int cik_set_ip_blocks(struct amdgpu_device *adev)
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
 #if defined(CONFIG_DRM_AMD_DC)
-		else if (amdgpu_device_has_dal_support(adev))
+		else if (amdgpu_device_has_dc_support(adev))
 			amdgpu_ip_block_add(adev, &dm_ip_block);
 #endif
 		else
diff --git a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
index ba2b66be9022..9f0aedee1383 100644
--- a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
@@ -1597,7 +1597,7 @@  static int cz_dpm_set_deep_sleep_sclk_threshold(struct amdgpu_device *adev)
 	return 0;
 }
 
-/* ?? without dal support, is this still needed in setpowerstate list*/
+/* ?? without dc support, is this still needed in setpowerstate list*/
 static int cz_dpm_set_watermark_threshold(struct amdgpu_device *adev)
 {
 	struct cz_power_info *pi = cz_get_pi(adev);
@@ -1614,7 +1614,7 @@  static int cz_dpm_enable_nbdpm(struct amdgpu_device *adev)
 	int ret = 0;
 	struct cz_power_info *pi = cz_get_pi(adev);
 
-	/* also depend on dal NBPStateDisableRequired */
+	/* also depend on dc NBPStateDisableRequired */
 	if (pi->nb_dpm_enabled_by_driver && !pi->nb_dpm_enabled) {
 		ret = cz_send_msg_to_smc_with_parameter(adev,
 				PPSMC_MSG_EnableAllSmuFeatures,
@@ -2047,7 +2047,7 @@  static int cz_dpm_force_dpm_level(struct amdgpu_device *adev,
 }
 
 /* fix me, display configuration change lists here
- * mostly dal related*/
+ * mostly dc related*/
 static void cz_dpm_display_configuration_changed(struct amdgpu_device *adev)
 {
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 31304d544ba9..cd07d7e30351 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -1299,7 +1299,7 @@  int vi_set_ip_blocks(struct amdgpu_device *adev)
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
 #if defined(CONFIG_DRM_AMD_DC)
-		else if (amdgpu_device_has_dal_support(adev))
+		else if (amdgpu_device_has_dc_support(adev))
 			amdgpu_ip_block_add(adev, &dm_ip_block);
 #endif
 		else
@@ -1317,7 +1317,7 @@  int vi_set_ip_blocks(struct amdgpu_device *adev)
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
 #if defined(CONFIG_DRM_AMD_DC)
-		else if (amdgpu_device_has_dal_support(adev))
+		else if (amdgpu_device_has_dc_support(adev))
 			amdgpu_ip_block_add(adev, &dm_ip_block);
 #endif
 		else
@@ -1336,7 +1336,7 @@  int vi_set_ip_blocks(struct amdgpu_device *adev)
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
 #if defined(CONFIG_DRM_AMD_DC)
-		else if (amdgpu_device_has_dal_support(adev))
+		else if (amdgpu_device_has_dc_support(adev))
 			amdgpu_ip_block_add(adev, &dm_ip_block);
 #endif
 		else
@@ -1354,7 +1354,7 @@  int vi_set_ip_blocks(struct amdgpu_device *adev)
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
 #if defined(CONFIG_DRM_AMD_DC)
-		else if (amdgpu_device_has_dal_support(adev))
+		else if (amdgpu_device_has_dc_support(adev))
 			amdgpu_ip_block_add(adev, &dm_ip_block);
 #endif
 		else
@@ -1375,7 +1375,7 @@  int vi_set_ip_blocks(struct amdgpu_device *adev)
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
 #if defined(CONFIG_DRM_AMD_DC)
-		else if (amdgpu_device_has_dal_support(adev))
+		else if (amdgpu_device_has_dc_support(adev))
 			amdgpu_ip_block_add(adev, &dm_ip_block);
 #endif
 		else