diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2017-12-15 16:22:11 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-18 10:59:46 -0500 |
commit | 39c640c086ad12005e88cf6f9de03c32111ef081 (patch) | |
tree | 9dc52c3b1090c8972c32a5d9e326b2c4493e1762 /drivers/gpu/drm/amd/amdgpu | |
parent | 2990a1fc012e1bb4523a54d2c27eebc21a2c7e7e (diff) |
drm/amdgpu: rename amdgpu_need_post
add device to the name for consistency.
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.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 5c016b3d494d..149ed8a67664 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -1893,7 +1893,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) | |||
1893 | int amdgpu_gpu_recover(struct amdgpu_device *adev, struct amdgpu_job* job, bool force); | 1893 | int amdgpu_gpu_recover(struct amdgpu_device *adev, struct amdgpu_job* job, bool force); |
1894 | bool amdgpu_need_backup(struct amdgpu_device *adev); | 1894 | bool amdgpu_need_backup(struct amdgpu_device *adev); |
1895 | void amdgpu_device_pci_config_reset(struct amdgpu_device *adev); | 1895 | void amdgpu_device_pci_config_reset(struct amdgpu_device *adev); |
1896 | bool amdgpu_need_post(struct amdgpu_device *adev); | 1896 | bool amdgpu_device_need_post(struct amdgpu_device *adev); |
1897 | void amdgpu_update_display_priority(struct amdgpu_device *adev); | 1897 | void amdgpu_update_display_priority(struct amdgpu_device *adev); |
1898 | 1898 | ||
1899 | void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes, | 1899 | void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes, |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c index 057e1ecd83ce..a5df80d50d44 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | |||
@@ -93,7 +93,7 @@ static bool igp_read_bios_from_vram(struct amdgpu_device *adev) | |||
93 | resource_size_t size = 256 * 1024; /* ??? */ | 93 | resource_size_t size = 256 * 1024; /* ??? */ |
94 | 94 | ||
95 | if (!(adev->flags & AMD_IS_APU)) | 95 | if (!(adev->flags & AMD_IS_APU)) |
96 | if (amdgpu_need_post(adev)) | 96 | if (amdgpu_device_need_post(adev)) |
97 | return false; | 97 | return false; |
98 | 98 | ||
99 | adev->bios = NULL; | 99 | adev->bios = NULL; |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 38e14525721c..8cc3dcf120d0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
@@ -671,7 +671,7 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev) | |||
671 | * GPU helpers function. | 671 | * GPU helpers function. |
672 | */ | 672 | */ |
673 | /** | 673 | /** |
674 | * amdgpu_need_post - check if the hw need post or not | 674 | * amdgpu_device_need_post - check if the hw need post or not |
675 | * | 675 | * |
676 | * @adev: amdgpu_device pointer | 676 | * @adev: amdgpu_device pointer |
677 | * | 677 | * |
@@ -679,7 +679,7 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev) | |||
679 | * or post is needed if hw reset is performed. | 679 | * or post is needed if hw reset is performed. |
680 | * Returns true if need or false if not. | 680 | * Returns true if need or false if not. |
681 | */ | 681 | */ |
682 | bool amdgpu_need_post(struct amdgpu_device *adev) | 682 | bool amdgpu_device_need_post(struct amdgpu_device *adev) |
683 | { | 683 | { |
684 | uint32_t reg; | 684 | uint32_t reg; |
685 | 685 | ||
@@ -1946,7 +1946,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, | |||
1946 | amdgpu_device_detect_sriov_bios(adev); | 1946 | amdgpu_device_detect_sriov_bios(adev); |
1947 | 1947 | ||
1948 | /* Post card if necessary */ | 1948 | /* Post card if necessary */ |
1949 | if (amdgpu_need_post(adev)) { | 1949 | if (amdgpu_device_need_post(adev)) { |
1950 | if (!adev->bios) { | 1950 | if (!adev->bios) { |
1951 | dev_err(adev->dev, "no vBIOS found\n"); | 1951 | dev_err(adev->dev, "no vBIOS found\n"); |
1952 | r = -EINVAL; | 1952 | r = -EINVAL; |
@@ -2275,7 +2275,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) | |||
2275 | } | 2275 | } |
2276 | 2276 | ||
2277 | /* post card */ | 2277 | /* post card */ |
2278 | if (amdgpu_need_post(adev)) { | 2278 | if (amdgpu_device_need_post(adev)) { |
2279 | r = amdgpu_atom_asic_init(adev->mode_info.atom_context); | 2279 | r = amdgpu_atom_asic_init(adev->mode_info.atom_context); |
2280 | if (r) | 2280 | if (r) |
2281 | DRM_ERROR("amdgpu asic init failed\n"); | 2281 | DRM_ERROR("amdgpu asic init failed\n"); |