Skip to contentSkip to conversation

drm/amdgpu: remove amdgpu_cs_handle_lockup

PATCH In review Huang Rui 2 participants 2 messages Oct 31, 2016 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Huang Rui

author
#0 lore raw

PATCH 1/1 drm/amdgpu: remove amdgpu_cs_handle_lockup

In fence waiting, it never return -EDEADLK yet, so drop this function here.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +0 -11
index d73dd1b..2c559e6 100644
@@ -839,16 +839,6 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,
 	return amdgpu_cs_sync_rings(p);
 }
 
-static int amdgpu_cs_handle_lockup(struct amdgpu_device *adev, int r)
-{
-	if (r == -EDEADLK) {
-		r = amdgpu_gpu_reset(adev);
-		if (!r)
-			r = -EAGAIN;
-	}
-	return r;
-}
-
 static int amdgpu_cs_ib_fill(struct amdgpu_device *adev,
 			     struct amdgpu_cs_parser *parser)
 {
@@ -1086,7 +1076,6 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
 
 out:
 	amdgpu_cs_parser_fini(&parser, r, reserved_buffers);
-	r = amdgpu_cs_handle_lockup(adev, r);
 	return r;
 }
 
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): 1477905847-25731-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org

Reviewed-by
#2 lore raw

Am 31.10.2016 um 10:24 schrieb Huang Rui:

Quoted 4 lines

In fence waiting, it never return -EDEADLK yet, so drop this function here.

Quoted 26 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 11 -----------
  1 file changed, 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +0 -10
index d73dd1b..2c559e6 100644
@@ -839,16 +839,6 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,
  	return amdgpu_cs_sync_rings(p);
  }
 
-static int amdgpu_cs_handle_lockup(struct amdgpu_device *adev, int r)
-{
-	if (r == -EDEADLK) {
-		r = amdgpu_gpu_reset(adev);
-		if (!r)
-			r = -EAGAIN;
-	}
-	return r;
-}
-
  static int amdgpu_cs_ib_fill(struct amdgpu_device *adev,
  			     struct amdgpu_cs_parser *parser)
  {

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) · line 1081

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +0 -1
@@ -1086,7 +1076,6 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
 
  out:
  	amdgpu_cs_parser_fini(&parser, r, reserved_buffers);
-	r = amdgpu_cs_handle_lockup(adev, r);
  	return r;
  }
 

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