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

drm/amdgpu: Modify .ras_late_init function pointer parameter 



Modify .ras_late_init function pointer parameter so that
it can remove redundant intermediate calls in some ras blocks.

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 f83e1401

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

+1 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ int amdgpu_get_gfx_off_status(struct amdgpu_device *adev, uint32_t *value) 
	return r;

}



int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, void *ras_info)

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

{

	int r;

	r = amdgpu_ras_block_late_init(adev, adev->gfx.ras_if);

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

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ bool amdgpu_gfx_is_me_queue_enabled(struct amdgpu_device *adev, int me, 
				    int pipe, int queue);

void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable);

int amdgpu_get_gfx_off_status(struct amdgpu_device *adev, uint32_t *value);

int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, void *ras_info);

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

void amdgpu_gfx_ras_fini(struct amdgpu_device *adev);

int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev,

		void *err_data,

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "amdgpu.h"

#include "amdgpu_ras.h"



int amdgpu_hdp_ras_late_init(struct amdgpu_device *adev, void *ras_info)

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);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -43,6 +43,6 @@ struct amdgpu_hdp { 
	struct amdgpu_hdp_ras	*ras;

};



int amdgpu_hdp_ras_late_init(struct amdgpu_device *adev, void *ras_info);

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

void amdgpu_hdp_ras_fini(struct amdgpu_device *adev);

#endif /* __AMDGPU_HDP_H__ */

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "amdgpu.h"

#include "amdgpu_ras.h"



int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev, void *ras_info)

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);

}