aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2017-12-14 16:22:53 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-12-18 10:59:18 -0500
commit8111c387275f64aae972d5717d32b0f756bb6e5f (patch)
treee27b9dc40e2ff8aa35d8c8f263eb48fa8dbc66a7 /drivers/gpu/drm/amd/amdgpu
parent9c3f2b54746f764e1b695797c78bc46b8713f067 (diff)
drm/amdgpu: rename amdgpu_pci_config_reset
add device for consistency with other functions in this file. Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/cik.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vi.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index f10f4fc7dbe0..941535d94f87 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1899,7 +1899,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
1899/* Common functions */ 1899/* Common functions */
1900int amdgpu_gpu_recover(struct amdgpu_device *adev, struct amdgpu_job* job, bool force); 1900int amdgpu_gpu_recover(struct amdgpu_device *adev, struct amdgpu_job* job, bool force);
1901bool amdgpu_need_backup(struct amdgpu_device *adev); 1901bool amdgpu_need_backup(struct amdgpu_device *adev);
1902void amdgpu_pci_config_reset(struct amdgpu_device *adev); 1902void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);
1903bool amdgpu_need_post(struct amdgpu_device *adev); 1903bool amdgpu_need_post(struct amdgpu_device *adev);
1904void amdgpu_update_display_priority(struct amdgpu_device *adev); 1904void amdgpu_update_display_priority(struct amdgpu_device *adev);
1905 1905
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 05e5c6822f9c..2ff4194fd153 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -377,7 +377,7 @@ void amdgpu_device_program_register_sequence(struct amdgpu_device *adev,
377 } 377 }
378} 378}
379 379
380void amdgpu_pci_config_reset(struct amdgpu_device *adev) 380void amdgpu_device_pci_config_reset(struct amdgpu_device *adev)
381{ 381{
382 pci_write_config_dword(adev->pdev, 0x7c, AMDGPU_ASIC_RESET_DATA); 382 pci_write_config_dword(adev->pdev, 0x7c, AMDGPU_ASIC_RESET_DATA);
383} 383}
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 39d49712f8c9..132ba226f289 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -1246,7 +1246,7 @@ static int cik_gpu_pci_config_reset(struct amdgpu_device *adev)
1246 /* disable BM */ 1246 /* disable BM */
1247 pci_clear_master(adev->pdev); 1247 pci_clear_master(adev->pdev);
1248 /* reset */ 1248 /* reset */
1249 amdgpu_pci_config_reset(adev); 1249 amdgpu_device_pci_config_reset(adev);
1250 1250
1251 udelay(100); 1251 udelay(100);
1252 1252
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 0b57c5d24510..0e1202914fa8 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -667,7 +667,7 @@ static int vi_gpu_pci_config_reset(struct amdgpu_device *adev)
667 /* disable BM */ 667 /* disable BM */
668 pci_clear_master(adev->pdev); 668 pci_clear_master(adev->pdev);
669 /* reset */ 669 /* reset */
670 amdgpu_pci_config_reset(adev); 670 amdgpu_device_pci_config_reset(adev);
671 671
672 udelay(100); 672 udelay(100);
673 673