Commit c174a631 authored by YiPeng Chai's avatar YiPeng Chai Committed by Alex Deucher
Browse files

drm/amd/ras: Support sriov uniras to obtain cper data 



Support sriov uniras to obtain cper data.

Signed-off-by: default avatarYiPeng Chai <YiPeng.Chai@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1855fc6b

drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c

+5 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */

#include <linux/list.h>

#include "amdgpu.h"

#include "amdgpu_ras_mgr.h"



static const guid_t MCE			= CPER_NOTIFY_MCE;

static const guid_t CMC			= CPER_NOTIFY_CMC;
@@ -559,7 +560,10 @@ int amdgpu_cper_init(struct amdgpu_device *adev) 
{

	int r;



	if (!amdgpu_aca_is_enabled(adev) && !amdgpu_sriov_ras_cper_en(adev))

	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_ras_cper_en(adev))

		return 0;

	else if (!amdgpu_sriov_vf(adev) && !amdgpu_uniras_enabled(adev) &&

		!amdgpu_aca_is_enabled(adev))

		return 0;



	r = amdgpu_cper_ring_init(adev);

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+1 −2
Original line number Diff line number Diff line
@@ -3323,7 +3323,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 


	amdgpu_fru_get_product_info(adev);



	if (!amdgpu_sriov_vf(adev) || amdgpu_sriov_ras_cper_en(adev))

	r = amdgpu_cper_init(adev);



init_failed: