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

drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in nbio ras block 



Remove redundant calls of amdgpu_ras_block_late_fini in nbio 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 9dad47c5

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

+0 −7
Original line number Diff line number Diff line
@@ -43,10 +43,3 @@ int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if * 
	amdgpu_ras_block_late_fini(adev, ras_block);

	return r;

}
 


void amdgpu_nbio_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__PCIE_BIF) &&

			ras_block)

		amdgpu_ras_block_late_fini(adev, ras_block);

}

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

+0 −1
Original line number Diff line number Diff line
@@ -105,5 +105,4 @@ struct amdgpu_nbio { 
};



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

void amdgpu_nbio_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ struct amdgpu_nbio_ras nbio_v7_4_ras = { 
		},

		.hw_ops = &nbio_v7_4_ras_hw_ops,

		.ras_late_init = amdgpu_nbio_ras_late_init,

		.ras_fini = amdgpu_nbio_ras_fini,

		.ras_fini = amdgpu_ras_block_late_fini,

	},

	.handle_ras_controller_intr_no_bifring = nbio_v7_4_handle_ras_controller_intr_no_bifring,

	.handle_ras_err_event_athub_intr_no_bifring = nbio_v7_4_handle_ras_err_event_athub_intr_no_bifring,