diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3826-drm-amdgpu-Disable-irq-on-device-before-destroying-i.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3826-drm-amdgpu-Disable-irq-on-device-before-destroying-i.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3826-drm-amdgpu-Disable-irq-on-device-before-destroying-i.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3826-drm-amdgpu-Disable-irq-on-device-before-destroying-i.patch new file mode 100644 index 00000000..c56495e3 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3826-drm-amdgpu-Disable-irq-on-device-before-destroying-i.patch @@ -0,0 +1,46 @@ +From 47c6044a203e7ab52ef61f4c534593e8ba7d1572 Mon Sep 17 00:00:00 2001 +From: Mikita Lipski <mikita.lipski@amd.com> +Date: Thu, 15 Mar 2018 09:37:08 -0400 +Subject: [PATCH 3826/4131] drm/amdgpu: Disable irq on device before destroying + it + +Disable irq on devices before destroying them. That prevents +use-after-free memory access when unloading the driver. + +Signed-off-by: Mikita Lipski <mikita.lipski@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Kalyan Alle <kalyan.alle@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 023be4b..dc71a0e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -1507,6 +1507,9 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) + int i, r; + + amdgpu_amdkfd_device_fini(adev); ++ /* disable all interrupts */ ++ amdgpu_irq_disable_all(adev); ++ + /* need to disable SMC first */ + for (i = 0; i < adev->num_ip_blocks; i++) { + if (!adev->ip_blocks[i].status.hw) +@@ -1558,12 +1561,6 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) + adev->ip_blocks[i].status.hw = false; + } + +- if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU) +- amdgpu_ucode_fini_bo(adev); +- +- /* disable all interrupts */ +- amdgpu_irq_disable_all(adev); +- + for (i = adev->num_ip_blocks - 1; i >= 0; i--) { + if (!adev->ip_blocks[i].status.sw) + continue; +-- +2.7.4 + |