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

Commit 890ee23f authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: disable user fence interrupt (v2) 



amdgpu submits both kernel and user fences, but just need one interrupt,
disable user fence interrupt and don't effect user fence.

v2: fix merge error

Signed-off-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9298e52f

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

+5 −2
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ struct amdgpu_ring_funcs { 
	void (*emit_ib)(struct amdgpu_ring *ring,

			struct amdgpu_ib *ib);

	void (*emit_fence)(struct amdgpu_ring *ring, uint64_t addr,

			   uint64_t seq, bool write64bit);

			   uint64_t seq, unsigned flags);

	bool (*emit_semaphore)(struct amdgpu_ring *ring,

			       struct amdgpu_semaphore *semaphore,

			       bool emit_wait);
@@ -392,6 +392,9 @@ struct amdgpu_fence_driver { 
#define AMDGPU_FENCE_OWNER_VM		((void*)1ul)

#define AMDGPU_FENCE_OWNER_MOVE		((void*)2ul)



#define AMDGPU_FENCE_FLAG_64BIT         (1 << 0)

#define AMDGPU_FENCE_FLAG_INT           (1 << 1)



struct amdgpu_fence {

	struct fence base;
@@ -2142,7 +2145,7 @@ static inline void amdgpu_ring_write(struct amdgpu_ring *ring, uint32_t v) 
#define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r))

#define amdgpu_ring_emit_ib(r, ib) (r)->funcs->emit_ib((r), (ib))

#define amdgpu_ring_emit_vm_flush(r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr))

#define amdgpu_ring_emit_fence(r, addr, seq, write64bit) (r)->funcs->emit_fence((r), (addr), (seq), (write64bit))

#define amdgpu_ring_emit_fence(r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags))

#define amdgpu_ring_emit_semaphore(r, semaphore, emit_wait) (r)->funcs->emit_semaphore((r), (semaphore), (emit_wait))

#define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as))

#define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r))

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

+3 −1
Original line number Diff line number Diff line
@@ -128,7 +128,9 @@ int amdgpu_fence_emit(struct amdgpu_ring *ring, void *owner, 
	fence_init(&(*fence)->base, &amdgpu_fence_ops,

		&adev->fence_queue.lock, adev->fence_context + ring->idx,

		(*fence)->seq);

	amdgpu_ring_emit_fence(ring, ring->fence_drv.gpu_addr, (*fence)->seq, false);

	amdgpu_ring_emit_fence(ring, ring->fence_drv.gpu_addr,

			       (*fence)->seq,

			       AMDGPU_FENCE_FLAG_INT);

	trace_amdgpu_fence_emit(ring->adev->ddev, ring->idx, (*fence)->seq);

	return 0;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs, 
	if (ib->user) {

		uint64_t addr = amdgpu_bo_gpu_offset(ib->user->bo);

		addr += ib->user->offset;

		amdgpu_ring_emit_fence(ring, addr, ib->fence->seq, true);

		amdgpu_ring_emit_fence(ring, addr, ib->fence->seq,

				       AMDGPU_FENCE_FLAG_64BIT);

	}



	if (ib->vm)

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

+2 −2
Original line number Diff line number Diff line
@@ -637,9 +637,9 @@ void amdgpu_vce_ring_emit_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib) 
 *

 */

void amdgpu_vce_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seq,

				bool write64bits)

				unsigned flags)

{

	WARN_ON(write64bits);

	WARN_ON(flags & AMDGPU_FENCE_FLAG_64BIT);



	amdgpu_ring_write(ring, VCE_CMD_FENCE);

	amdgpu_ring_write(ring, addr);

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ bool amdgpu_vce_ring_emit_semaphore(struct amdgpu_ring *ring, 
				    bool emit_wait);

void amdgpu_vce_ring_emit_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib);

void amdgpu_vce_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seq,

				bool write64bit);

				unsigned flags);

int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring);

int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring);