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

Initialize RRMT enablement 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/jpeg_v5_0_1.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c
index 6b8ef8e8c0ebb221257510849cc51d66fd08c0c9..daa982bf36cd6b06eca326f5ab3a55223bcffcb2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c
@@ -249,6 +249,9 @@ static int jpeg_v5_0_1_hw_init(struct amdgpu_ip_block *ip_block)
                }
                return 0;
        }
+       if (RREG32_SOC15(VCN, GET_INST(VCN, 0), regVCN_RRMT_CNTL) & 0x100)
+               adev->jpeg.caps |= AMDGPU_JPEG_CAPS(RRMT_ENABLED);
+
        for (i = 0; i < adev->jpeg.num_jpeg_inst; ++i) {
                jpeg_inst = GET_INST(JPEG, i);
                ring = adev->jpeg.inst[i].ring_dec;

diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h
index d5c63d8074ab954151909c84ed75f1643c881688..efdab57324e440101e0f86d1cff94536f7cf5b09 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h
@@ -95,4 +95,7 @@ extern const struct amdgpu_ip_block_version jpeg_v5_0_1_ip_block;
 #define regJPEG_CORE_RST_CTRL                                                                 0x072e
 #define regJPEG_CORE_RST_CTRL_BASE_IDX                                                        1
 
-#endif /* __JPEG_V5_0_0_H__ */
+#define regVCN_RRMT_CNTL                          0x0940
+#define regVCN_RRMT_CNTL_BASE_IDX                 1
+
+#endif /* __JPEG_V5_0_1_H__ */