drm: Convert drm_legacy_ctxbitmap_init to void return type
It can't fail really.
Also remove the redundant kms check Peter added.
Cc: Peter Antoine <peter.antoine@intel.com>
Reviewed-by: Peter Antoine <peter.antoine@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 8386575..9b51fe1 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -582,14 +582,7 @@
if (drm_ht_create(&dev->map_hash, 12))
goto err_minors;
- if (drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) ||
- !drm_core_check_feature(dev, DRIVER_MODESET))
- ret = drm_legacy_ctxbitmap_init(dev);
- if (ret) {
- DRM_ERROR(
- "Cannot allocate memory for context bitmap.\n");
- goto err_ht;
- }
+ drm_legacy_ctxbitmap_init(dev);
if (drm_core_check_feature(dev, DRIVER_GEM)) {
ret = drm_gem_init(dev);
@@ -603,7 +596,6 @@
err_ctxbitmap:
drm_legacy_ctxbitmap_cleanup(dev);
-err_ht:
drm_ht_remove(&dev->map_hash);
err_minors:
drm_minor_free(dev, DRM_MINOR_LEGACY);