Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c4ecf48 authored by Trigger Huang's avatar Trigger Huang Committed by Alex Deucher
Browse files

drm/amdgpu: Fix module unload hang by KIQ on Vega10 



Apply commit 4e683cb2644f ("drm/amdgpu: Fix module unload hang by
KIQ IRQ set")to vega10
V2:
	delete reduant kiq irq funcs type check (suggested by Rex.Zhu)

Signed-off-by: default avatarTrigger Huang <trigger.huang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7ef69843

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

+2 −8
Original line number Diff line number Diff line
@@ -631,7 +631,6 @@ static int gfx_v9_0_kiq_init_ring(struct amdgpu_device *adev, 
		ring->pipe = 1;

	}



	irq->data = ring;

	ring->queue = 0;

	ring->eop_gpu_addr = kiq->eop_gpu_addr;

	sprintf(ring->name, "kiq %d.%d.%d", ring->me, ring->pipe, ring->queue);
@@ -647,7 +646,6 @@ static void gfx_v9_0_kiq_free_ring(struct amdgpu_ring *ring, 
{

	amdgpu_wb_free(ring->adev, ring->adev->virt.reg_val_offs);

	amdgpu_ring_fini(ring);

	irq->data = NULL;

}



/* create MQD for each compute queue */
@@ -3370,9 +3368,7 @@ static int gfx_v9_0_kiq_set_interrupt_state(struct amdgpu_device *adev, 
					    enum amdgpu_interrupt_state state)

{

	uint32_t tmp, target;

	struct amdgpu_ring *ring = (struct amdgpu_ring *)src->data;



	BUG_ON(!ring || (ring->funcs->type != AMDGPU_RING_TYPE_KIQ));

	struct amdgpu_ring *ring = &(adev->gfx.kiq.ring);



	if (ring->me == 1)

		target = SOC15_REG_OFFSET(GC, 0, mmCP_ME1_PIPE0_INT_CNTL);
@@ -3416,9 +3412,7 @@ static int gfx_v9_0_kiq_irq(struct amdgpu_device *adev, 
			    struct amdgpu_iv_entry *entry)

{

	u8 me_id, pipe_id, queue_id;

	struct amdgpu_ring *ring = (struct amdgpu_ring *)source->data;



	BUG_ON(!ring || (ring->funcs->type != AMDGPU_RING_TYPE_KIQ));

	struct amdgpu_ring *ring = &(adev->gfx.kiq.ring);



	me_id = (entry->ring_id & 0x0c) >> 2;

	pipe_id = (entry->ring_id & 0x03) >> 0;