diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2020-06-25 17:05:03 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2020-06-25 17:05:03 +0200 |
| commit | 0f69403d2535ffc7200a8414cf3ca66a49b0d741 (patch) | |
| tree | 3ce85dd08359ea872aa8fb9bd12072efdb80a787 /drivers/gpu/drm/i915/i915_debugfs.c | |
| parent | drm/i915/dp_mst: Enable VC payload allocation after transcoder is enabled (diff) | |
| parent | Merge tag 'drm-misc-next-2020-06-19' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| download | linux-0f69403d2535ffc7200a8414cf3ca66a49b0d741.tar.xz linux-0f69403d2535ffc7200a8414cf3ca66a49b0d741.zip | |
Merge drm/drm-next into drm-intel-next-queued
Catch up with upstream, in particular to get c1e8d7c6a7a6 ("mmap locking
API: convert mmap_sem comments").
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 242f59910c19..8594a8ef08ce 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1898,7 +1898,7 @@ static const struct i915_debugfs_files { #endif }; -int i915_debugfs_register(struct drm_i915_private *dev_priv) +void i915_debugfs_register(struct drm_i915_private *dev_priv) { struct drm_minor *minor = dev_priv->drm.primary; int i; @@ -1915,7 +1915,7 @@ int i915_debugfs_register(struct drm_i915_private *dev_priv) i915_debugfs_files[i].fops); } - return drm_debugfs_create_files(i915_debugfs_list, - I915_DEBUGFS_ENTRIES, - minor->debugfs_root, minor); + drm_debugfs_create_files(i915_debugfs_list, + I915_DEBUGFS_ENTRIES, + minor->debugfs_root, minor); } |