Commit 2cfb737b authored by YiPeng Chai's avatar YiPeng Chai Committed by Alex Deucher
Browse files

drm/amdgpu: Optimize sdma ras block initialization code for sdma v4_0 



Optimize sdma ras block initialization code for sdma v4_0.

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

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

+5 −16
Original line number Diff line number Diff line
@@ -1851,6 +1851,11 @@ static int sdma_v4_0_sw_init(void *handle) 
		}

	}



	if (amdgpu_sdma_ras_sw_init(adev)) {

		dev_err(adev->dev, "Failed to initialize sdma ras block!\n");

		return -EINVAL;

	}



	return r;

}
@@ -2688,22 +2693,6 @@ static void sdma_v4_0_set_ras_funcs(struct amdgpu_device *adev) 
		break;

	}



	if (adev->sdma.ras) {

		amdgpu_ras_register_ras_block(adev, &adev->sdma.ras->ras_block);



		strcpy(adev->sdma.ras->ras_block.ras_comm.name, "sdma");

		adev->sdma.ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__SDMA;

		adev->sdma.ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

		adev->sdma.ras_if = &adev->sdma.ras->ras_block.ras_comm;



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

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

			adev->sdma.ras->ras_block.ras_late_init = amdgpu_sdma_ras_late_init;



		/* If not defined special ras_cb function, use default ras_cb */

		if (!adev->sdma.ras->ras_block.ras_cb)

			adev->sdma.ras->ras_block.ras_cb = amdgpu_sdma_process_ras_data_cb;

	}

}



const struct amdgpu_ip_block_version sdma_v4_0_ip_block = {