drm/amdgpu/vcn: Add vcn ras poison consumption event handling

Add vcn ras poison consumption event handling

V2: Removed default poison consumption handling function cb

Signed-off-by: Mohammad Zafar Ziya <Mohammadzafar.ziya@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 0974ebf9a9a4e18e66e53e1f3590e7436323817a..aa7acfabf360b0440e3a841b2b6f35ac60d3d53f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -1126,3 +1126,21 @@ void amdgpu_vcn_fwlog_init(struct amdgpu_vcn_inst *vcn)
        log_buf->wrapped = 0;
 #endif
 }
+
+int amdgpu_vcn_process_poison_irq(struct amdgpu_device *adev,
+                               struct amdgpu_irq_src *source,
+                               struct amdgpu_iv_entry *entry)
+{
+       struct ras_common_if *ras_if = adev->vcn.ras_if;
+       struct ras_dispatch_if ih_data = {
+               .entry = entry,
+       };
+
+       if (!ras_if)
+               return 0;
+
+       ih_data.head = *ras_if;
+       amdgpu_ras_interrupt_dispatch(adev, &ih_data);
+
+       return 0;
+}

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
index 8e7aec822a1a546a9d06c7082b8418cb98aae623..6f90fcee0f9c99c024868176788e12a0e26d496b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
@@ -375,4 +375,9 @@ void amdgpu_vcn_setup_ucode(struct amdgpu_device *adev);
 void amdgpu_vcn_fwlog_init(struct amdgpu_vcn_inst *vcn);
 void amdgpu_debugfs_vcn_fwlog_init(struct amdgpu_device *adev,
                                    uint8_t i, struct amdgpu_vcn_inst *vcn);
+
+int amdgpu_vcn_process_poison_irq(struct amdgpu_device *adev,
+                       struct amdgpu_irq_src *source,
+                       struct amdgpu_iv_entry *entry);
+
 #endif

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
index abf5ea23896267fdba9c6afda6342b084dd1d466..8a7006d62a87ac18df8d19c03db3d295ac9bdc82 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
@@ -139,6 +139,12 @@ static int vcn_v2_5_sw_init(void *handle)
                        if (r)
                                return r;
                }
+
+               /* VCN POISON TRAP */
+               r = amdgpu_irq_add_id(adev, amdgpu_ih_clientid_vcns[j],
+                       VCN_2_6__SRCID_UVD_POISON, &adev->vcn.inst[j].irq);
+               if (r)
+                       return r;
        }
 
        r = amdgpu_vcn_sw_init(adev);
@@ -1855,6 +1861,9 @@ static int vcn_v2_5_process_interrupt(struct amdgpu_device *adev,
        case VCN_2_0__SRCID__UVD_ENC_LOW_LATENCY:
                amdgpu_fence_process(&adev->vcn.inst[ip_instance].ring_enc[1]);
                break;
+       case VCN_2_6__SRCID_UVD_POISON:
+               amdgpu_vcn_process_poison_irq(adev, source, entry);
+               break;
        default:
                DRM_ERROR("Unhandled interrupt: %d %d\n",
                          entry->src_id, entry->src_data[0]);

diff --git a/drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_2_0.h b/drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_2_0.h
index f842eb0d65bb822ceac343cb8f802bdbc9d568f2..c817061a000a1ea238dbee7df42e6af314aa9355 100644 (file)
--- a/drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_2_0.h
+++ b/drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_2_0.h
@@ -29,6 +29,7 @@
 #define VCN_2_0__SRCID__JPEG_ENCODE                                    151             // 0x97 JRBC Encode interrupt
 #define VCN_2_0__SRCID__JPEG_DECODE                                    153             // 0x99 JRBC Decode interrupt
 
+#define VCN_2_6__SRCID_UVD_POISON                                      160
 #define VCN_2_6__SRCID_DJPEG0_POISON                                   161
 #define VCN_2_6__SRCID_EJPEG0_POISON                                   162