Skip to contentSkip to conversation

drm/msm/gpu: Don't allow zero fence_id

PATCH In review Rob Clark 1 participant 2 messages Nov 29, 2021

Subsystems (3)
lore
Share & tools
lore

Rob Clark

author
#0 lore raw

PATCH 1/1 drm/msm/gpu: Don't allow zero fence_id

From: Rob Clark <[email protected]>

Elsewhere we treat zero as "no fence" and __msm_gem_submit_destroy() skips removal from fence_idr. We could alternately change this to use negative values for "no fence" but I think it is more clear to not allow zero as a valid fence_id.

---
 drivers/gpu/drm/msm/msm_gem_submit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_gem_submit.c +1 -1
index 282628d6b72c..6cfa984dee6a 100644
@@ -881,7 +881,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
 	 * to the underlying fence.
 	 */
 	submit->fence_id = idr_alloc_cyclic(&queue->fence_idr,
-			submit->user_fence, 0, INT_MAX, GFP_KERNEL);
+			submit->user_fence, 1, INT_MAX, GFP_KERNEL);
 	if (submit->fence_id < 0) {
 		ret = submit->fence_id = 0;
 		submit->fence_id = 0;
Signature · 1 line
2.33.1
author
#1 lore raw
Quoted 8 lines · Rob Clark

From: Rob Clark <[email protected]>

Elsewhere we treat zero as "no fence" and __msm_gem_submit_destroy() skips removal from fence_idr. We could alternately change this to use negative values for "no fence" but I think it is more clear to not allow zero as a valid fence_id.

probably should have added:

Fixes a61acbbe9cf8 ("drm/msm: Track "seqno" fences by idr")
Quoted 21 lines
---
 drivers/gpu/drm/msm/msm_gem_submit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_gem_submit.c +1 -2
index 282628d6b72c..6cfa984dee6a 100644
@@ -881,7 +881,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
         * to the underlying fence.
         */
        submit->fence_id = idr_alloc_cyclic(&queue->fence_idr,
-                       submit->user_fence, 0, INT_MAX, GFP_KERNEL);
+                       submit->user_fence, 1, INT_MAX, GFP_KERNEL);
        if (submit->fence_id < 0) {
                ret = submit->fence_id = 0;
                submit->fence_id = 0;
--

2.33.1