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

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
...@@ -109,7 +109,7 @@ struct amdgpu_iv_entry { ...@@ -109,7 +109,7 @@ struct amdgpu_iv_entry {
unsigned vmid_src; unsigned vmid_src;
uint64_t timestamp; uint64_t timestamp;
unsigned timestamp_src; unsigned timestamp_src;
unsigned pas_id; unsigned pasid;
unsigned pasid_src; unsigned pasid_src;
unsigned src_data[AMDGPU_IH_SRC_DATA_MAX_SIZE_DW]; unsigned src_data[AMDGPU_IH_SRC_DATA_MAX_SIZE_DW];
const uint32_t *iv_entry; const uint32_t *iv_entry;
......
...@@ -86,7 +86,7 @@ TRACE_EVENT(amdgpu_iv, ...@@ -86,7 +86,7 @@ TRACE_EVENT(amdgpu_iv,
__field(unsigned, vmid_src) __field(unsigned, vmid_src)
__field(uint64_t, timestamp) __field(uint64_t, timestamp)
__field(unsigned, timestamp_src) __field(unsigned, timestamp_src)
__field(unsigned, pas_id) __field(unsigned, pasid)
__array(unsigned, src_data, 4) __array(unsigned, src_data, 4)
), ),
TP_fast_assign( TP_fast_assign(
...@@ -97,16 +97,16 @@ TRACE_EVENT(amdgpu_iv, ...@@ -97,16 +97,16 @@ TRACE_EVENT(amdgpu_iv,
__entry->vmid_src = iv->vmid_src; __entry->vmid_src = iv->vmid_src;
__entry->timestamp = iv->timestamp; __entry->timestamp = iv->timestamp;
__entry->timestamp_src = iv->timestamp_src; __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[0] = iv->src_data[0];
__entry->src_data[1] = iv->src_data[1]; __entry->src_data[1] = iv->src_data[1];
__entry->src_data[2] = iv->src_data[2]; __entry->src_data[2] = iv->src_data[2];
__entry->src_data[3] = iv->src_data[3]; __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->client_id, __entry->src_id,
__entry->ring_id, __entry->vmid, __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[0], __entry->src_data[1],
__entry->src_data[2], __entry->src_data[3]) __entry->src_data[2], __entry->src_data[3])
); );
......
...@@ -281,7 +281,7 @@ static void cik_ih_decode_iv(struct amdgpu_device *adev, ...@@ -281,7 +281,7 @@ static void cik_ih_decode_iv(struct amdgpu_device *adev,
entry->src_data[0] = dw[1] & 0xfffffff; entry->src_data[0] = dw[1] & 0xfffffff;
entry->ring_id = dw[2] & 0xff; entry->ring_id = dw[2] & 0xff;
entry->vmid = (dw[2] >> 8) & 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! */ /* wptr/rptr are in bytes! */
adev->irq.ih.rptr += 16; adev->irq.ih.rptr += 16;
......
...@@ -260,7 +260,7 @@ static void cz_ih_decode_iv(struct amdgpu_device *adev, ...@@ -260,7 +260,7 @@ static void cz_ih_decode_iv(struct amdgpu_device *adev,
entry->src_data[0] = dw[1] & 0xfffffff; entry->src_data[0] = dw[1] & 0xfffffff;
entry->ring_id = dw[2] & 0xff; entry->ring_id = dw[2] & 0xff;
entry->vmid = (dw[2] >> 8) & 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! */ /* wptr/rptr are in bytes! */
adev->irq.ih.rptr += 16; adev->irq.ih.rptr += 16;
......
...@@ -263,10 +263,10 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev, ...@@ -263,10 +263,10 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev,
if (printk_ratelimit()) { if (printk_ratelimit()) {
dev_err(adev->dev, 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->vmid_src ? "mmhub" : "gfxhub",
entry->src_id, entry->ring_id, entry->vmid, entry->src_id, entry->ring_id, entry->vmid,
entry->pas_id); entry->pasid);
dev_err(adev->dev, " at page 0x%016llx from %d\n", dev_err(adev->dev, " at page 0x%016llx from %d\n",
addr, entry->client_id); addr, entry->client_id);
if (!amdgpu_sriov_vf(adev)) if (!amdgpu_sriov_vf(adev))
......
...@@ -260,7 +260,7 @@ static void iceland_ih_decode_iv(struct amdgpu_device *adev, ...@@ -260,7 +260,7 @@ static void iceland_ih_decode_iv(struct amdgpu_device *adev,
entry->src_data[0] = dw[1] & 0xfffffff; entry->src_data[0] = dw[1] & 0xfffffff;
entry->ring_id = dw[2] & 0xff; entry->ring_id = dw[2] & 0xff;
entry->vmid = (dw[2] >> 8) & 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! */ /* wptr/rptr are in bytes! */
adev->irq.ih.rptr += 16; adev->irq.ih.rptr += 16;
......
...@@ -271,7 +271,7 @@ static void tonga_ih_decode_iv(struct amdgpu_device *adev, ...@@ -271,7 +271,7 @@ static void tonga_ih_decode_iv(struct amdgpu_device *adev,
entry->src_data[0] = dw[1] & 0xfffffff; entry->src_data[0] = dw[1] & 0xfffffff;
entry->ring_id = dw[2] & 0xff; entry->ring_id = dw[2] & 0xff;
entry->vmid = (dw[2] >> 8) & 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! */ /* wptr/rptr are in bytes! */
adev->irq.ih.rptr += 16; adev->irq.ih.rptr += 16;
......
...@@ -333,7 +333,7 @@ static void vega10_ih_decode_iv(struct amdgpu_device *adev, ...@@ -333,7 +333,7 @@ static void vega10_ih_decode_iv(struct amdgpu_device *adev,
entry->vmid_src = (dw[0] >> 31); entry->vmid_src = (dw[0] >> 31);
entry->timestamp = dw[1] | ((u64)(dw[2] & 0xffff) << 32); entry->timestamp = dw[1] | ((u64)(dw[2] & 0xffff) << 32);
entry->timestamp_src = dw[2] >> 31; entry->timestamp_src = dw[2] >> 31;
entry->pas_id = dw[3] & 0xffff; entry->pasid = dw[3] & 0xffff;
entry->pasid_src = dw[3] >> 31; entry->pasid_src = dw[3] >> 31;
entry->src_data[0] = dw[4]; entry->src_data[0] = dw[4];
entry->src_data[1] = dw[5]; entry->src_data[1] = dw[5];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment