drm/amdgpu: Initialize RRMT status on VCN v5.0.1

Initialize RRMT status from register.

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>

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
index 900702b1a3bb404d7c67dd90e14485ffcd1f0f18..0bd536371ad177e40da3196f43fabbc31666c3bc 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
@@ -194,6 +194,8 @@ static int vcn_v5_0_1_hw_init(struct amdgpu_ip_block *ip_block)
        struct amdgpu_ring *ring;
        int i, r, vcn_inst;
 
+       if (RREG32_SOC15(VCN, GET_INST(VCN, 0), regVCN_RRMT_CNTL) & 0x100)
+               adev->vcn.caps |= AMDGPU_VCN_CAPS(RRMT_ENABLED);
        for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
                vcn_inst = GET_INST(VCN, i);
                ring = &adev->vcn.inst[i].ring_enc[0];

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.h b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.h
index 82ac709f44bfb2c4bbfd75648d2f7f3d18722e8a..8fd90bd108072af6ff9a26efd8722c12f043a84d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.h
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.h
@@ -24,6 +24,9 @@
 #ifndef __VCN_v5_0_1_H__
 #define __VCN_v5_0_1_H__
 
+#define regVCN_RRMT_CNTL                          0x0940
+#define regVCN_RRMT_CNTL_BASE_IDX                 1
+
 extern const struct amdgpu_ip_block_version vcn_v5_0_1_ip_block;
 
 #endif /* __VCN_v5_0_1_H__ */