drm: Unify and fix idr error handling
The error handling code w.r.t. idr usage looks inconsistent. In the case of drm_mode_object_get() and drm_ctxbitmap_next() the error handling is also incomplete. Unify the code to follow the same pattern always. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
committed by
Dave Airlie
parent
343d4a79fd
commit
f1ae126cdf
@ -85,11 +85,12 @@ again:
|
|||||||
mutex_lock(&dev->struct_mutex);
|
mutex_lock(&dev->struct_mutex);
|
||||||
ret = idr_get_new_above(&dev->ctx_idr, NULL,
|
ret = idr_get_new_above(&dev->ctx_idr, NULL,
|
||||||
DRM_RESERVED_CONTEXTS, &new_id);
|
DRM_RESERVED_CONTEXTS, &new_id);
|
||||||
if (ret == -EAGAIN) {
|
|
||||||
mutex_unlock(&dev->struct_mutex);
|
|
||||||
goto again;
|
|
||||||
}
|
|
||||||
mutex_unlock(&dev->struct_mutex);
|
mutex_unlock(&dev->struct_mutex);
|
||||||
|
if (ret == -EAGAIN)
|
||||||
|
goto again;
|
||||||
|
else if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
return new_id;
|
return new_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -227,7 +227,7 @@ static int drm_mode_object_get(struct drm_device *dev,
|
|||||||
again:
|
again:
|
||||||
if (idr_pre_get(&dev->mode_config.crtc_idr, GFP_KERNEL) == 0) {
|
if (idr_pre_get(&dev->mode_config.crtc_idr, GFP_KERNEL) == 0) {
|
||||||
DRM_ERROR("Ran out memory getting a mode number\n");
|
DRM_ERROR("Ran out memory getting a mode number\n");
|
||||||
return -EINVAL;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
mutex_lock(&dev->mode_config.idr_mutex);
|
mutex_lock(&dev->mode_config.idr_mutex);
|
||||||
@ -235,6 +235,8 @@ again:
|
|||||||
mutex_unlock(&dev->mode_config.idr_mutex);
|
mutex_unlock(&dev->mode_config.idr_mutex);
|
||||||
if (ret == -EAGAIN)
|
if (ret == -EAGAIN)
|
||||||
goto again;
|
goto again;
|
||||||
|
else if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
obj->id = new_id;
|
obj->id = new_id;
|
||||||
obj->type = obj_type;
|
obj->type = obj_type;
|
||||||
|
@ -272,8 +272,7 @@ again:
|
|||||||
spin_unlock(&file_priv->table_lock);
|
spin_unlock(&file_priv->table_lock);
|
||||||
if (ret == -EAGAIN)
|
if (ret == -EAGAIN)
|
||||||
goto again;
|
goto again;
|
||||||
|
else if (ret)
|
||||||
if (ret != 0)
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
drm_gem_object_handle_reference(obj);
|
drm_gem_object_handle_reference(obj);
|
||||||
@ -456,8 +455,7 @@ again:
|
|||||||
|
|
||||||
if (ret == -EAGAIN)
|
if (ret == -EAGAIN)
|
||||||
goto again;
|
goto again;
|
||||||
|
else if (ret)
|
||||||
if (ret != 0)
|
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
/* Allocate a reference for the name table. */
|
/* Allocate a reference for the name table. */
|
||||||
|
@ -122,11 +122,10 @@ again:
|
|||||||
ret = idr_get_new_above(&drm_minors_idr, NULL,
|
ret = idr_get_new_above(&drm_minors_idr, NULL,
|
||||||
base, &new_id);
|
base, &new_id);
|
||||||
mutex_unlock(&dev->struct_mutex);
|
mutex_unlock(&dev->struct_mutex);
|
||||||
if (ret == -EAGAIN) {
|
if (ret == -EAGAIN)
|
||||||
goto again;
|
goto again;
|
||||||
} else if (ret) {
|
else if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
|
||||||
|
|
||||||
if (new_id >= limit) {
|
if (new_id >= limit) {
|
||||||
idr_remove(&drm_minors_idr, new_id);
|
idr_remove(&drm_minors_idr, new_id);
|
||||||
|
Reference in New Issue
Block a user