aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-16 16:55:51 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-18 09:05:34 -0400
commite309a9977087fa0f2cb16d0a0790f7c05ccb5171 (patch)
tree424cc69eacd0b8d1c9364a6d3ef4f82c45c26070
parentbcf17ab2e9a9b15abdfce83461d4f98e0d11aa1a (diff)
drm/i915: fix CRC debugfs setup
We've set up all files, but removed only those for which we have a pipe. Which leaves the one for pipe C on machines with less than 2 pipes, breaking module reload. v2: We can't get at the drm device this early (wtf), so just register all the files and also remove them all again. Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index e85507b335e5..649c00ebf6e0 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2772,7 +2772,6 @@ int i915_debugfs_init(struct drm_minor *minor)
2772 2772
2773void i915_debugfs_cleanup(struct drm_minor *minor) 2773void i915_debugfs_cleanup(struct drm_minor *minor)
2774{ 2774{
2775 struct drm_device *dev = minor->dev;
2776 int i; 2775 int i;
2777 2776
2778 drm_debugfs_remove_files(i915_debugfs_list, 2777 drm_debugfs_remove_files(i915_debugfs_list,
@@ -2781,7 +2780,7 @@ void i915_debugfs_cleanup(struct drm_minor *minor)
2781 drm_debugfs_remove_files((struct drm_info_list *) &i915_forcewake_fops, 2780 drm_debugfs_remove_files((struct drm_info_list *) &i915_forcewake_fops,
2782 1, minor); 2781 1, minor);
2783 2782
2784 for (i = 0; i < INTEL_INFO(dev)->num_pipes; i++) { 2783 for (i = 0; i < ARRAY_SIZE(i915_pipe_crc_data); i++) {
2785 struct drm_info_list *info_list = 2784 struct drm_info_list *info_list =
2786 (struct drm_info_list *)&i915_pipe_crc_data[i]; 2785 (struct drm_info_list *)&i915_pipe_crc_data[i];
2787 2786