drm/amd/amdgpu: fixing read wrong pf2vf data in SRIOV
Subsystems (2)
PATCH 1/1 drm/amd/amdgpu: fixing read wrong pf2vf data in SRIOV
[Why]
This fixes 35709bd76d229a51b0c571a768b741650ec47828.
we should read pf2vf data based at mman.fw_vram_usage_va after gmc sw_init. patch 35709bd76 breaks this logic.
[How]
calling amdgpu_virt_exchange_data in amdgpu_virt_init_data_exchange to set the right base in the right sequence.
v2:
call amdgpu_virt_init_data_exchange after gmc sw_init to make data exchange workqueue run
Signed-off-by Jingwen Chen <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -2353,7 +2353,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) }if (amdgpu_sriov_vf (adev)) -amdgpu_virt_exchange_data (adev); +amdgpu_virt_init_data_exchange (adev); r =amdgpu_ib_pool_init (adev);if (r) {
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +3 -7
@@ -625,16 +625,12 @@ void amdgpu_virt_init_data_exchange(struct amdgpu_device *adev) adev->virt.fw_reserve.p_vf2pf =NULL ; adev->virt.vf2pf_update_interval_ms =0 ; -if (adev->bios !=NULL ) { +if (adev->mman.fw_vram_usage_va !=NULL ) { adev->virt.vf2pf_update_interval_ms =2000 ; - - adev->virt.fw_reserve.p_pf2vf = - (struct amd_sriov_msg_pf2vf_info_header *) - (adev->bios + (AMD_SRIOV_MSG_PF2VF_OFFSET_KB <<10 )); - -amdgpu_virt_read_pf2vf_data (adev); } +amdgpu_virt_exchange_data (adev); +if (adev->virt.vf2pf_update_interval_ms !=0 ) {INIT_DELAYED_WORK (&adev->virt.vf2pf_work, amdgpu_virt_update_vf2pf_work_item);schedule_delayed_work (&(adev->virt.vf2pf_work),msecs_to_jiffies (adev->virt.vf2pf_update_interval_ms));
Signature · 1 line
2.30.2