Skip to content

Commit 88733d6

Browse files
Tao Zhoualexdeucher
authored andcommitted
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 <[email protected]> Signed-off-by: Lijo Lazar <[email protected]> Reviewed-by: Hawking Zhang <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 3c22c1e commit 88733d6

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,8 @@
993993
#define mmUVD_RAS_VCPU_VCODEC_STATUS_BASE_IDX 1
994994
#define mmUVD_RAS_MMSCH_FATAL_ERROR 0x0058
995995
#define mmUVD_RAS_MMSCH_FATAL_ERROR_BASE_IDX 1
996-
996+
#define mmVCN_RAS_CNTL 0x04b9
997+
#define mmVCN_RAS_CNTL_BASE_IDX 1
997998

998999
/* JPEG 2_6_0 regs */
9991000
#define mmUVD_RAS_JPEG0_STATUS 0x0059

drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3618,6 +3618,33 @@
36183618
#define UVD_RAS_MMSCH_FATAL_ERROR__POISONED_VF_MASK 0x7FFFFFFFL
36193619
#define UVD_RAS_MMSCH_FATAL_ERROR__POISONED_PF_MASK 0x80000000L
36203620

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+
36213648
/* JPEG 2_6_0 UVD_RAS_JPEG0_STATUS */
36223649
#define UVD_RAS_JPEG0_STATUS__POISONED_VF__SHIFT 0x0
36233650
#define UVD_RAS_JPEG0_STATUS__POISONED_PF__SHIFT 0x1f

0 commit comments

Comments
 (0)