Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5e821bb authored by Noralf Trønnes's avatar Noralf Trønnes
Browse files

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: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171107191348.17555-13-noralf@tronnes.org
parent beed8313

drivers/gpu/drm/drm_fb_cma_helper.c

+0 −37
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/drm_gem_cma_helper.c

+0 −26
Original line number Diff line number Diff line
@@ -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

include/drm/drm_fb_cma_helper.h

+0 −6
Original line number Diff line number Diff line
@@ -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

include/drm/drm_gem_cma_helper.h

+0 −4
Original line number Diff line number Diff line
@@ -87,10 +87,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);