diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3147-drm-amdgpu-rename-pas_id-to-pasid.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3147-drm-amdgpu-rename-pas_id-to-pasid.patch | 155 |
1 files changed, 155 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3147-drm-amdgpu-rename-pas_id-to-pasid.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3147-drm-amdgpu-rename-pas_id-to-pasid.patch new file mode 100644 index 00000000..78829641 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3147-drm-amdgpu-rename-pas_id-to-pasid.patch @@ -0,0 +1,155 @@ +From f737fcab9faec47179af0bcc6060bf161da1ff77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Tue, 9 Jan 2018 19:47:37 +0100 +Subject: [PATCH 3147/4131] drm/amdgpu: rename pas_id to pasid +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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: Christian König <christian.koenig@amd.com> +Reviewed-by: Chunming Zhou <david1.zhou@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 8 ++++---- + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 ++-- + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 2 +- + 8 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h +index 29cf109..b8a7dba 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h +@@ -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; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +index 1013ce9..7edc573 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +@@ -64,7 +64,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( +@@ -75,16 +75,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]) + ); +diff --git a/drivers/gpu/drm/amd/amdgpu/cik_ih.c b/drivers/gpu/drm/amd/amdgpu/cik_ih.c +index d5a05c1..07c7852 100644 +--- a/drivers/gpu/drm/amd/amdgpu/cik_ih.c ++++ b/drivers/gpu/drm/amd/amdgpu/cik_ih.c +@@ -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; +diff --git a/drivers/gpu/drm/amd/amdgpu/cz_ih.c b/drivers/gpu/drm/amd/amdgpu/cz_ih.c +index f576e9c..cfd0ad0 100644 +--- a/drivers/gpu/drm/amd/amdgpu/cz_ih.c ++++ b/drivers/gpu/drm/amd/amdgpu/cz_ih.c +@@ -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; +diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +index a669a6e..0bb4ef9 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +@@ -262,10 +262,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)) +diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c +index c4e4be3..3237a57 100644 +--- a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c ++++ b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c +@@ -260,7 +260,7 @@ static void iceland_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; +diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c +index 5995ffc..1843538 100644 +--- a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c ++++ b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c +@@ -271,7 +271,7 @@ static void tonga_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; +diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c +index b69ceaf..926c2d3 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c ++++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c +@@ -331,7 +331,7 @@ static void vega10_ih_decode_iv(struct amdgpu_device *adev, + entry->vmid_src = (dw[0] >> 31); + entry->timestamp = dw[1] | ((u64)(dw[2] & 0xffff) << 32); + entry->timestamp_src = dw[2] >> 31; +- entry->pas_id = dw[3] & 0xffff; ++ entry->pasid = dw[3] & 0xffff; + entry->pasid_src = dw[3] >> 31; + entry->src_data[0] = dw[4]; + entry->src_data[1] = dw[5]; +-- +2.7.4 + |