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

Commit cdf6adb2 authored by Shaoyun Liu's avatar Shaoyun Liu Committed by Alex Deucher
Browse files

drm/amdgpu: Move kiq ring lock out of virt structure 



The usage of kiq should not depend on the virtualization.

Signed-off-by: default avatarShaoyun Liu <Shaoyun.Liu@amd.com>
Reviewed-by: default avatarAndres Rodriquez <andresx7@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b98b8dbc

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -907,6 +907,7 @@ struct amdgpu_mec { 
struct amdgpu_kiq {

	u64			eop_gpu_addr;

	struct amdgpu_bo	*eop_obj;

	struct mutex		ring_mutex;

	struct amdgpu_ring	ring;

	struct amdgpu_irq_src	irq;

};

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

+4 −5
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev) 
	adev->cg_flags = 0;

	adev->pg_flags = 0;



	mutex_init(&adev->virt.lock_kiq);

	mutex_init(&adev->virt.lock_reset);

}
@@ -122,12 +121,12 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg) 


	BUG_ON(!ring->funcs->emit_rreg);



	mutex_lock(&adev->virt.lock_kiq);

	mutex_lock(&kiq->ring_mutex);

	amdgpu_ring_alloc(ring, 32);

	amdgpu_ring_emit_rreg(ring, reg);

	amdgpu_fence_emit(ring, &f);

	amdgpu_ring_commit(ring);

	mutex_unlock(&adev->virt.lock_kiq);

	mutex_unlock(&kiq->ring_mutex);



	r = dma_fence_wait(f, false);

	if (r)
@@ -148,12 +147,12 @@ void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v) 


	BUG_ON(!ring->funcs->emit_wreg);



	mutex_lock(&adev->virt.lock_kiq);

	mutex_lock(&kiq->ring_mutex);

	amdgpu_ring_alloc(ring, 32);

	amdgpu_ring_emit_wreg(ring, reg, v);

	amdgpu_fence_emit(ring, &f);

	amdgpu_ring_commit(ring);

	mutex_unlock(&adev->virt.lock_kiq);

	mutex_unlock(&kiq->ring_mutex);



	r = dma_fence_wait(f, false);

	if (r)

drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ struct amdgpu_virt { 
	uint64_t			csa_vmid0_addr;

	bool chained_ib_support;

	uint32_t			reg_val_offs;

	struct mutex			lock_kiq;

	struct mutex                    lock_reset;

	struct amdgpu_irq_src		ack_irq;

	struct amdgpu_irq_src		rcv_irq;

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

+2 −0
Original line number Diff line number Diff line
@@ -1385,6 +1385,8 @@ static int gfx_v8_0_kiq_init_ring(struct amdgpu_device *adev, 
	struct amdgpu_kiq *kiq = &adev->gfx.kiq;

	int r = 0;



	mutex_init(&kiq->ring_mutex);



	r = amdgpu_wb_get(adev, &adev->virt.reg_val_offs);

	if (r)

		return r;

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

+2 −0
Original line number Diff line number Diff line
@@ -614,6 +614,8 @@ static int gfx_v9_0_kiq_init_ring(struct amdgpu_device *adev, 
	struct amdgpu_kiq *kiq = &adev->gfx.kiq;

	int r = 0;



	mutex_init(&kiq->ring_mutex);



	r = amdgpu_wb_get(adev, &adev->virt.reg_val_offs);

	if (r)

		return r;