drm/amdgpu: Fix use of interruptible waiting
Subsystems (2)
PATCH 1/1 drm/amdgpu: Fix use of interruptible waiting
Either in cgs functions or for callers of cgs functions:
1. The signal interrupt can affect the expected behaviour
2. There is no good mechanism to handle the corresponding error
3. There is no chance of deadlock in these single BO waiting
4. There is no clear benefit for interruptible waiting
5. Future caller of these functions might have same issue.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +7 -7
@@ -89,7 +89,7 @@ static int amdgpu_cgs_gmap_kmem(struct cgs_device *cgs_device, void *kmem, AMDGPU_GEM_DOMAIN_GTT, 0, sg, NULL, &bo);if (ret)return ret; - ret =amdgpu_bo_reserve (bo, false); + ret =amdgpu_bo_reserve (bo, true);if (unlikely (ret !=0 ))return ret;
@@ -107,7 +107,7 @@ static int amdgpu_cgs_gunmap_kmem(struct cgs_device *cgs_device, cgs_handle_t kmstruct amdgpu_bo *obj = (struct amdgpu_bo *)kmem_handle;if (obj) { -int r =amdgpu_bo_reserve (obj, false); +int r =amdgpu_bo_reserve (obj, true);if (likely (r ==0 )) {amdgpu_bo_unpin (obj);amdgpu_bo_unreserve (obj);
@@ -215,7 +215,7 @@ static int amdgpu_cgs_free_gpu_mem(struct cgs_device *cgs_device, cgs_handle_t hstruct amdgpu_bo *obj = (struct amdgpu_bo *)handle;if (obj) { -int r =amdgpu_bo_reserve (obj, false); +int r =amdgpu_bo_reserve (obj, true);if (likely (r ==0 )) {amdgpu_bo_kunmap (obj);amdgpu_bo_unpin (obj);
@@ -239,7 +239,7 @@ static int amdgpu_cgs_gmap_gpu_mem(struct cgs_device *cgs_device, cgs_handle_t h min_offset = obj->placements[0 ].fpfn <<PAGE_SHIFT ; max_offset = obj->placements[0 ].lpfn <<PAGE_SHIFT ; - r =amdgpu_bo_reserve (obj, false); + r =amdgpu_bo_reserve (obj, true);if (unlikely (r !=0 ))return r; r = amdgpu_bo_pin_restricted(obj, obj->prefered_domains,
@@ -252,7 +252,7 @@ static int amdgpu_cgs_gunmap_gpu_mem(struct cgs_device *cgs_device, cgs_handle_t {int r;struct amdgpu_bo *obj = (struct amdgpu_bo *)handle; - r =amdgpu_bo_reserve (obj, false); + r =amdgpu_bo_reserve (obj, true);if (unlikely (r !=0 ))return r; r =amdgpu_bo_unpin (obj);
@@ -265,7 +265,7 @@ static int amdgpu_cgs_kmap_gpu_mem(struct cgs_device *cgs_device, cgs_handle_t h {int r;struct amdgpu_bo *obj = (struct amdgpu_bo *)handle; - r =amdgpu_bo_reserve (obj, false); + r =amdgpu_bo_reserve (obj, true);if (unlikely (r !=0 ))return r; r =amdgpu_bo_kmap (obj, map);
@@ -277,7 +277,7 @@ static int amdgpu_cgs_kunmap_gpu_mem(struct cgs_device *cgs_device, cgs_handle_t {int r;struct amdgpu_bo *obj = (struct amdgpu_bo *)handle; - r =amdgpu_bo_reserve (obj, false); + r =amdgpu_bo_reserve (obj, true);if (unlikely (r !=0 ))return r;amdgpu_bo_kunmap (obj);
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1493148773-26857-1-git-send-email-AlexBin.Xie-5C7GfCeVMHo@public.gmane.org
Christian König
Reviewed-byAm 25.04.2017 um 21:32 schrieb Alex Xie:
Quoted 9 lines
Either in cgs functions or for callers of cgs functions:
1. The signal interrupt can affect the expected behaviour
2. There is no good mechanism to handle the corresponding error
3. There is no chance of deadlock in these single BO waiting
4. There is no clear benefit for interruptible waiting
5. Future caller of these functions might have same issue.Change-Id Ifc0e0ab862f98cdc6cdaef87cd96f11c91d64f27Signed-off-by Alex Xie <[email protected]>
BTW: We should probably tidy up amdgpu_cgs.c. Most of this stuff is actually not used anywhere.
Regards,
Christian.
Quoted 63 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +6
-6@@ -89,7 +89,7 @@ static int amdgpu_cgs_gmap_kmem(struct cgs_device *cgs_device, void *kmem, AMDGPU_GEM_DOMAIN_GTT, 0, sg, NULL, &bo);if (ret)return ret; - ret =amdgpu_bo_reserve (bo, false); + ret =amdgpu_bo_reserve (bo, true);if (unlikely (ret !=0 ))return ret;@@ -107,7 +107,7 @@ static int amdgpu_cgs_gunmap_kmem(struct cgs_device *cgs_device, cgs_handle_t kmstruct amdgpu_bo *obj = (struct amdgpu_bo *)kmem_handle;if (obj) { -int r =amdgpu_bo_reserve (obj, false); +int r =amdgpu_bo_reserve (obj, true);if (likely (r ==0 )) {amdgpu_bo_unpin (obj);amdgpu_bo_unreserve (obj);@@ -215,7 +215,7 @@ static int amdgpu_cgs_free_gpu_mem(struct cgs_device *cgs_device, cgs_handle_t hstruct amdgpu_bo *obj = (struct amdgpu_bo *)handle;if (obj) { -int r =amdgpu_bo_reserve (obj, false); +int r =amdgpu_bo_reserve (obj, true);if (likely (r ==0 )) {amdgpu_bo_kunmap (obj);amdgpu_bo_unpin (obj);@@ -239,7 +239,7 @@ static int amdgpu_cgs_gmap_gpu_mem(struct cgs_device *cgs_device, cgs_handle_t h min_offset = obj->placements[0 ].fpfn <<PAGE_SHIFT ; max_offset = obj->placements[0 ].lpfn <<PAGE_SHIFT ; - r =amdgpu_bo_reserve (obj, false); + r =amdgpu_bo_reserve (obj, true);if (unlikely (r !=0 ))return r; r = amdgpu_bo_pin_restricted(obj, obj->prefered_domains,@@ -252,7 +252,7 @@ static int amdgpu_cgs_gunmap_gpu_mem(struct cgs_device *cgs_device, cgs_handle_t {int r;struct amdgpu_bo *obj = (struct amdgpu_bo *)handle; - r =amdgpu_bo_reserve (obj, false); + r =amdgpu_bo_reserve (obj, true);if (unlikely (r !=0 ))return r; r =amdgpu_bo_unpin (obj);@@ -265,7 +265,7 @@ static int amdgpu_cgs_kmap_gpu_mem(struct cgs_device *cgs_device, cgs_handle_t h {int r;struct amdgpu_bo *obj = (struct amdgpu_bo *)handle; - r =amdgpu_bo_reserve (obj, false); + r =amdgpu_bo_reserve (obj, true);if (unlikely (r !=0 ))return r; r =amdgpu_bo_kmap (obj, map);
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c static int amdgpu_cgs_kunmap_gpu_mem(struct cgs_device *cgs_device, cgs_handle_t · line 283
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +1
-1@@ -277,7 +277,7 @@ static int amdgpu_cgs_kunmap_gpu_mem(struct cgs_device *cgs_device, cgs_handle_t {int r;struct amdgpu_bo *obj = (struct amdgpu_bo *)handle; - r =amdgpu_bo_reserve (obj, false); + r =amdgpu_bo_reserve (obj, true);if (unlikely (r !=0 ))return r;amdgpu_bo_kunmap (obj);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx