diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2976-drm-amdgpu-rename-amdgpu_pci_config_reset.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2976-drm-amdgpu-rename-amdgpu_pci_config_reset.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2976-drm-amdgpu-rename-amdgpu_pci_config_reset.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2976-drm-amdgpu-rename-amdgpu_pci_config_reset.patch new file mode 100644 index 00000000..6daeaa4a --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2976-drm-amdgpu-rename-amdgpu_pci_config_reset.patch @@ -0,0 +1,74 @@ +From 015fb6552f5e1d66bbb933e8242e854bb81d3e8f Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Thu, 14 Dec 2017 16:22:53 -0500 +Subject: [PATCH 2976/4131] drm/amdgpu: rename amdgpu_pci_config_reset +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 2 +- + 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 fb313c2..0008a99 100755 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -1970,7 +1970,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 2eeed96..b6d8b50 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -376,7 +376,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 39d4971..132ba22 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) + /* 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 42a3b27..cc7cf05 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vi.c ++++ b/drivers/gpu/drm/amd/amdgpu/vi.c +@@ -672,7 +672,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); + +-- +2.7.4 + |