Merge tag 'gpio-fixes-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / staging / omapdrm / omap_debugfs.c

diff --git a/drivers/staging/omapdrm/omap_debugfs.c b/drivers/staging/omapdrm/omap_debugfs.c
index da920dfdc59c4aee0bf1cc033bcca6e743d5c71f..2f122e00b51da07ad7c29e7c4f868ad2bb4ce7b7 100644 (file)
--- a/drivers/staging/omapdrm/omap_debugfs.c
+++ b/drivers/staging/omapdrm/omap_debugfs.c
@@ -20,23 +20,118 @@
 #include "omap_drv.h"
 #include "omap_dmm_tiler.h"
 
+#include "drm_fb_helper.h"
+
+
 #ifdef CONFIG_DEBUG_FS
 
+static int gem_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 omap_drm_private *priv = dev->dev_private;
+       int ret;
+
+       ret = mutex_lock_interruptible(&dev->struct_mutex);
+       if (ret)
+               return ret;
+
+       seq_printf(m, "All Objects:\n");
+       omap_gem_describe_objects(&priv->obj_list, m);
+
+       mutex_unlock(&dev->struct_mutex);
+
+       return 0;
+}
+
+static int mm_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;
+       return drm_mm_dump_table(m, dev->mm_private);
+}
+
+static int fb_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 omap_drm_private *priv = dev->dev_private;
+       struct drm_framebuffer *fb;
+       int ret;
+
+       ret = mutex_lock_interruptible(&dev->mode_config.mutex);
+       if (ret)
+               return ret;
+
+       ret = mutex_lock_interruptible(&dev->struct_mutex);
+       if (ret) {
+               mutex_unlock(&dev->mode_config.mutex);
+               return ret;
+       }
+
+       seq_printf(m, "fbcon ");
+       omap_framebuffer_describe(priv->fbdev->fb, m);
+
+       list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+               if (fb == priv->fbdev->fb)
+                       continue;
+
+               seq_printf(m, "user ");
+               omap_framebuffer_describe(fb, m);
+       }
+
+       mutex_unlock(&dev->struct_mutex);
+       mutex_unlock(&dev->mode_config.mutex);
+
+       return 0;
+}
+
+/* list of debufs files that are applicable to all devices */
 static struct drm_info_list omap_debugfs_list[] = {
+       {"gem", gem_show, 0},
+       {"mm", mm_show, 0},
+       {"fb", fb_show, 0},
+};
+
+/* list of debugfs files that are specific to devices with dmm/tiler */
+static struct drm_info_list omap_dmm_debugfs_list[] = {
        {"tiler_map", tiler_map_show, 0},
 };
 
 int omap_debugfs_init(struct drm_minor *minor)
 {
-       return drm_debugfs_create_files(omap_debugfs_list,
+       struct drm_device *dev = minor->dev;
+       int ret;
+
+       ret = drm_debugfs_create_files(omap_debugfs_list,
                        ARRAY_SIZE(omap_debugfs_list),
                        minor->debugfs_root, minor);
+
+       if (ret) {
+               dev_err(dev->dev, "could not install omap_debugfs_list\n");
+               return ret;
+       }
+
+       if (dmm_is_available())
+               ret = drm_debugfs_create_files(omap_dmm_debugfs_list,
+                               ARRAY_SIZE(omap_dmm_debugfs_list),
+                               minor->debugfs_root, minor);
+
+       if (ret) {
+               dev_err(dev->dev, "could not install omap_dmm_debugfs_list\n");
+               return ret;
+       }
+
+       return ret;
 }
 
 void omap_debugfs_cleanup(struct drm_minor *minor)
 {
        drm_debugfs_remove_files(omap_debugfs_list,
                        ARRAY_SIZE(omap_debugfs_list), minor);
+       if (dmm_is_available())
+               drm_debugfs_remove_files(omap_dmm_debugfs_list,
+                               ARRAY_SIZE(omap_dmm_debugfs_list), minor);
 }
 
 #endif