diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4389-drm-amd-amdgpu-finish-delay-works-before-release-res.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4389-drm-amd-amdgpu-finish-delay-works-before-release-res.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4389-drm-amd-amdgpu-finish-delay-works-before-release-res.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4389-drm-amd-amdgpu-finish-delay-works-before-release-res.patch new file mode 100644 index 00000000..2e6ac402 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4389-drm-amd-amdgpu-finish-delay-works-before-release-res.patch @@ -0,0 +1,62 @@ +From 54629ccae746e54a45eb3ab21782716af37ea1b1 Mon Sep 17 00:00:00 2001 +From: Jesse Zhang <zhexi.zhang@amd.com> +Date: Fri, 8 Nov 2019 18:06:07 +0800 +Subject: [PATCH 4389/4736] drm/amd/amdgpu: finish delay works before release + resources +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +flush/cancel delayed works before doing finalization +to avoid concurrently requests. + +Change-Id: I85b7ffbb34875af1c734cb4573a6ecc71d39d652 +Signed-off-by: Jesse Zhang <zhexi.zhang@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 1 + + 3 files changed, 5 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 09ef0eaf1abc..8bfbcbcb7f2e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -3118,6 +3118,9 @@ void amdgpu_device_fini(struct amdgpu_device *adev) + + DRM_INFO("amdgpu: finishing device.\n"); + adev->shutdown = true; ++ ++ flush_delayed_work(&adev->delayed_init_work); ++ + /* disable all interrupts */ + amdgpu_irq_disable_all(adev); + if (adev->mode_info.mode_config_initialized){ +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +index d1b10b5583ec..32128e982e4c 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +@@ -299,6 +299,7 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev) + { + int i, j; + ++ cancel_delayed_work_sync(&adev->uvd.idle_work); + drm_sched_entity_destroy(&adev->uvd.entity); + + for (j = 0; j < adev->uvd.num_uvd_inst; ++j) { +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +index 92aa3b1b34ce..f70b55f9d904 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +@@ -216,6 +216,7 @@ int amdgpu_vce_sw_fini(struct amdgpu_device *adev) + if (adev->vce.vcpu_bo == NULL) + return 0; + ++ cancel_delayed_work_sync(&adev->vce.idle_work); + drm_sched_entity_destroy(&adev->vce.entity); + + amdgpu_bo_free_kernel(&adev->vce.vcpu_bo, &adev->vce.gpu_addr, +-- +2.17.1 + |