drm/amdgpu: remove pasid_src field from IV entry

PASID_SRC is not actually present in the Interrupt Packet, the field is
taken as reserved bits now. So remove it from IV entry to avoid misuse.

Signed-off-by: Xiaomeng Hou <Xiaomeng.Hou@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
index d58353c89e59af6647fa59afa7c2d36a66bfbac0..fceb3b384955ac023765d0616126b9c0e73a5f34 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
@@ -271,7 +271,6 @@ void amdgpu_ih_decode_iv_helper(struct amdgpu_device *adev,
        entry->timestamp_src = dw[2] >> 31;
        entry->pasid = dw[3] & 0xffff;
        entry->node_id = (dw[3] >> 16) & 0xff;
        entry->timestamp_src = dw[2] >> 31;
        entry->pasid = dw[3] & 0xffff;
        entry->node_id = (dw[3] >> 16) & 0xff;

-       entry->pasid_src = dw[3] >> 31;

        entry->src_data[0] = dw[4];
        entry->src_data[1] = dw[5];
        entry->src_data[2] = dw[6];
        entry->src_data[0] = dw[4];
        entry->src_data[1] = dw[5];
        entry->src_data[2] = dw[6];

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h
index 7a8e686bdd412294a8f232fc68c3abc6ac1a3873..1c747ac4129a4c39934ae409c76fa5ee24762c28 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h
@@ -54,7 +54,6 @@ struct amdgpu_iv_entry {
        unsigned timestamp_src;
        unsigned pasid;
        unsigned node_id;
        unsigned timestamp_src;
        unsigned pasid;
        unsigned node_id;

-       unsigned pasid_src;

        unsigned src_data[AMDGPU_IRQ_SRC_DATA_MAX_SIZE_DW];
        const uint32_t *iv_entry;
 };
        unsigned src_data[AMDGPU_IRQ_SRC_DATA_MAX_SIZE_DW];
        const uint32_t *iv_entry;
 };