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

drm/amdgpu: remove ih_info parameter of gfx_ras_late_init

gfx_ras_late_init can get the info by itself

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Tao Zhou and committed by
Alex Deucher
41190cd7 56c54b25

+9 -15
+7 -9
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
··· 571 571 mutex_unlock(&adev->gfx.gfx_off_mutex); 572 572 } 573 573 574 - int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, 575 - void *ras_ih_info) 574 + int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev) 576 575 { 577 576 int r; 578 - struct ras_ih_if *ih_info = (struct ras_ih_if *)ras_ih_info; 579 577 struct ras_fs_if fs_info = { 580 578 .sysfs_name = "gfx_err_count", 581 579 .debugfs_name = "gfx_err_inject", 582 580 }; 583 - 584 - if (!ih_info) 585 - return -EINVAL; 581 + struct ras_ih_if ih_info = { 582 + .cb = amdgpu_gfx_process_ras_data_cb, 583 + }; 586 584 587 585 if (!adev->gfx.ras_if) { 588 586 adev->gfx.ras_if = kmalloc(sizeof(struct ras_common_if), GFP_KERNEL); ··· 591 593 adev->gfx.ras_if->sub_block_index = 0; 592 594 strcpy(adev->gfx.ras_if->name, "gfx"); 593 595 } 594 - fs_info.head = ih_info->head = *adev->gfx.ras_if; 596 + fs_info.head = ih_info.head = *adev->gfx.ras_if; 595 597 596 598 r = amdgpu_ras_late_init(adev, adev->gfx.ras_if, 597 - &fs_info, ih_info); 599 + &fs_info, &ih_info); 598 600 if (r) 599 601 goto free; 600 602 ··· 610 612 611 613 return 0; 612 614 late_fini: 613 - amdgpu_ras_late_fini(adev, adev->gfx.ras_if, ih_info); 615 + amdgpu_ras_late_fini(adev, adev->gfx.ras_if, &ih_info); 614 616 free: 615 617 kfree(adev->gfx.ras_if); 616 618 adev->gfx.ras_if = NULL;
+1 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
··· 358 358 bool amdgpu_gfx_is_me_queue_enabled(struct amdgpu_device *adev, int me, 359 359 int pipe, int queue); 360 360 void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable); 361 - int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, 362 - void *ras_ih_info); 361 + int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev); 363 362 void amdgpu_gfx_ras_fini(struct amdgpu_device *adev); 364 363 int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev, 365 364 void *err_data,
+1 -4
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
··· 4194 4194 static int gfx_v9_0_ecc_late_init(void *handle) 4195 4195 { 4196 4196 struct amdgpu_device *adev = (struct amdgpu_device *)handle; 4197 - struct ras_ih_if ih_info = { 4198 - .cb = amdgpu_gfx_process_ras_data_cb, 4199 - }; 4200 4197 int r; 4201 4198 4202 - r = amdgpu_gfx_ras_late_init(adev, &ih_info); 4199 + r = amdgpu_gfx_ras_late_init(adev); 4203 4200 if (r) 4204 4201 return r; 4205 4202