Commit 2d6a2a28 authored by André Almeida's avatar André Almeida Committed by Alex Deucher
Browse files

drm/amdgpu: Encapsulate all device reset info 



To better organize struct amdgpu_device, keep all reset information
related fields together in a separated struct.

Signed-off-by: default avatarAndré Almeida <andrealmeid@igalia.com>
Signed-off-by: default avatarShashank Sharma <shashank.sharma@amd.com>
Reviewed-by: default avatarShashank Sharma <shashank.sharma@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 723fac64

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

+21 −13
Original line number Diff line number Diff line
@@ -773,6 +773,26 @@ struct amdgpu_mqd { 
struct amdgpu_reset_domain;

struct amdgpu_fru_info;



#ifdef CONFIG_DEV_COREDUMP

struct amdgpu_coredump_info {

	struct amdgpu_device	*adev;

	struct amdgpu_task_info reset_task_info;

	struct timespec64	reset_time;

	bool			reset_vram_lost;

};

#endif



struct amdgpu_reset_info {

	/* reset dump register */

	u32 *reset_dump_reg_list;

	u32 *reset_dump_reg_value;

	int num_regs;



#ifdef CONFIG_DEV_COREDUMP

	struct amdgpu_coredump_info *coredump_info;

#endif

};



/*

 * Non-zero (true) if the GPU has VRAM. Zero (false) otherwise.

 */
@@ -1081,10 +1101,7 @@ struct amdgpu_device { 


	struct mutex			benchmark_mutex;



	/* reset dump register */

	uint32_t                        *reset_dump_reg_list;

	uint32_t			*reset_dump_reg_value;

	int                             num_regs;

	struct amdgpu_reset_info	reset_info;



	bool                            scpm_enabled;

	uint32_t                        scpm_status;
@@ -1111,15 +1128,6 @@ static inline uint32_t amdgpu_ip_version(const struct amdgpu_device *adev, 
	return adev->ip_versions[ip][inst] & ~0xFFU;

}



#ifdef CONFIG_DEV_COREDUMP

struct amdgpu_coredump_info {

	struct amdgpu_device		*adev;

	struct amdgpu_task_info         reset_task_info;

	struct timespec64               reset_time;

	bool                            reset_vram_lost;

};

#endif



static inline struct amdgpu_device *drm_to_adev(struct drm_device *ddev)

{

	return container_of(ddev, struct amdgpu_device, ddev);

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

+5 −5
Original line number Diff line number Diff line
@@ -2016,8 +2016,8 @@ static ssize_t amdgpu_reset_dump_register_list_read(struct file *f, 
	if (ret)

		return ret;



	for (i = 0; i < adev->num_regs; i++) {

		sprintf(reg_offset, "0x%x\n", adev->reset_dump_reg_list[i]);

	for (i = 0; i < adev->reset_info.num_regs; i++) {

		sprintf(reg_offset, "0x%x\n", adev->reset_info.reset_dump_reg_list[i]);

		up_read(&adev->reset_domain->sem);

		if (copy_to_user(buf + len, reg_offset, strlen(reg_offset)))

			return -EFAULT;
@@ -2074,9 +2074,9 @@ static ssize_t amdgpu_reset_dump_register_list_write(struct file *f, 
	if (ret)

		goto error_free;



	swap(adev->reset_dump_reg_list, tmp);

	swap(adev->reset_dump_reg_value, new);

	adev->num_regs = i;

	swap(adev->reset_info.reset_dump_reg_list, tmp);

	swap(adev->reset_info.reset_dump_reg_value, new);

	adev->reset_info.num_regs = i;

	up_write(&adev->reset_domain->sem);

	ret = size;

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

+10 −8
Original line number Diff line number Diff line
@@ -5048,10 +5048,12 @@ static int amdgpu_reset_reg_dumps(struct amdgpu_device *adev) 


	lockdep_assert_held(&adev->reset_domain->sem);



	for (i = 0; i < adev->num_regs; i++) {

		adev->reset_dump_reg_value[i] = RREG32(adev->reset_dump_reg_list[i]);

		trace_amdgpu_reset_reg_dumps(adev->reset_dump_reg_list[i],

					     adev->reset_dump_reg_value[i]);

	for (i = 0; i < adev->reset_info.num_regs; i++) {

		adev->reset_info.reset_dump_reg_value[i] =

			RREG32(adev->reset_info.reset_dump_reg_list[i]);



		trace_amdgpu_reset_reg_dumps(adev->reset_info.reset_dump_reg_list[i],

					     adev->reset_info.reset_dump_reg_value[i]);

	}



	return 0;
@@ -5089,13 +5091,13 @@ static ssize_t amdgpu_devcoredump_read(char *buffer, loff_t offset, 


	if (coredump->reset_vram_lost)

		drm_printf(&p, "VRAM is lost due to GPU reset!\n");

	if (coredump->adev->num_regs) {

	if (coredump->adev->reset_info.num_regs) {

		drm_printf(&p, "AMDGPU register dumps:\nOffset:     Value:\n");



		for (i = 0; i < coredump->adev->num_regs; i++)

		for (i = 0; i < coredump->adev->reset_info.num_regs; i++)

			drm_printf(&p, "0x%08x: 0x%08x\n",

				   coredump->adev->reset_dump_reg_list[i],

				   coredump->adev->reset_dump_reg_value[i]);

				   coredump->adev->reset_info.reset_dump_reg_list[i],

				   coredump->adev->reset_info.reset_dump_reg_value[i]);

	}



	return count - iter.remain;