From d32709dac627e5602fb3e66bcf4316906356120d Mon Sep 17 00:00:00 2001 From: Yintian Tao Date: Mon, 13 Apr 2020 14:31:27 +0800 Subject: drm/amdgpu: resume kiq access debugfs If there is no GPU hang, user still can access debugfs through kiq. Signed-off-by: Yintian Tao Reviewed-by: Monk Liu Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c') diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c index 6a81c2ee7c7b..8c10084f44ef 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c @@ -335,17 +335,23 @@ void amdgpu_detect_virtualization(struct amdgpu_device *adev) } } -bool amdgpu_virt_can_access_debugfs(struct amdgpu_device *adev) +bool amdgpu_virt_access_debugfs_is_mmio(struct amdgpu_device *adev) { return amdgpu_sriov_is_debug(adev) ? true : false; } +bool amdgpu_virt_access_debugfs_is_kiq(struct amdgpu_device *adev) +{ + return amdgpu_sriov_is_normal(adev) ? true : false; +} + int amdgpu_virt_enable_access_debugfs(struct amdgpu_device *adev) { - if (!amdgpu_sriov_vf(adev)) + if (!amdgpu_sriov_vf(adev) || + amdgpu_virt_access_debugfs_is_kiq(adev)) return 0; - if (amdgpu_virt_can_access_debugfs(adev)) + if (amdgpu_virt_access_debugfs_is_mmio(adev)) adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME; else return -EPERM; -- cgit v1.2.3