The introduction of: drm/framebuffer: Add framebuffer debugfs file
broke vgem. That patch assumed that all drivers had initialized the
dev->mode_config.fb_lock mutex which happens in drm_mode_config_init().
vgem doesn't need to call drm_mode_config_init().

Fix this by only creating the framebuffer debugfs file for modesetting
drivers.

Fixes: 45d58b40292b ("drm/framebuffer: Add framebuffer debugfs file")
Suggested-by: Chris Wilson <ch...@chris-wilson.co.uk>
Signed-off-by: Noralf Trønnes <nor...@tronnes.org>
---
 drivers/gpu/drm/drm_debugfs.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index 550f29de6c1f..b2482818fee8 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -158,10 +158,12 @@ int drm_debugfs_init(struct drm_minor *minor, int 
minor_id,
                }
        }
 
-       ret = drm_framebuffer_debugfs_init(minor);
-       if (ret) {
-               DRM_ERROR("Failed to create framebuffer debugfs file\n");
-               return ret;
+       if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+               ret = drm_framebuffer_debugfs_init(minor);
+               if (ret) {
+                       DRM_ERROR("Failed to create framebuffer debugfs 
file\n");
+                       return ret;
+               }
        }
 
        if (dev->driver->debugfs_init) {
-- 
2.14.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to