Commit 3816e42f authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: rename pas_id to pasid 



sed -i "s/pas_id/pasid/g" drivers/gpu/drm/amd/amdgpu/*.c
sed -i "s/pas_id/pasid/g" drivers/gpu/drm/amd/amdgpu/*.h

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 09052fc3

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

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ struct amdgpu_iv_entry { 
	unsigned vmid_src;

	uint64_t timestamp;

	unsigned timestamp_src;

	unsigned pas_id;

	unsigned pasid;

	unsigned pasid_src;

	unsigned src_data[AMDGPU_IH_SRC_DATA_MAX_SIZE_DW];

	const uint32_t *iv_entry;

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

+4 −4
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ TRACE_EVENT(amdgpu_iv, 
			     __field(unsigned, vmid_src)

			     __field(uint64_t, timestamp)

			     __field(unsigned, timestamp_src)

			     __field(unsigned, pas_id)

			     __field(unsigned, pasid)

			     __array(unsigned, src_data, 4)

			    ),

	    TP_fast_assign(
@@ -97,16 +97,16 @@ TRACE_EVENT(amdgpu_iv, 
			   __entry->vmid_src = iv->vmid_src;

			   __entry->timestamp = iv->timestamp;

			   __entry->timestamp_src = iv->timestamp_src;

			   __entry->pas_id = iv->pas_id;

			   __entry->pasid = iv->pasid;

			   __entry->src_data[0] = iv->src_data[0];

			   __entry->src_data[1] = iv->src_data[1];

			   __entry->src_data[2] = iv->src_data[2];

			   __entry->src_data[3] = iv->src_data[3];

			   ),

	    TP_printk("client_id:%u src_id:%u ring:%u vmid:%u timestamp: %llu pas_id:%u src_data: %08x %08x %08x %08x\n",

	    TP_printk("client_id:%u src_id:%u ring:%u vmid:%u timestamp: %llu pasid:%u src_data: %08x %08x %08x %08x\n",

		      __entry->client_id, __entry->src_id,

		      __entry->ring_id, __entry->vmid,

		      __entry->timestamp, __entry->pas_id,

		      __entry->timestamp, __entry->pasid,

		      __entry->src_data[0], __entry->src_data[1],

		      __entry->src_data[2], __entry->src_data[3])

);

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

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static void cik_ih_decode_iv(struct amdgpu_device *adev, 
	entry->src_data[0] = dw[1] & 0xfffffff;

	entry->ring_id = dw[2] & 0xff;

	entry->vmid = (dw[2] >> 8) & 0xff;

	entry->pas_id = (dw[2] >> 16) & 0xffff;

	entry->pasid = (dw[2] >> 16) & 0xffff;



	/* wptr/rptr are in bytes! */

	adev->irq.ih.rptr += 16;

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

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static void cz_ih_decode_iv(struct amdgpu_device *adev, 
	entry->src_data[0] = dw[1] & 0xfffffff;

	entry->ring_id = dw[2] & 0xff;

	entry->vmid = (dw[2] >> 8) & 0xff;

	entry->pas_id = (dw[2] >> 16) & 0xffff;

	entry->pasid = (dw[2] >> 16) & 0xffff;



	/* wptr/rptr are in bytes! */

	adev->irq.ih.rptr += 16;

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

+2 −2
Original line number Diff line number Diff line
@@ -263,10 +263,10 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev, 


	if (printk_ratelimit()) {

		dev_err(adev->dev,

			"[%s] VMC page fault (src_id:%u ring:%u vmid:%u pas_id:%u)\n",

			"[%s] VMC page fault (src_id:%u ring:%u vmid:%u pasid:%u)\n",

			entry->vmid_src ? "mmhub" : "gfxhub",

			entry->src_id, entry->ring_id, entry->vmid,

			entry->pas_id);

			entry->pasid);

		dev_err(adev->dev, "  at page 0x%016llx from %d\n",

			addr, entry->client_id);

		if (!amdgpu_sriov_vf(adev))

CRA Git | Maintained and supported by SUSTech CRA and CCSE