[PATCH v4 2/6] drm/amdgpu/vcn: Add vcn ras support

[Paul Menzel]

Dear Mohammad,


Thank you for your patch.

Am 28.03.22 um 08:24 schrieb Mohammad Zafar Ziya:
> VCN block ras feature support addition
> 
> V2: default ras callback removed
> 
> Signed-off-by: Mohammad Zafar Ziya <Mohammadzafar.ziya at amd.com>
> Reviewed-by: Hawking Zhang <Hawking.Zhang at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 10 ++++++++++
>   1 file changed, 10 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> index e2fde88aaf5e..ea07974ef6f4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> @@ -24,6 +24,8 @@
>   #ifndef __AMDGPU_VCN_H__
>   #define __AMDGPU_VCN_H__
>   
> +#include "amdgpu_ras.h"
> +
>   #define AMDGPU_VCN_STACK_SIZE		(128*1024)
>   #define AMDGPU_VCN_CONTEXT_SIZE 	(512*1024)
>   
> @@ -232,6 +234,10 @@ struct amdgpu_vcn_inst {
>   	struct amdgpu_vcn_fw_shared fw_shared;
>   };
>   
> +struct amdgpu_vcn_ras {
> +	struct amdgpu_ras_block_object ras_block;
> +};
> +
>   struct amdgpu_vcn {
>   	unsigned		fw_version;
>   	struct delayed_work	idle_work;
> @@ -251,6 +257,9 @@ struct amdgpu_vcn {
>   	unsigned	harvest_config;
>   	int (*pause_dpg_mode)(struct amdgpu_device *adev,
>   		int inst_idx, struct dpg_pause_state *new_state);
> +
> +	struct ras_common_if    *ras_if;
> +	struct amdgpu_vcn_ras   *ras;
>   };
>   
>   struct amdgpu_fw_shared_rb_ptrs_struct {
> @@ -339,4 +348,5 @@ 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);
> +
>   #endif

This hunk looks unrelated. Maybe remove it?


Kind regards,

Paul