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

drm/amdgpu: define common jpeg_set_ras_funcs

Make the code reusable.

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
214c7642 2ddb629b

+19 -12
+17
drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
··· 234 234 235 235 return 0; 236 236 } 237 + 238 + void jpeg_set_ras_funcs(struct amdgpu_device *adev) 239 + { 240 + if (!adev->jpeg.ras) 241 + return; 242 + 243 + amdgpu_ras_register_ras_block(adev, &adev->jpeg.ras->ras_block); 244 + 245 + strcpy(adev->jpeg.ras->ras_block.ras_comm.name, "jpeg"); 246 + adev->jpeg.ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__JPEG; 247 + adev->jpeg.ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__POISON; 248 + adev->jpeg.ras_if = &adev->jpeg.ras->ras_block.ras_comm; 249 + 250 + /* If don't define special ras_late_init function, use default ras_late_init */ 251 + if (!adev->jpeg.ras->ras_block.ras_late_init) 252 + adev->jpeg.ras->ras_block.ras_late_init = amdgpu_ras_block_late_init; 253 + }
+1
drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
··· 72 72 int amdgpu_jpeg_process_poison_irq(struct amdgpu_device *adev, 73 73 struct amdgpu_irq_src *source, 74 74 struct amdgpu_iv_entry *entry); 75 + void jpeg_set_ras_funcs(struct amdgpu_device *adev); 75 76 76 77 #endif /*__AMDGPU_JPEG_H__*/
+1 -12
drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
··· 807 807 break; 808 808 } 809 809 810 - if (adev->jpeg.ras) { 811 - amdgpu_ras_register_ras_block(adev, &adev->jpeg.ras->ras_block); 812 - 813 - strcpy(adev->jpeg.ras->ras_block.ras_comm.name, "jpeg"); 814 - adev->jpeg.ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__JPEG; 815 - adev->jpeg.ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__POISON; 816 - adev->jpeg.ras_if = &adev->jpeg.ras->ras_block.ras_comm; 817 - 818 - /* If don't define special ras_late_init function, use default ras_late_init */ 819 - if (!adev->jpeg.ras->ras_block.ras_late_init) 820 - adev->jpeg.ras->ras_block.ras_late_init = amdgpu_ras_block_late_init; 821 - } 810 + jpeg_set_ras_funcs(adev); 822 811 }