aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-06-24 14:00:17 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2016-06-24 14:43:36 +0100
commit1dac891c1c95a8528f3558b481fbb9a45d653619 (patch)
treeb06af0f000bf49d4a011a67e17c0946e463b05fa /drivers/gpu/drm/i915/i915_dma.c
parentdrm/i915: Move connector registration to driver registration (diff)
downloadlinux-dev-1dac891c1c95a8528f3558b481fbb9a45d653619.tar.xz
linux-dev-1dac891c1c95a8528f3558b481fbb9a45d653619.zip
drm/i915: Register debugfs interface last
Currently debugfs files are created before the driver is even loads. This gives the opportunity for userspace to open that interface and poke around before the backing data structures are initialised - with the possibility of oopsing or worse. Move the creation of the debugfs files to our registration phase, where we announce our presence to the world when we are ready, i.e the sequence changes from drm_dev_register() -> drm_minor_register() -> drm_debugfs_init() -> i915_debugfs_init() -> i915_driver_load() to drm_dev_register() -> drm_minor_register() -> drm_debugfs_init() -> i915_driver_load() -> i915_debugfs_register() Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1466773227-7994-5-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 29521c4b87a5..91623874f9a3 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1397,6 +1397,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
if (intel_vgpu_active(dev_priv))
I915_WRITE(vgtif_reg(display_ready), VGT_DRV_DISPLAY_READY);
+ i915_debugfs_register(dev_priv);
i915_setup_sysfs(dev);
intel_modeset_register(dev_priv);
@@ -1433,6 +1434,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
intel_opregion_unregister(dev_priv);
intel_modeset_unregister(dev_priv);
i915_teardown_sysfs(dev_priv->dev);
+ i915_debugfs_unregister(dev_priv);
i915_gem_shrinker_cleanup(dev_priv);
}