Skip to contentSkip to conversation

drm/amdgpu:no debugfs_gpu_reset for SRIOV

PATCH In review Monk Liu 2 participants 2 messages May 8, 2017 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Monk Liu

author
#0 lore raw

PATCH 1/1 drm/amdgpu:no debugfs_gpu_reset for SRIOV

Change-Id Ie9730852da54ceb8b4c2c44acac2df3556a32d17
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +7 -2
index fe173e0..417f190 100644
@@ -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);
 
 	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;
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): 1494235713-29123-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org

#2 lore raw

Am 08.05.2017 um 11:28 schrieb Monk Liu:

Quoted 11 lines
Change-Id Ie9730852da54ceb8b4c2c44acac2df3556a32d17
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +0 -0
index fe173e0..417f190 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c static int amdgpu_debugfs_gpu_reset(struct seq_file *m, void *data) · line 664

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +1 -2
@@ -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 <[email protected]>.

Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +4 -0
  	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},
+};

drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c static const struct drm_info_list amdgpu_debugfs_fence_list[] = { · line 686

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +2 -0
  #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;

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx