Commit 72b3588e authored Feb 14, 2022 by yipechai Committed by Alex Deucher Feb 17, 2022

drm/amdgpu: Remove redundant calls of ras_late_init in hdp ras block



Remove redundant calls of ras_late_init in hdp ras block.

Signed-off-by: yipechai <YiPeng.Chai@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 4e9b1fa5

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -470,7 +470,7 @@ int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev)
	}		}

	if (adev->hdp.ras && adev->hdp.ras->ras_block.ras_late_init) {		if (adev->hdp.ras && adev->hdp.ras->ras_block.ras_late_init) {
	r = adev->hdp.ras->ras_block.ras_late_init(adev, NULL);		r = adev->hdp.ras->ras_block.ras_late_init(adev, adev->hdp.ras_if);
	if (r)		if (r)
	return r;		return r;
	}		}

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

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -24,11 +24,6 @@
	#include "amdgpu.h"		#include "amdgpu.h"
	#include "amdgpu_ras.h"		#include "amdgpu_ras.h"

	int amdgpu_hdp_ras_late_init(struct amdgpu_device adev, struct ras_common_if ras_block)
	{
	return amdgpu_ras_block_late_init(adev, adev->hdp.ras_if);
	}

	void amdgpu_hdp_ras_fini(struct amdgpu_device *adev)		void amdgpu_hdp_ras_fini(struct amdgpu_device *adev)
	{		{
	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__HDP) &&		if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__HDP) &&

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -163,7 +163,7 @@ struct amdgpu_hdp_ras hdp_v4_0_ras = {
	.type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE,		.type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE,
	},		},
	.hw_ops = &hdp_v4_0_ras_hw_ops,		.hw_ops = &hdp_v4_0_ras_hw_ops,
	.ras_late_init = amdgpu_hdp_ras_late_init,		.ras_late_init = amdgpu_ras_block_late_init,
	.ras_fini = amdgpu_hdp_ras_fini,		.ras_fini = amdgpu_hdp_ras_fini,
	},		},
	};		};