Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/cma-helper: Remove drm_fb_cma_debugfs_show()

drm_fb_cma_debugfs_show() and drm_gem_cma_describe() are superseded
by drm_framebuffer_debugfs_init() and drm_gem_cma_print_info().

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171107191348.17555-13-noralf@tronnes.org

-73
-37
drivers/gpu/drm/drm_fb_cma_helper.c
··· 130 130 } 131 131 EXPORT_SYMBOL_GPL(drm_fb_cma_get_gem_addr); 132 132 133 - #ifdef CONFIG_DEBUG_FS 134 - static void drm_fb_cma_describe(struct drm_framebuffer *fb, struct seq_file *m) 135 - { 136 - int i; 137 - 138 - seq_printf(m, "fb: %dx%d@%4.4s\n", fb->width, fb->height, 139 - (char *)&fb->format->format); 140 - 141 - for (i = 0; i < fb->format->num_planes; i++) { 142 - seq_printf(m, " %d: offset=%d pitch=%d, obj: ", 143 - i, fb->offsets[i], fb->pitches[i]); 144 - drm_gem_cma_describe(drm_fb_cma_get_gem_obj(fb, i), m); 145 - } 146 - } 147 - 148 - /** 149 - * drm_fb_cma_debugfs_show() - Helper to list CMA framebuffer objects 150 - * in debugfs. 151 - * @m: output file 152 - * @arg: private data for the callback 153 - */ 154 - int drm_fb_cma_debugfs_show(struct seq_file *m, void *arg) 155 - { 156 - struct drm_info_node *node = (struct drm_info_node *) m->private; 157 - struct drm_device *dev = node->minor->dev; 158 - struct drm_framebuffer *fb; 159 - 160 - mutex_lock(&dev->mode_config.fb_lock); 161 - drm_for_each_fb(fb, dev) 162 - drm_fb_cma_describe(fb, m); 163 - mutex_unlock(&dev->mode_config.fb_lock); 164 - 165 - return 0; 166 - } 167 - EXPORT_SYMBOL_GPL(drm_fb_cma_debugfs_show); 168 - #endif 169 - 170 133 static int drm_fb_cma_mmap(struct fb_info *info, struct vm_area_struct *vma) 171 134 { 172 135 return dma_mmap_writecombine(info->device, vma, info->screen_base,
-26
drivers/gpu/drm/drm_gem_cma_helper.c
··· 397 397 EXPORT_SYMBOL_GPL(drm_gem_cma_get_unmapped_area); 398 398 #endif 399 399 400 - #ifdef CONFIG_DEBUG_FS 401 - /** 402 - * drm_gem_cma_describe - describe a CMA GEM object for debugfs 403 - * @cma_obj: CMA GEM object 404 - * @m: debugfs file handle 405 - * 406 - * This function can be used to dump a human-readable representation of the 407 - * CMA GEM object into a synthetic file. 408 - */ 409 - void drm_gem_cma_describe(struct drm_gem_cma_object *cma_obj, 410 - struct seq_file *m) 411 - { 412 - struct drm_gem_object *obj = &cma_obj->base; 413 - uint64_t off; 414 - 415 - off = drm_vma_node_start(&obj->vma_node); 416 - 417 - seq_printf(m, "%2d (%2d) %08llx %pad %p %zu", 418 - obj->name, kref_read(&obj->refcount), 419 - off, &cma_obj->paddr, cma_obj->vaddr, obj->size); 420 - 421 - seq_printf(m, "\n"); 422 - } 423 - EXPORT_SYMBOL_GPL(drm_gem_cma_describe); 424 - #endif 425 - 426 400 /** 427 401 * drm_gem_cma_print_info() - Print &drm_gem_cma_object info for debugfs 428 402 * @p: DRM printer
-6
include/drm/drm_fb_cma_helper.h
··· 35 35 struct drm_plane_state *state, 36 36 unsigned int plane); 37 37 38 - #ifdef CONFIG_DEBUG_FS 39 - struct seq_file; 40 - 41 - int drm_fb_cma_debugfs_show(struct seq_file *m, void *arg); 42 - #endif 43 - 44 38 #endif 45 39
-4
include/drm/drm_gem_cma_helper.h
··· 87 87 unsigned long flags); 88 88 #endif 89 89 90 - #ifdef CONFIG_DEBUG_FS 91 - void drm_gem_cma_describe(struct drm_gem_cma_object *obj, struct seq_file *m); 92 - #endif 93 - 94 90 void drm_gem_cma_print_info(struct drm_printer *p, unsigned int indent, 95 91 const struct drm_gem_object *obj); 96 92