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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index f10f4fc7dbe0fd77a5a2250cccb3d04c9cc37c30..941535d94f87742a7d4aedc02ab13044ea5b78ad 100644 (file)
--- 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)
 /* Common functions */
 int amdgpu_gpu_recover(struct amdgpu_device *adev, struct amdgpu_job* job, bool force);
 bool amdgpu_need_backup(struct amdgpu_device *adev);
-void amdgpu_pci_config_reset(struct amdgpu_device *adev);
+void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);
 bool amdgpu_need_post(struct amdgpu_device *adev);
 void amdgpu_update_display_priority(struct amdgpu_device *adev);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 05e5c6822f9c1dd8fd77e07985fcbde0ce631075..2ff4194fd1533d48258a6381b4dfdd04ae04bfb1 100644 (file)
--- 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,
        }
 }
 
-void amdgpu_pci_config_reset(struct amdgpu_device *adev)
+void amdgpu_device_pci_config_reset(struct amdgpu_device *adev)
 {
        pci_write_config_dword(adev->pdev, 0x7c, AMDGPU_ASIC_RESET_DATA);
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 39d49712f8c9dafc2b2a909d1366268b36670c5f..132ba226f2895ee3dec6279d55d206904b576988 100644 (file)
--- 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)
        /* disable BM */
        pci_clear_master(adev->pdev);
        /* reset */
-       amdgpu_pci_config_reset(adev);
+       amdgpu_device_pci_config_reset(adev);
 
        udelay(100);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 0b57c5d24510a1c5655b9b52c393e74fac76c984..0e1202914fa805d640bb870bd1c4aca7f9fadd2e 100644 (file)
--- 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)
        /* disable BM */
        pci_clear_master(adev->pdev);
        /* reset */
-       amdgpu_pci_config_reset(adev);
+       amdgpu_device_pci_config_reset(adev);
 
        udelay(100);