drm/amdgpu: Avoid loading bad pages into legacy ras

When ras module is enabled, the bad pages will
be loaded by ras module.

Signed-off-by: YiPeng Chai <YiPeng.Chai@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@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/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 91c746c5dc186978bc7a202016e97198de2a2dbb..5b610f668fcc26febe0b8c1b423d13457e968122 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -3606,6 +3606,9 @@ int amdgpu_ras_init_badpage_info(struct amdgpu_device *adev)
        if (!con || amdgpu_sriov_vf(adev))
                return 0;
 
+       if (amdgpu_uniras_enabled(adev))
+               return 0;
+
        control = &con->eeprom_control;
        ret = amdgpu_ras_eeprom_init(control);
        control->is_eeprom_valid = !ret;