drm/amdgpu: Enable uvd and vce gpu re-init for SRIOV gpu reset
Subsystems (2)
PATCH 2/8 drm/amdgpu: Enable uvd and vce gpu re-init for SRIOV gpu reset
From: Frank Min <[email protected]>
Add uvd and vce re-init after gpu reset.
Signed-off-by Frank Min <[email protected]>
Signed-off-by Xiangliang.Yu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 3 +-- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -1
@@ -1953,7 +1953,8 @@ static int amdgpu_sriov_reinit_late(struct amdgpu_device *adev)AMD_IP_BLOCK_TYPE_DCE ,AMD_IP_BLOCK_TYPE_GFX ,AMD_IP_BLOCK_TYPE_SDMA , - AMD_IP_BLOCK_TYPE_VCE, +AMD_IP_BLOCK_TYPE_UVD , + AMD_IP_BLOCK_TYPE_VCE };for (i =0 ; i <ARRAY_SIZE (ip_order); i++) {
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +1 -2
@@ -894,9 +894,8 @@ static int uvd_v7_0_sriov_start(struct amdgpu_device *adev) table_size +=sizeof (struct mmsch_v1_0_cmd_end ) /4 ; header->uvd_table_size = table_size; -return uvd_v7_0_mmsch_start (adev, &adev->virt.mm_table); } -return -EINVAL ;/* already initializaed ? */ +return uvd_v7_0_mmsch_start (adev, &adev->virt.mm_table); }/**
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +1 -3
@@ -300,11 +300,9 @@ static int vce_v4_0_sriov_start(struct amdgpu_device *adev)memcpy ((void *)init_table, &end,sizeof (struct mmsch_v1_0_cmd_end )); table_size +=sizeof (struct mmsch_v1_0_cmd_end ) /4 ; header->vce_table_size = table_size; - -return vce_v4_0_mmsch_start (adev, &adev->virt.mm_table); } -return -EINVAL ;/* already initializaed ? */ +return vce_v4_0_mmsch_start (adev, &adev->virt.mm_table); }/**
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1500974217-2432-1-git-send-email-Xiangliang.Yu-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Acked-byQuoted 6 lines · Xiangliang.Yu
From: Frank Min <[email protected]>
Add uvd and vce re-init after gpu reset.
Signed-off-by Frank Min <[email protected]>Signed-off-by Xiangliang.Yu <[email protected]>
Acked-by Alex Deucher <[email protected]>
Quoted 55 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 3 +-- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-1@@ -1953,7 +1953,8 @@ static int amdgpu_sriov_reinit_late(struct amdgpu_device *adev)AMD_IP_BLOCK_TYPE_DCE ,AMD_IP_BLOCK_TYPE_GFX ,AMD_IP_BLOCK_TYPE_SDMA , - AMD_IP_BLOCK_TYPE_VCE, +AMD_IP_BLOCK_TYPE_UVD , + AMD_IP_BLOCK_TYPE_VCE };for (i =0 ; i <ARRAY_SIZE (ip_order); i++) {drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +1
-2@@ -894,9 +894,8 @@ static int uvd_v7_0_sriov_start(struct amdgpu_device *adev) table_size +=sizeof (struct mmsch_v1_0_cmd_end ) /4 ; header->uvd_table_size = table_size; -return uvd_v7_0_mmsch_start (adev, &adev->virt.mm_table); } -return -EINVAL ;/* already initializaed ? */ +return uvd_v7_0_mmsch_start (adev, &adev->virt.mm_table); }/** drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +1
-4@@ -300,11 +300,9 @@ static int vce_v4_0_sriov_start(struct amdgpu_device *adev)memcpy ((void *)init_table, &end,sizeof (struct mmsch_v1_0_cmd_end )); table_size +=sizeof (struct mmsch_v1_0_cmd_end ) /4 ; header->vce_table_size = table_size; - -return vce_v4_0_mmsch_start (adev, &adev->virt.mm_table); } -return -EINVAL ;/* already initializaed ? */ +return vce_v4_0_mmsch_start (adev, &adev->virt.mm_table); }/** -- 2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx