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

Commit d8780dc7 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu: add ib preemption status in amdgpu_job (v2) 



Add ib preemption status in amdgpu_job, so that ring level function
can detect preemption and program for resuming it.

v2: squash in fix to restore job->preamble_status back to status value (Jack)

Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f92d5c61

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

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
	skip_preamble = ring->current_ctx == fence_ctx;

	if (job && ring->funcs->emit_cntxcntl) {

		status |= job->preamble_status;

		status |= job->preemption_status;

		amdgpu_ring_emit_cntxcntl(ring, status);

	}

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

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
#define AMDGPU_PREAMBLE_IB_PRESENT_FIRST    (1 << 1)

/* bit set means context switch occured */

#define AMDGPU_HAVE_CTX_SWITCH              (1 << 2)

/* bit set means IB is preempted */

#define AMDGPU_IB_PREEMPTED                 (1 << 3)



#define to_amdgpu_job(sched_job)		\

		container_of((sched_job), struct amdgpu_job, base)
@@ -45,6 +47,7 @@ struct amdgpu_job { 
	struct amdgpu_ib	*ibs;

	struct dma_fence	*fence; /* the hw fence */

	uint32_t		preamble_status;

	uint32_t                preemption_status;

	uint32_t		num_ibs;

	void			*owner;

	bool                    vm_needs_flush;