Re: [PATCH v4 11/11] drm/cma-helper: Remove drm_fb_cma_debugfs_show()

Hi Noralf,

Thank you for the patch.

On Monday, 30 October 2017 18:29:45 EET Noralf Trønnes wrote:

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: Laurent Pinchart laurent.pinchart@ideasonboard.com

---

drivers/gpu/drm/drm_fb_cma_helper.c | 37 --------------------------------- drivers/gpu/drm/drm_gem_cma_helper.c | 26 ------------------------- include/drm/drm_fb_cma_helper.h | 6 ------ include/drm/drm_gem_cma_helper.h | 4 ---- 4 files changed, 73 deletions(-)

diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c index 0e3c14174d08..35b56dfba929 100644 --- a/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/drivers/gpu/drm/drm_fb_cma_helper.c @@ -130,43 +130,6 @@ dma_addr_t drm_fb_cma_get_gem_addr(struct drm_framebuffer *fb, } EXPORT_SYMBOL_GPL(drm_fb_cma_get_gem_addr);

-#ifdef CONFIG_DEBUG_FS -static void drm_fb_cma_describe(struct drm_framebuffer *fb, struct seq_file *m) -{

• int i;
• seq_printf(m, "fb: %dx%d@%4.4s\n", fb->width, fb->height,

• 	(char *)&fb->format->format);
  

• for (i = 0; i < fb->format->num_planes; i++) {

• seq_printf(m, "   %d: offset=%d pitch=%d, obj: ",
  

• 		i, fb->offsets[i], fb->pitches[i]);
  

• drm_gem_cma_describe(drm_fb_cma_get_gem_obj(fb, i), m);
  

• }

-}

-/**

• • drm_fb_cma_debugfs_show() - Helper to list CMA framebuffer objects

• • 	       in debugfs.
    

• • @m: output file
• • @arg: private data for the callback
• */

-int drm_fb_cma_debugfs_show(struct seq_file *m, void *arg) -{

• struct drm_info_node *node = (struct drm_info_node *) m->private;
• struct drm_device *dev = node->minor->dev;
• struct drm_framebuffer *fb;
• mutex_lock(&dev->mode_config.fb_lock);
• drm_for_each_fb(fb, dev)

• drm_fb_cma_describe(fb, m);
  

• mutex_unlock(&dev->mode_config.fb_lock);
• return 0;

-} -EXPORT_SYMBOL_GPL(drm_fb_cma_debugfs_show); -#endif

static int drm_fb_cma_mmap(struct fb_info *info, struct vm_area_struct *vma) { return dma_mmap_writecombine(info->device, vma, info->screen_base, diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index 89dc7f04fae6..9b99f9feb432 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c @@ -397,32 +397,6 @@ unsigned long drm_gem_cma_get_unmapped_area(struct file *filp, EXPORT_SYMBOL_GPL(drm_gem_cma_get_unmapped_area); #endif

-#ifdef CONFIG_DEBUG_FS -/**

• • drm_gem_cma_describe - describe a CMA GEM object for debugfs
• • @cma_obj: CMA GEM object
• • @m: debugfs file handle
• • This function can be used to dump a human-readable representation of the
• • CMA GEM object into a synthetic file.
• */

-void drm_gem_cma_describe(struct drm_gem_cma_object *cma_obj,

• 	  struct seq_file *m)
  

-{

• struct drm_gem_object *obj = &cma_obj->base;
• uint64_t off;
• off = drm_vma_node_start(&obj->vma_node);
• seq_printf(m, "%2d (%2d) %08llx %pad %p %zu",

• 	obj->name, kref_read(&obj->refcount),
  

• 	off, &cma_obj->paddr, cma_obj->vaddr, obj->size);
  

• seq_printf(m, "\n");

-} -EXPORT_SYMBOL_GPL(drm_gem_cma_describe); -#endif

/**

• drm_gem_cma_print_info() - Print &drm_gem_cma_object info for debugfs
• @p: DRM printer

diff --git a/include/drm/drm_fb_cma_helper.h b/include/drm/drm_fb_cma_helper.h index 023f052a5873..a613ff022e6c 100644 --- a/include/drm/drm_fb_cma_helper.h +++ b/include/drm/drm_fb_cma_helper.h @@ -35,11 +35,5 @@ dma_addr_t drm_fb_cma_get_gem_addr(struct drm_framebuffer *fb, struct drm_plane_state *state, unsigned int plane);

-#ifdef CONFIG_DEBUG_FS -struct seq_file;

-int drm_fb_cma_debugfs_show(struct seq_file *m, void *arg); -#endif

#endif

diff --git a/include/drm/drm_gem_cma_helper.h b/include/drm/drm_gem_cma_helper.h index bc47e6eba271..08375115fdc0 100644 --- a/include/drm/drm_gem_cma_helper.h +++ b/include/drm/drm_gem_cma_helper.h @@ -90,10 +90,6 @@ unsigned long drm_gem_cma_get_unmapped_area(struct file *filp, unsigned long flags); #endif

-#ifdef CONFIG_DEBUG_FS -void drm_gem_cma_describe(struct drm_gem_cma_object *obj, struct seq_file *m); -#endif

void drm_gem_cma_print_info(struct drm_printer *p, unsigned int indent, const struct drm_gem_object *obj);