Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c030f2e4 authored by xinhui pan's avatar xinhui pan Committed by Alex Deucher
Browse files

drm/amdgpu: add amdgpu_ras.c to support ras (v2) 



add obj management.
add feature control.
add debugfs infrastructure.
add sysfs infrastructure.
add IH infrastructure.
add recovery infrastructure.

It is a framework. Other IPs need call amdgpu_ras_xxx function instead of
psp_ras_xxx functions.

v2: squash in warning fixes

Signed-off-by: default avatarxinhui pan <xinhui.pan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ea114213

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \

	amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \

	amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \

	amdgpu_gmc.o amdgpu_xgmi.o amdgpu_csa.o

	amdgpu_gmc.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o



# add asic specific block

amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \

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

+9 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include "amdgpu_pm.h"



#include "amdgpu_xgmi.h"

#include "amdgpu_ras.h"



MODULE_FIRMWARE("amdgpu/vega10_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/vega12_gpu_info.bin");
@@ -1638,6 +1639,10 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
{

	int i, r;



	r = amdgpu_ras_init(adev);

	if (r)

		return r;



	for (i = 0; i < adev->num_ip_blocks; i++) {

		if (!adev->ip_blocks[i].status.valid)

			continue;
@@ -1876,6 +1881,8 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) 
{

	int i, r;



	amdgpu_ras_pre_fini(adev);



	if (adev->gmc.xgmi.num_physical_nodes > 1)

		amdgpu_xgmi_remove_device(adev);
@@ -1945,6 +1952,8 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) 
		adev->ip_blocks[i].status.late_initialized = false;

	}



	amdgpu_ras_fini(adev);



	if (amdgpu_sriov_vf(adev))

		if (amdgpu_virt_release_full_gpu(adev, false))

			DRM_ERROR("failed to release exclusive mode on fini\n");

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ struct psp_ras_context { 
	struct amdgpu_bo	*ras_shared_bo;

	uint64_t		ras_shared_mc_addr;

	void			*ras_shared_buf;

	struct amdgpu_ras	*ras;

};



struct psp_context