Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: define common vcn_set_ras_funcs

So the code can be reused.

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Tao Zhou and committed by
Alex Deucher
2ddb629b 07615da1

+19 -12
+17
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
··· 1248 1248 1249 1249 return 0; 1250 1250 } 1251 + 1252 + void amdgpu_vcn_set_ras_funcs(struct amdgpu_device *adev) 1253 + { 1254 + if (!adev->vcn.ras) 1255 + return; 1256 + 1257 + amdgpu_ras_register_ras_block(adev, &adev->vcn.ras->ras_block); 1258 + 1259 + strcpy(adev->vcn.ras->ras_block.ras_comm.name, "vcn"); 1260 + adev->vcn.ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__VCN; 1261 + adev->vcn.ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__POISON; 1262 + adev->vcn.ras_if = &adev->vcn.ras->ras_block.ras_comm; 1263 + 1264 + /* If don't define special ras_late_init function, use default ras_late_init */ 1265 + if (!adev->vcn.ras->ras_block.ras_late_init) 1266 + adev->vcn.ras->ras_block.ras_late_init = amdgpu_ras_block_late_init; 1267 + }
+1
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
··· 399 399 int amdgpu_vcn_process_poison_irq(struct amdgpu_device *adev, 400 400 struct amdgpu_irq_src *source, 401 401 struct amdgpu_iv_entry *entry); 402 + void amdgpu_vcn_set_ras_funcs(struct amdgpu_device *adev); 402 403 403 404 #endif
+1 -12
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
··· 2002 2002 break; 2003 2003 } 2004 2004 2005 - if (adev->vcn.ras) { 2006 - amdgpu_ras_register_ras_block(adev, &adev->vcn.ras->ras_block); 2007 - 2008 - strcpy(adev->vcn.ras->ras_block.ras_comm.name, "vcn"); 2009 - adev->vcn.ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__VCN; 2010 - adev->vcn.ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__POISON; 2011 - adev->vcn.ras_if = &adev->vcn.ras->ras_block.ras_comm; 2012 - 2013 - /* If don't define special ras_late_init function, use default ras_late_init */ 2014 - if (!adev->vcn.ras->ras_block.ras_late_init) 2015 - adev->vcn.ras->ras_block.ras_late_init = amdgpu_ras_block_late_init; 2016 - } 2005 + amdgpu_vcn_set_ras_funcs(adev); 2017 2006 }