Commit 34955e03 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: Modify the argument of emit_ib interface 



use the point of struct amdgpu_job as the function
argument instand of vmid, so the other members of
struct amdgpu_job can be visit in emit_ib function.

v2: add a wrapper for getting the VMID
    add the job before the ib on the parameter list.
v3: refine the wrapper name

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8469868d

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

+1 −2
Original line number Diff line number Diff line
@@ -221,8 +221,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
			!amdgpu_sriov_vf(adev)) /* for SRIOV preemption, Preamble CE ib must be inserted anyway */

			continue;



		amdgpu_ring_emit_ib(ring, ib, job ? job->vmid : 0,

				    need_ctx_switch);

		amdgpu_ring_emit_ib(ring, job, ib, need_ctx_switch);

		need_ctx_switch = false;

	}

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

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#define to_amdgpu_job(sched_job)		\

		container_of((sched_job), struct amdgpu_job, base)



#define AMDGPU_JOB_GET_VMID(job) ((job) ? (job)->vmid : 0)



struct amdgpu_fence;



struct amdgpu_job {

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

+3 −2
Original line number Diff line number Diff line
@@ -129,8 +129,9 @@ struct amdgpu_ring_funcs { 
	unsigned emit_ib_size;

	/* command emit functions */

	void (*emit_ib)(struct amdgpu_ring *ring,

			struct amdgpu_job *job,

			struct amdgpu_ib *ib,

			unsigned vmid, bool ctx_switch);

			bool ctx_switch);

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

			   uint64_t seq, unsigned flags);

	void (*emit_pipeline_sync)(struct amdgpu_ring *ring);
@@ -228,7 +229,7 @@ struct amdgpu_ring { 
#define amdgpu_ring_get_rptr(r) (r)->funcs->get_rptr((r))

#define amdgpu_ring_get_wptr(r) (r)->funcs->get_wptr((r))

#define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r))

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

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

#define amdgpu_ring_emit_pipeline_sync(r) (r)->funcs->emit_pipeline_sync((r))

#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, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags))

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

+4 −2
Original line number Diff line number Diff line
@@ -1032,8 +1032,10 @@ out: 
 * @ib: the IB to execute

 *

 */

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

			     unsigned vmid, bool ctx_switch)

void amdgpu_vce_ring_emit_ib(struct amdgpu_ring *ring,

				struct amdgpu_job *job,

				struct amdgpu_ib *ib,

				bool ctx_switch)

{

	amdgpu_ring_write(ring, VCE_CMD_IB);

	amdgpu_ring_write(ring, lower_32_bits(ib->gpu_addr));

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

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, 
void amdgpu_vce_free_handles(struct amdgpu_device *adev, struct drm_file *filp);

int amdgpu_vce_ring_parse_cs(struct amdgpu_cs_parser *p, uint32_t ib_idx);

int amdgpu_vce_ring_parse_cs_vm(struct amdgpu_cs_parser *p, uint32_t ib_idx);

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

			     unsigned vmid, bool ctx_switch);

void amdgpu_vce_ring_emit_ib(struct amdgpu_ring *ring, struct amdgpu_job *job,

				struct amdgpu_ib *ib, bool ctx_switch);

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

				unsigned flags);

int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring);

CRA Git | Maintained and supported by SUSTech CRA and CCSE