Skip to contentSkip to conversation

drm: Fix render node numbering regression from control node removal.

PATCH In review Eric Anholt 2 participants 2 messages May 9, 2018 – May 12, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm: Fix render node numbering regression from control node removal.

drm_minor_alloc() does multiplication on this enum, so the removal ended up moving render nodes down from 128 base to 64. This caused Mesa's surfaceless backend to be unable to open the render nodes, since it was still looking up at 128.

Fixes 0d49f303e8a7 ("drm: remove all control node code")
Cc Daniel Vetter <[email protected]>
Cc Sean Paul <[email protected]>
---
 include/drm/drm_file.h | 1 +
 1 file changed, 1 insertion(+)
include/drm/drm_file.h +1 -0
index 99ab50cbab00..69b0a8b57502 100644
@@ -49,6 +49,7 @@ struct device;
 
 enum drm_minor_type {
 	DRM_MINOR_PRIMARY,
+	DRM_MINOR_CONTROL,
 	DRM_MINOR_RENDER,
 };
 
Signature · 6 lines
2.17.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Eric Anholt

drm_minor_alloc() does multiplication on this enum, so the removal ended up moving render nodes down from 128 base to 64. This caused Mesa's surfaceless backend to be unable to open the render nodes, since it was still looking up at 128.

Fixes 0d49f303e8a7 ("drm: remove all control node code")
Cc Daniel Vetter <[email protected]>
Cc Sean Paul <[email protected]>

Oops.

include/drm/drm_file.h struct device; · line 52

Quoted 13 lines
---
 include/drm/drm_file.h | 1 +
 1 file changed, 1 insertion(+)
include/drm/drm_file.h +1 -0
index 99ab50cbab00..69b0a8b57502 100644
@@ -49,6 +49,7 @@ struct device;
 
 enum drm_minor_type {
 	DRM_MINOR_PRIMARY,
+	DRM_MINOR_CONTROL,

Maybe add a comment here why we need this? Either way:

Quoted 6 lines
include/drm/drm_file.h +0 -0
 	DRM_MINOR_RENDER,
 };
 
Signature · 1 line
2.17.0
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel