Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 257deb8c authored by Frank Min's avatar Frank Min Committed by Alex Deucher
Browse files

drm/amdgpu: Enable uvd and vce gpu re-init for SRIOV gpu reset 



Add uvd and vce re-init after gpu reset.

Signed-off-by: default avatarFrank Min <Frank.Min@amd.com>
Signed-off-by: default avatarXiangliang.Yu <Xiangliang.Yu@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ab2b2e4f

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+2 −1
Original line number Diff line number Diff line
@@ -1948,7 +1948,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

}



/**