[Intel-gfx] [CI 1/2] Revert "drm/framebuffer: Add framebuffer debugfs file"
Chris Wilson
chris at chris-wilson.co.uk
Sun Nov 12 09:17:55 UTC 2017
This reverts commit 45d58b40292b16ab847497dcd299e315a2ad7956.
---
drivers/gpu/drm/drm_debugfs.c | 6 ----
drivers/gpu/drm/drm_framebuffer.c | 59 ---------------------------------------
drivers/gpu/drm/drm_gem.c | 17 -----------
drivers/gpu/drm/drm_internal.h | 7 -----
include/drm/drm_drv.h | 15 ----------
5 files changed, 104 deletions(-)
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index 550f29de6c1f..c1807d5754b2 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -158,12 +158,6 @@ int drm_debugfs_init(struct drm_minor *minor, int minor_id,
}
}
- ret = drm_framebuffer_debugfs_init(minor);
- if (ret) {
- DRM_ERROR("Failed to create framebuffer debugfs file\n");
- return ret;
- }
-
if (dev->driver->debugfs_init) {
ret = dev->driver->debugfs_init(minor);
if (ret) {
diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
index d63d4c2ac4c8..655c6b621f5e 100644
--- a/drivers/gpu/drm/drm_framebuffer.c
+++ b/drivers/gpu/drm/drm_framebuffer.c
@@ -25,9 +25,7 @@
#include <drm/drm_auth.h>
#include <drm/drm_framebuffer.h>
#include <drm/drm_atomic.h>
-#include <drm/drm_print.h>
-#include "drm_internal.h"
#include "drm_crtc_internal.h"
/**
@@ -971,60 +969,3 @@ int drm_framebuffer_plane_height(int height,
return fb_plane_height(height, fb->format, plane);
}
EXPORT_SYMBOL(drm_framebuffer_plane_height);
-
-void drm_framebuffer_print_info(struct drm_printer *p, unsigned int indent,
- const struct drm_framebuffer *fb)
-{
- struct drm_format_name_buf format_name;
- unsigned int i;
-
- drm_printf_indent(p, indent, "refcount=%u\n",
- drm_framebuffer_read_refcount(fb));
- drm_printf_indent(p, indent, "format=%s\n",
- drm_get_format_name(fb->format->format, &format_name));
- drm_printf_indent(p, indent, "modifier=0x%llx\n", fb->modifier);
- drm_printf_indent(p, indent, "size=%ux%u\n", fb->width, fb->height);
- drm_printf_indent(p, indent, "layers:\n");
-
- for (i = 0; i < fb->format->num_planes; i++) {
- drm_printf_indent(p, indent + 1, "size[%u]=%dx%d\n", i,
- drm_framebuffer_plane_width(fb->width, fb, i),
- drm_framebuffer_plane_height(fb->height, fb, i));
- drm_printf_indent(p, indent + 1, "pitch[%u]=%u\n", i, fb->pitches[i]);
- drm_printf_indent(p, indent + 1, "offset[%u]=%u\n", i, fb->offsets[i]);
- drm_printf_indent(p, indent + 1, "obj[%u]:%s\n", i,
- fb->obj[i] ? "" : "(null)");
- if (fb->obj[i])
- drm_gem_print_info(p, indent + 2, fb->obj[i]);
- }
-}
-
-#ifdef CONFIG_DEBUG_FS
-static int drm_framebuffer_info(struct seq_file *m, void *data)
-{
- struct drm_info_node *node = m->private;
- struct drm_device *dev = node->minor->dev;
- struct drm_printer p = drm_seq_file_printer(m);
- struct drm_framebuffer *fb;
-
- mutex_lock(&dev->mode_config.fb_lock);
- drm_for_each_fb(fb, dev) {
- drm_printf(&p, "framebuffer[%u]:\n", fb->base.id);
- drm_framebuffer_print_info(&p, 1, fb);
- }
- mutex_unlock(&dev->mode_config.fb_lock);
-
- return 0;
-}
-
-static const struct drm_info_list drm_framebuffer_debugfs_list[] = {
- { "framebuffer", drm_framebuffer_info, 0 },
-};
-
-int drm_framebuffer_debugfs_init(struct drm_minor *minor)
-{
- return drm_debugfs_create_files(drm_framebuffer_debugfs_list,
- ARRAY_SIZE(drm_framebuffer_debugfs_list),
- minor->debugfs_root, minor);
-}
-#endif
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 01f8d9481211..4c84b23d37cc 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -40,7 +40,6 @@
#include <drm/drmP.h>
#include <drm/drm_vma_manager.h>
#include <drm/drm_gem.h>
-#include <drm/drm_print.h>
#include "drm_internal.h"
/** @file drm_gem.c
@@ -1041,19 +1040,3 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
return ret;
}
EXPORT_SYMBOL(drm_gem_mmap);
-
-void drm_gem_print_info(struct drm_printer *p, unsigned int indent,
- const struct drm_gem_object *obj)
-{
- drm_printf_indent(p, indent, "name=%d\n", obj->name);
- drm_printf_indent(p, indent, "refcount=%u\n",
- kref_read(&obj->refcount));
- drm_printf_indent(p, indent, "start=%08lx\n",
- drm_vma_node_start(&obj->vma_node));
- drm_printf_indent(p, indent, "size=%zu\n", obj->size);
- drm_printf_indent(p, indent, "imported=%s\n",
- obj->import_attach ? "yes" : "no");
-
- if (obj->dev->driver->gem_print_info)
- obj->dev->driver->gem_print_info(p, indent, obj);
-}
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index b72242e93ea4..c9d5a6cd4d41 100644
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -111,8 +111,6 @@ int drm_gem_open_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
void drm_gem_open(struct drm_device *dev, struct drm_file *file_private);
void drm_gem_release(struct drm_device *dev, struct drm_file *file_private);
-void drm_gem_print_info(struct drm_printer *p, unsigned int indent,
- const struct drm_gem_object *obj);
/* drm_debugfs.c drm_debugfs_crc.c */
#if defined(CONFIG_DEBUG_FS)
@@ -180,8 +178,3 @@ int drm_syncobj_reset_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_private);
int drm_syncobj_signal_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_private);
-
-/* drm_framebuffer.c */
-void drm_framebuffer_print_info(struct drm_printer *p, unsigned int indent,
- const struct drm_framebuffer *fb);
-int drm_framebuffer_debugfs_init(struct drm_minor *minor);
diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index d32b688eb346..29a1aa5bf9da 100644
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -39,7 +39,6 @@ struct drm_minor;
struct dma_buf_attachment;
struct drm_display_mode;
struct drm_mode_create_dumb;
-struct drm_printer;
/* driver capabilities and requirements mask */
#define DRIVER_USE_AGP 0x1
@@ -429,20 +428,6 @@ struct drm_driver {
*/
void (*gem_close_object) (struct drm_gem_object *, struct drm_file *);
- /**
- * @gem_print_info:
- *
- * If driver subclasses struct &drm_gem_object, it can implement this
- * optional hook for printing additional driver specific info.
- *
- * drm_printf_indent() should be used in the callback passing it the
- * indent argument.
- *
- * This callback is called from drm_gem_print_info().
- */
- void (*gem_print_info)(struct drm_printer *p, unsigned int indent,
- const struct drm_gem_object *obj);
-
/**
* @gem_create_object: constructor for gem objects
*
--
2.15.0
More information about the Intel-gfx
mailing list