From: Michał Winiarski <[email protected]>

Control nodes are no longer with us.
While we still need to preserve render nodes numbering, there's no need
to reserve the range formerly used for control. Let's repurpose it to be
used by primary and remove control remains from the code entirely.

References: 0d49f303e8a7 ("drm: remove all control node code")
References: c9ac371d4b59 ("drm: Fix render node numbering regression from 
control node removal.")
Signed-off-by: Michał Winiarski <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Eric Anholt <[email protected]>
Cc: Marcin Bernatowicz <[email protected]>
Cc: Sean Paul <[email protected]>
---
 drivers/gpu/drm/drm_drv.c | 4 ++--
 include/drm/drm_file.h    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index c15c9b4540e1..366a760bbc29 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -124,8 +124,8 @@ static int drm_minor_alloc(struct drm_device *dev, unsigned 
int type)
        spin_lock_irqsave(&drm_minor_lock, flags);
        r = idr_alloc(&drm_minors_idr,
                      NULL,
-                     64 * type,
-                     64 * (type + 1),
+                     128 * type,
+                     128 * (type + 1),
                      GFP_NOWAIT);
        spin_unlock_irqrestore(&drm_minor_lock, flags);
        idr_preload_end();
diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h
index 716990bace10..45e6dae69293 100644
--- a/include/drm/drm_file.h
+++ b/include/drm/drm_file.h
@@ -54,7 +54,6 @@ struct file;
  */
 enum drm_minor_type {
        DRM_MINOR_PRIMARY,
-       DRM_MINOR_CONTROL,
        DRM_MINOR_RENDER,
 };
 
-- 
2.26.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to