Am 08.05.2017 um 11:28 schrieb Monk Liu:
> Change-Id: Ie9730852da54ceb8b4c2c44acac2df3556a32d17
> Signed-off-by: Monk Liu <Monk.Liu at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> index fe173e0..417f190 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> @@ -661,8 +661,7 @@ static int amdgpu_debugfs_gpu_reset(struct seq_file *m, void *data)
> struct amdgpu_device *adev = dev->dev_private;
>
> seq_printf(m, "gpu reset\n");
> - if (!amdgpu_sriov_vf(adev))
> - amdgpu_gpu_reset(adev);
> + amdgpu_gpu_reset(adev);
Please squash that into the original commit while pushing into our
repository.
With that done this is Reviewed-by: Christian König
<christian.koenig at amd.com>.
>
> return 0;
> }
> @@ -671,11 +670,17 @@ static const struct drm_info_list amdgpu_debugfs_fence_list[] = {
> {"amdgpu_fence_info", &amdgpu_debugfs_fence_info, 0, NULL},
> {"amdgpu_gpu_reset", &amdgpu_debugfs_gpu_reset, 0, NULL}
> };
> +
> +static const struct drm_info_list amdgpu_debugfs_fence_list_sriov[] = {
> + {"amdgpu_fence_info", &amdgpu_debugfs_fence_info, 0, NULL},
> +};
> #endif
>
> int amdgpu_debugfs_fence_init(struct amdgpu_device *adev)
> {
> #if defined(CONFIG_DEBUG_FS)
> + if (amdgpu_sriov_vf(adev))
> + return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_fence_list_sriov, 1);
> return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_fence_list, 2);
> #else
> return 0;
