drm/amdgpu: implement common gmc_ras_late_init (ba083492) · Commits · 戴 / test

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -308,6 +308,25 @@ bool amdgpu_gmc_filter_faults(struct amdgpu_device *adev, uint64_t addr,
		return false;
		}

		int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev)
		{
		int r;

		if (adev->umc.funcs && adev->umc.funcs->ras_late_init) {
		r = adev->umc.funcs->ras_late_init(adev);
		if (r)
		return r;
		}

		if (adev->mmhub.funcs && adev->mmhub.funcs->ras_late_init) {
		r = adev->mmhub.funcs->ras_late_init(adev);
		if (r)
		return r;
		}

		return amdgpu_xgmi_ras_late_init(adev);
		}

		void amdgpu_gmc_ras_fini(struct amdgpu_device *adev)
		{
		amdgpu_umc_ras_fini(adev);

+1 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,7 @@ void amdgpu_gmc_agp_location(struct amdgpu_device *adev,
		struct amdgpu_gmc *mc);
		bool amdgpu_gmc_filter_faults(struct amdgpu_device *adev, uint64_t addr,
		uint16_t pasid, uint64_t timestamp);
		int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev);
		void amdgpu_gmc_ras_fini(struct amdgpu_device *adev);

		#endif

+1 −21

Original line number	Diff line number	Diff line
		@@ -736,26 +736,6 @@ static int gmc_v9_0_allocate_vm_inv_eng(struct amdgpu_device *adev)
		return 0;
		}

		static int gmc_v9_0_ecc_late_init(void *handle)
		{
		int r;
		struct amdgpu_device adev = (struct amdgpu_device )handle;

		if (adev->umc.funcs && adev->umc.funcs->ras_late_init) {
		r = adev->umc.funcs->ras_late_init(adev);
		if (r)
		return r;
		}

		if (adev->mmhub.funcs && adev->mmhub.funcs->ras_late_init) {
		r = adev->mmhub.funcs->ras_late_init(adev);
		if (r)
		return r;
		}

		return amdgpu_xgmi_ras_late_init(adev);
		}

		static int gmc_v9_0_late_init(void *handle)
		{
		struct amdgpu_device adev = (struct amdgpu_device )handle;
		@@ -793,7 +773,7 @@ static int gmc_v9_0_late_init(void *handle)
		}
		}

		r = gmc_v9_0_ecc_late_init(handle);
		r = amdgpu_gmc_ras_late_init(adev);
		if (r)
		return r;