diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4516-drm-amdgpu-put-flush_dealyed_work-at-first.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4516-drm-amdgpu-put-flush_dealyed_work-at-first.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4516-drm-amdgpu-put-flush_dealyed_work-at-first.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4516-drm-amdgpu-put-flush_dealyed_work-at-first.patch new file mode 100644 index 00000000..4d603188 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4516-drm-amdgpu-put-flush_dealyed_work-at-first.patch @@ -0,0 +1,63 @@ +From 9852e1ef2fd04bb8469914ea973a173584b84deb Mon Sep 17 00:00:00 2001 +From: Yintian Tao <yttao@amd.com> +Date: Mon, 18 Nov 2019 16:06:00 +0800 +Subject: [PATCH 4516/4736] drm/amdgpu: put flush_dealyed_work at first +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There is one regression from 042f3d7b745cd76aa +To put flush_delayed_work after adev->shutdown = true +which will make amdgpu_ih_process not response the irq +At last, all ib ring tests will be failed just like below + +[drm] amdgpu: finishing device. +[drm] Fence fallback timer expired on ring gfx +[drm] Fence fallback timer expired on ring comp_1.0.0 +[drm] Fence fallback timer expired on ring comp_1.1.0 +[drm] Fence fallback timer expired on ring comp_1.2.0 +[drm] Fence fallback timer expired on ring comp_1.3.0 +[drm] Fence fallback timer expired on ring comp_1.0.1 +amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on comp_1.1.1 (-110). +amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on comp_1.2.1 (-110). +amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on comp_1.3.1 (-110). +amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on sdma0 (-110). +amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on sdma1 (-110). +amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on uvd_enc_0.0 (-110). +amdgpu 0000:00:07.0: [drm:amdgpu_ib_ring_tests [amdgpu]] *ERROR* IB test failed on vce0 (-110). +[drm:amdgpu_device_delayed_init_work_handler [amdgpu]] *ERROR* ib ring test failed (-110). + +v2: replace cancel_delayed_work_sync() with flush_delayed_work() + +Signed-off-by: Yintian Tao <yttao@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 7ccc9518c173..61fb27b4e89c 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -3119,9 +3119,8 @@ void amdgpu_device_fini(struct amdgpu_device *adev) + int r; + + DRM_INFO("amdgpu: finishing device.\n"); +- adev->shutdown = true; +- + flush_delayed_work(&adev->delayed_init_work); ++ adev->shutdown = true; + + /* disable all interrupts */ + amdgpu_irq_disable_all(adev); +@@ -3141,7 +3140,6 @@ void amdgpu_device_fini(struct amdgpu_device *adev) + adev->firmware.gpu_info_fw = NULL; + } + adev->accel_working = false; +- cancel_delayed_work_sync(&adev->delayed_init_work); + /* free i2c buses */ + if (!amdgpu_device_has_dc_support(adev)) + amdgpu_i2c_fini(adev); +-- +2.17.1 + |