Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: add register definition for VCN RAS initialization

Prepare for enableing VCN RAS poison.

v2: move SHIFT and MASK definitions to related sh_mask.h file.

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

authored by

Tao Zhou and committed by
Alex Deucher
88733d68 3c22c1ea

+29 -1
+2 -1
drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h
··· 993 993 #define mmUVD_RAS_VCPU_VCODEC_STATUS_BASE_IDX 1 994 994 #define mmUVD_RAS_MMSCH_FATAL_ERROR 0x0058 995 995 #define mmUVD_RAS_MMSCH_FATAL_ERROR_BASE_IDX 1 996 - 996 + #define mmVCN_RAS_CNTL 0x04b9 997 + #define mmVCN_RAS_CNTL_BASE_IDX 1 997 998 998 999 /* JPEG 2_6_0 regs */ 999 1000 #define mmUVD_RAS_JPEG0_STATUS 0x0059
+27
drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h
··· 3618 3618 #define UVD_RAS_MMSCH_FATAL_ERROR__POISONED_VF_MASK 0x7FFFFFFFL 3619 3619 #define UVD_RAS_MMSCH_FATAL_ERROR__POISONED_PF_MASK 0x80000000L 3620 3620 3621 + //VCN 2_6_0 VCN_RAS_CNTL 3622 + #define VCN_RAS_CNTL__VCPU_VCODEC_IH_EN__SHIFT 0x0 3623 + #define VCN_RAS_CNTL__MMSCH_FATAL_ERROR_EN__SHIFT 0x1 3624 + #define VCN_RAS_CNTL__VCPU_VCODEC_PMI_EN__SHIFT 0x4 3625 + #define VCN_RAS_CNTL__MMSCH_PMI_EN__SHIFT 0x5 3626 + #define VCN_RAS_CNTL__VCPU_VCODEC_REARM__SHIFT 0x8 3627 + #define VCN_RAS_CNTL__MMSCH_REARM__SHIFT 0x9 3628 + #define VCN_RAS_CNTL__VCPU_VCODEC_STALL_EN__SHIFT 0xc 3629 + #define VCN_RAS_CNTL__VCPU_VCODEC_READY__SHIFT 0x10 3630 + #define VCN_RAS_CNTL__MMSCH_READY__SHIFT 0x11 3631 + #define VCN_RAS_CNTL__VCPU_VCODEC_IH_EN_MASK 0x00000001L 3632 + #define VCN_RAS_CNTL__MMSCH_FATAL_ERROR_EN_MASK 0x00000002L 3633 + #define VCN_RAS_CNTL__VCPU_VCODEC_PMI_EN_MASK 0x00000010L 3634 + #define VCN_RAS_CNTL__MMSCH_PMI_EN_MASK 0x00000020L 3635 + #define VCN_RAS_CNTL__VCPU_VCODEC_REARM_MASK 0x00000100L 3636 + #define VCN_RAS_CNTL__MMSCH_REARM_MASK 0x00000200L 3637 + #define VCN_RAS_CNTL__VCPU_VCODEC_STALL_EN_MASK 0x00001000L 3638 + #define VCN_RAS_CNTL__VCPU_VCODEC_READY_MASK 0x00010000L 3639 + #define VCN_RAS_CNTL__MMSCH_READY_MASK 0x00020000L 3640 + 3641 + //VCN 2_6_0 UVD_VCPU_INT_EN 3642 + #define UVD_VCPU_INT_EN__RASCNTL_VCPU_VCODEC_EN__SHIFT 0x16 3643 + #define UVD_VCPU_INT_EN__RASCNTL_VCPU_VCODEC_EN_MASK 0x00400000L 3644 + 3645 + //VCN 2_6_0 UVD_SYS_INT_EN 3646 + #define UVD_SYS_INT_EN__RASCNTL_VCPU_VCODEC_EN_MASK 0x04000000L 3647 + 3621 3648 /* JPEG 2_6_0 UVD_RAS_JPEG0_STATUS */ 3622 3649 #define UVD_RAS_JPEG0_STATUS__POISONED_VF__SHIFT 0x0 3623 3650 #define UVD_RAS_JPEG0_STATUS__POISONED_PF__SHIFT 0x1f