diff options
author | Noralf Trønnes <noralf@tronnes.org> | 2017-11-14 00:12:01 +0100 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2017-11-14 11:08:17 +0200 |
commit | 0c51ef8684e30333ee2a7cef359258d91727166b (patch) | |
tree | 39e92141549d6f0d7a964a9715108b356cf2f68f /drivers/gpu/drm/drm_debugfs.c | |
parent | 5d276a1acaa80f4b7a76577510a2b1835ce01f4f (diff) | |
download | linux-0c51ef8684e30333ee2a7cef359258d91727166b.tar.gz linux-0c51ef8684e30333ee2a7cef359258d91727166b.tar.bz2 linux-0c51ef8684e30333ee2a7cef359258d91727166b.zip |
drm/debugfs: Fix framebuffer debugfs file init
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 <chris@chris-wilson.co.uk>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171113231201.26177-1-noralf@tronnes.org
Diffstat (limited to 'drivers/gpu/drm/drm_debugfs.c')
-rw-r--r-- | drivers/gpu/drm/drm_debugfs.c | 10 |
1 files 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) { |