drm/amdgpu/gfx10: fix unbalanced MAP/UNMAP_QUEUES when async_gfx_ring is disabled (c39f3da4) · Commits · 戴 / test

gfx_v10_0_kiq_enable_kgq() is called only when async_gfx_ring is enabled, so should gfx_v10_0_kiq_disable_kgq(). Signed-off-by:

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -3540,7 +3540,7 @@ static int gfx_v10_0_hw_init(void *handle)
		}

		#ifndef BRING_UP_DEBUG
		static int gfx10_0_disable_kgq(struct amdgpu_device *adev)
		static int gfx_v10_0_kiq_disable_kgq(struct amdgpu_device *adev)
		{
		struct amdgpu_kiq *kiq = &adev->gfx.kiq;
		struct amdgpu_ring ring, kiq_ring = &kiq->ring;
		@@ -3589,12 +3589,16 @@ static int gfx10_0_disable_kgq(struct amdgpu_device *adev)
		static int gfx_v10_0_hw_fini(void *handle)
		{
		struct amdgpu_device adev = (struct amdgpu_device )handle;
		int r;

		amdgpu_irq_put(adev, &adev->gfx.priv_reg_irq, 0);
		amdgpu_irq_put(adev, &adev->gfx.priv_inst_irq, 0);
		#ifndef BRING_UP_DEBUG
		if (gfx10_0_disable_kgq(adev))
		if (amdgpu_async_gfx_ring) {
		r = gfx_v10_0_kiq_disable_kgq(adev);
		if (r)
		DRM_ERROR("KGQ disable failed\n");
		}
		#endif
		if (amdgpu_gfx_disable_kcq(adev))
		DRM_ERROR("KCQ disable failed\n");