Commit 068001b7 authored by yipechai's avatar yipechai Committed by Alex Deucher
Browse files

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



Remove redundant calls of ras_late_init in mmhub ras block.

Signed-off-by: default avataryipechai <YiPeng.Chai@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 72b3588e

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

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



	if (adev->mmhub.ras && adev->mmhub.ras->ras_block.ras_late_init) {

		r = adev->mmhub.ras->ras_block.ras_late_init(adev, NULL);

		r = adev->mmhub.ras->ras_block.ras_late_init(adev, adev->mmhub.ras_if);

		if (r)

			return r;

	}

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

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

#include "amdgpu_ras.h"



int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	return amdgpu_ras_block_late_init(adev, adev->mmhub.ras_if);

}



void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev)

{

	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&

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

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ struct amdgpu_mmhub { 
	struct amdgpu_mmhub_ras  *ras;

};



int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block);

void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -1293,7 +1293,7 @@ static void gmc_v9_0_set_mmhub_ras_funcs(struct amdgpu_device *adev) 


		/* If don't define special ras_late_init function, use default ras_late_init */

		if (!adev->mmhub.ras->ras_block.ras_late_init)

			adev->mmhub.ras->ras_block.ras_late_init = amdgpu_mmhub_ras_late_init;

			adev->mmhub.ras->ras_block.ras_late_init = amdgpu_ras_block_late_init;



		/* If don't define special ras_fini function, use default ras_fini */

		if (!adev->mmhub.ras->ras_block.ras_fini)