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

drm/amdgpu: Modify the compilation failed problem when other ras blocks' .h include amdgpu_ras.h 



Modify the compilation failed problem when other ras blocks' .h include amdgpu_ras.h.

v2: squash in forward declaration warning fix (Alex)

Signed-off-by: default avataryipechai <YiPeng.Chai@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarJohn Clements <john.clements@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6492e1b0

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

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 
#include "amdgpu_smuio.h"

#include "amdgpu_fdinfo.h"

#include "amdgpu_mca.h"

#include "amdgpu_ras.h"



#define MAX_GPU_INSTANCE		16

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

+39 −0
Original line number Diff line number Diff line
@@ -2810,6 +2810,45 @@ static void amdgpu_register_bad_pages_mca_notifier(struct amdgpu_device *adev) 
	}

}

#endif



struct amdgpu_ras* amdgpu_ras_get_context(struct amdgpu_device *adev)

{

	if (!adev)

		return NULL;



	return adev->psp.ras_context.ras;

}



int amdgpu_ras_set_context(struct amdgpu_device *adev, struct amdgpu_ras* ras_con)

{

	if (!adev)

	return -EINVAL;;



	adev->psp.ras_context.ras = ras_con;

	return 0;

}



/* check if ras is supported on block, say, sdma, gfx */

int amdgpu_ras_is_supported(struct amdgpu_device *adev,

		unsigned int block)

{

	struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);



	if (block >= AMDGPU_RAS_BLOCK_COUNT)

		return 0;

	return ras && (adev->ras_enabled & (1 << block));

}



int amdgpu_ras_reset_gpu(struct amdgpu_device *adev)

{

	struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);



	if (atomic_cmpxchg(&ras->in_recovery, 0, 1) == 0)

		schedule_work(&ras->recovery_work);

	return 0;

}





/* Register each ip ras block into amdgpu ras */

int amdgpu_ras_register_ras_block(struct amdgpu_device *adev,

		struct amdgpu_ras_block_object* ras_block_obj)

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

+10 −24
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ 


#include <linux/debugfs.h>

#include <linux/list.h>

#include "amdgpu.h"

#include "amdgpu_psp.h"

#include "ta_ras_if.h"

#include "amdgpu_ras_eeprom.h"



struct amdgpu_iv_entry;



#define AMDGPU_RAS_FLAG_INIT_BY_VBIOS		(0x1 << 0)



enum amdgpu_ras_block {
@@ -525,19 +525,6 @@ struct amdgpu_ras_block_hw_ops { 
 * 8: feature disable

 */



#define amdgpu_ras_get_context(adev)		((adev)->psp.ras_context.ras)

#define amdgpu_ras_set_context(adev, ras_con)	((adev)->psp.ras_context.ras = (ras_con))



/* check if ras is supported on block, say, sdma, gfx */

static inline int amdgpu_ras_is_supported(struct amdgpu_device *adev,

		unsigned int block)

{

	struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);



	if (block >= AMDGPU_RAS_BLOCK_COUNT)

		return 0;

	return ras && (adev->ras_enabled & (1 << block));

}



int amdgpu_ras_recovery_init(struct amdgpu_device *adev);
@@ -554,15 +541,6 @@ int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev, 


int amdgpu_ras_save_bad_pages(struct amdgpu_device *adev);



static inline int amdgpu_ras_reset_gpu(struct amdgpu_device *adev)

{

	struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);



	if (atomic_cmpxchg(&ras->in_recovery, 0, 1) == 0)

		schedule_work(&ras->recovery_work);

	return 0;

}



static inline enum ta_ras_block

amdgpu_ras_block_to_ta(enum amdgpu_ras_block block) {

	switch (block) {
@@ -694,5 +672,13 @@ const char *get_ras_block_str(struct ras_common_if *ras_block); 


bool amdgpu_ras_is_poison_mode_supported(struct amdgpu_device *adev);



int amdgpu_ras_is_supported(struct amdgpu_device *adev, unsigned int block);



int amdgpu_ras_reset_gpu(struct amdgpu_device *adev);



struct amdgpu_ras* amdgpu_ras_get_context(struct amdgpu_device *adev);



int amdgpu_ras_set_context(struct amdgpu_device *adev, struct amdgpu_ras* ras_con);



int amdgpu_ras_register_ras_block(struct amdgpu_device *adev, struct amdgpu_ras_block_object* ras_block_obj);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 *

 */



#include "amdgpu_ras.h"

#include "amdgpu.h"



static int amdgpu_umc_do_page_retirement(struct amdgpu_device *adev,

		void *ras_error_status,