Commit c0e21ea1 authored Nov 18, 2019 by Yintian Tao Committed by Alex Deucher Nov 22, 2019

drm/amdgpu: put flush_delayed_work at first



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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 4e20f655

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -3109,9 +3109,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);
		@@ -3130,7 +3129,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);

Admin message