summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2018-07-14 14:32:12 +0200
committerSean Paul <seanpaul@chromium.org>2018-07-16 16:01:19 +0200
commitd530b5f1ca0bb66958a2b714bebe40a1248b9c15 (patch)
treeaef68df3d225fd286c19533543b4bf52949d6130
parentdrm/bridge: adv7511: Reset registers on hotplug (diff)
downloadlinux-d530b5f1ca0bb66958a2b714bebe40a1248b9c15.tar.xz
linux-d530b5f1ca0bb66958a2b714bebe40a1248b9c15.zip
drm: re-enable error handling
drm_legacy_ctxbitmap_next() returns idr_alloc() which can return -ENOMEM, -EINVAL or -ENOSPC none of which are -1 . but the call sites of drm_legacy_ctxbitmap_next() seem to be assuming that the error case would be -1 (original return of drm_ctxbitmap_next() prior to 2.6.23 was actually -1). Thus reenable error handling by checking for < 0. Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Fixes: 62968144e673 ("drm: convert drm context code to use Linux idr") Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/1531571532-22733-1-git-send-email-hofrat@osadl.org
-rw-r--r--drivers/gpu/drm/drm_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
index 3c4000facb36..f973d287696a 100644
--- a/drivers/gpu/drm/drm_context.c
+++ b/drivers/gpu/drm/drm_context.c
@@ -372,7 +372,7 @@ int drm_legacy_addctx(struct drm_device *dev, void *data,
ctx->handle = drm_legacy_ctxbitmap_next(dev);
}
DRM_DEBUG("%d\n", ctx->handle);
- if (ctx->handle == -1) {
+ if (ctx->handle < 0) {
DRM_DEBUG("Not enough free contexts.\n");
/* Should this return -EBUSY instead? */
return -ENOMEM;